代码修改

power-fitting-JN/src/main/java/com.gyee.power.fitting/common/spring/CacheContext.java

@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
 public class CacheContext implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(CacheContext.class);
 
-    private final String QS = "0";
 
     @Resource
     private ProBasicEquipmentService proBasicEquipmentService;
@@ -49,20 +48,49 @@ public class CacheContext implements CommandLineRunner {
     private ProBasicWeatherStationService proBasicWeatherStationService;
 
     @Resource
+    private IProBasicCompanyService proBasicCompanyService;
+    @Resource
+    private IProBasicRegionService proBasicRegionService;
+    @Resource
+    private IProBasicEnergyGroupService proBasicEnergyGroupService;
+
+
+
+
+    @Resource
+    private ProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    @Resource
+    private ProBasicEquipmentPointService proBasicEquipmentPointService;
+
+
+    @Resource
     private ProBasicPowerstationService windpowerstationService;
 
-    public static List<ProBasicEquipment> wtls = new ArrayList<>();
 
+    public static List<ProBasicEquipment> wtls = new ArrayList<>();
     public static List<ProBasicWeatherStation> weawpls = new ArrayList<>();
     public static List<ProBasicPowerstation> wpls = new ArrayList<>();
     public static List<ProBasicPowerstation> wplsf = new ArrayList<>();
     public static List<ProBasicPowerstation> wplsG = new ArrayList<>(); //光电集合
     public static List<ProBasicPowerstation> zwpls = new ArrayList<>();
+    public static List<ProBasicCompany> cpls = new ArrayList<>();
+    public static List<ProBasicCompany> cpls1 = new ArrayList<>();
+    public static List<ProBasicRegion> rgls = new ArrayList<>();
+    public static List<ProBasicEnergyGroup> gpls = new ArrayList<>();
+    public static List<ProBasicPowerstationPoint> powerpointls = new ArrayList<>();
+    public static List<ProBasicEquipmentPoint> Equipmentpointls = new ArrayList<>();
+
+    public static Map<String, ProBasicRegion> rgmap = new HashMap<>();
+    public static Map<String, ProBasicCompany> cpmap = new HashMap<>();
+    public static Map<String, ProBasicEnergyGroup> gpmap = new HashMap<>();
 
-    public static Map<String, List<ProBasicPowerstation>> rgwpmap = new HashMap<>();
     public static Map<String, List<ProBasicPowerstation>> cpwpmap = new HashMap<>();
     public static Map<String, List<ProBasicPowerstation>> wpmapls = new HashMap<>();
+    public static Map<String, List<ProBasicPowerstation>> stationls = new HashMap<>();
+    public static Map<String, List<ProBasicCompany>> rgcpmap = new HashMap<>();
     public static Map<String, ProBasicPowerstation> wpmap = new HashMap<>();
+
     public static Map<String, List<ProBasicEquipment>> wpwtmap = new HashMap<>();
     public static Map<String, List<ProBasicEquipment>> pjwtmap = new HashMap<>();
     public static Map<String, List<ProBasicEquipment>> lnwtmap = new HashMap<>();
@@ -70,11 +98,24 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, List<ProBasicEquipment>> rgwtlsmap = new HashMap<>();
     public static Map<String, Map<String, ProBasicEquipment>> cmwtmap = new HashMap<>();
     public static Map<String, List<ProBasicEquipment>> sqwtmap = new HashMap<>();
+    public static Map<String, Map<String, ProBasicEquipmentPoint>> bnAimap = new HashMap<>();
     public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
+    public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpointmap = new HashMap<>();//风机测点
+    public static Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap = new HashMap<>();
+    //    public static Map<String,Map<String, ProBasicPowerstationPoint>> lnPointmap =new HashMap<>();//线路测点
+    public static Map<String, Map<String, ProBasicPowerstationPoint>> propointmap = new HashMap<>();
+    //    public static Map<String,Map<String, ProBasicPowerstationPoint>> pjPointmap =new HashMap<>(); //期次测点
     public static Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = new HashMap<>();
+    //    public static Map<String,Map<String, ProBasicPowerstationPoint>> pointwpmap =new HashMap<>();
+    public static Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = new HashMap<>();
     public static Map<String, Map<String, ProBasicPowerstationPoint>> weatherwppointmap = new HashMap<>();
+    public static Map<String, Map<String, ProBasicPowerstationPoint>> companypointmap = new HashMap<>();
+    public static Map<String, Map<String, ProBasicPowerstationPoint>> regionpointmap = new HashMap<>();
+    public static Map<String, Map<String, ProBasicPowerstationPoint>> grouppointmap = new HashMap<>();
 
+    public static Map<String, Map<Double, Double>> zbzglMap = new HashMap<>();
     public static Map<String, ProEconEquipmentmodel> modelMap = new HashMap<>();
+    public static Map<String, Map<Double, Double>> zzsglMap = new HashMap<>();
     public static Map<String, Double> modelpower = new HashMap<>();
 
     public static Map<String, String> wtstandardmap = new HashMap<>();
@@ -89,6 +130,7 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, List<ProBasicEquipment>> subWtsMap = new HashMap<>();
 
 
+
     public static List<ProBasicPowerstation> stations = new ArrayList<>();
     public static Map<String,ProBasicPowerstation> wpmaps = new HashMap<>();
     public static Map<String,String> wppmap = new HashMap<>();
@@ -97,6 +139,26 @@ public class CacheContext implements CommandLineRunner {
     public void run(String... args) throws Exception {
         logger.info("缓存开始------------------------------------------------------------");
 
+
+
+//        bnls = proBasicBranchService.list();
+//        bnls.stream().forEach(bn->{
+//            String bnString = redisService.get(bn.getId());
+//            Map<String, ProBasicEquipmentPoint> stringWindturbinetestingpointnewMap = JSONObject.parseObject(bnString, new TypeReference<Map<String, ProBasicEquipmentPoint>>() {
+//            });
+//            bnAimap.put(bn.getId(),stringWindturbinetestingpointnewMap);
+//
+//            if (wtbnmap.containsKey(bn.getInteverId())){
+//                wtbnmap.get(bn.getInteverId()).add(bn);
+//            }else {
+//                List<ProBasicBranch> bns = new ArrayList<>();
+//                bns.add(bn);
+//                wtbnmap.put(bn.getInteverId(),bns);
+//            }
+//        });
+
+
+
         equipmentmodels = proEconEquipmentmodelService.list();
         equipmentmodels.stream().forEach(e -> {
             modelMap.put(e.getId(), e);
@@ -119,25 +181,112 @@ public class CacheContext implements CommandLineRunner {
         }
 
 
+        cpls = proBasicCompanyService.list().stream().filter(i -> i.getIsAble().equals(1)).collect(Collectors.toList());
 
-        for (ProBasicPowerstation wp : wpls) {
-            if (cpwpmap.containsKey(wp.getCompanyId())) {
-                cpwpmap.get(wp.getCompanyId()).add(wp);
-            } else {
-                List<ProBasicPowerstation> wps = new ArrayList<>();
-                wps.add(wp);
-                cpwpmap.put(wp.getCompanyId(), wps);
+        cpls1 = proBasicCompanyService.list().stream().filter(i -> i.getSpare2().equals("1")).collect(Collectors.toList());
+        if (!cpls.isEmpty()) {
+            for (ProBasicCompany sq : cpls) {
+                cpmap.put(sq.getId(), sq);
+
+                if (redisService.hasKey(sq.getId() + "0")) {
+                    String cp0String = redisService.get(sq.getId() + "0");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp0String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    companypointmap.put(sq.getId() + "0", stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId() + "-1")) {
+                    String cp1String = redisService.get(sq.getId() + "-1");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp1String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    companypointmap.put(sq.getId() + "-1", stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId() + "-2")) {
+                    String cp2String = redisService.get(sq.getId() + "-2");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp2String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    companypointmap.put(sq.getId() + "-2", stringWindpowerstationpointnewMap);
+                }
+
+
+            }
+
+        }
+
+
+        rgls = proBasicRegionService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
+
+
+        if (!rgls.isEmpty()) {
+            for (ProBasicRegion sq : rgls) {
+                rgmap.put(sq.getId(), sq);
+
+                if (redisService.hasKey(sq.getId() + "0")) {
+                    String cp0String = redisService.get(sq.getId() + "0");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp0String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    regionpointmap.put(sq.getId() + "0", stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId() + "-1")) {
+                    String cp1String = redisService.get(sq.getId() + "-1");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp1String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    regionpointmap.put(sq.getId() + "-1", stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(sq.getId() + "-2")) {
+                    String cp2String = redisService.get(sq.getId() + "-2");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp2String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    regionpointmap.put(sq.getId() + "-2", stringWindpowerstationpointnewMap);
+                }
             }
         }
 
+        List<ProBasicEnergyGroup> energyGroups = proBasicEnergyGroupService.list();
+        gpls = energyGroups.stream().filter(e -> e.getIsAble() == 1 && e.getId().endsWith("FGS")).collect(Collectors.toList());
+
+        if (!gpls.isEmpty()) {
+            for (ProBasicEnergyGroup gp : gpls) {
+                gpmap.put(gp.getId(), gp);
+
+                if (redisService.hasKey(gp.getId() + "0")) {
+                    String cp0String = redisService.get(gp.getId() + "0");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp0String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    grouppointmap.put(gp.getId() + "0", stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(gp.getId() + "-1")) {
+                    String cp1String = redisService.get(gp.getId() + "-1");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp1String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    grouppointmap.put(gp.getId() + "-1", stringWindpowerstationpointnewMap);
+                }
+                if (redisService.hasKey(gp.getId() + "-2")) {
+                    String cp2String = redisService.get(gp.getId() + "-2");
+                    Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(cp2String, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
+                    });
+                    grouppointmap.put(gp.getId() + "-2", stringWindpowerstationpointnewMap);
+                }
+            }
+        }
+
+
+        for (ProBasicCompany cp : cpls) {
+            if (rgcpmap.containsKey(cp.getRegionId())) {
+                rgcpmap.get(cp.getRegionId()).add(cp);
+            } else {
+                List<ProBasicCompany> wps = new ArrayList<>();
+                wps.add(cp);
+                rgcpmap.put(cp.getRegionId(), wps);
+            }
+        }
 
         for (ProBasicPowerstation wp : wpls) {
-            if (rgwpmap.containsKey(wp.getRegionId())) {
-                rgwpmap.get(wp.getRegionId()).add(wp);
+            if (cpwpmap.containsKey(wp.getCompanyId())) {
+                cpwpmap.get(wp.getCompanyId()).add(wp);
             } else {
                 List<ProBasicPowerstation> wps = new ArrayList<>();
                 wps.add(wp);
-                rgwpmap.put(wp.getRegionId(), wps);
+                cpwpmap.put(wp.getCompanyId(), wps);
             }
         }
 
@@ -256,6 +405,9 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
+
+
+
         weawpls = proBasicWeatherStationService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
         weawpls.stream().forEach(weather -> {
 
@@ -266,6 +418,9 @@ public class CacheContext implements CommandLineRunner {
 
 
         });
+        //线路
+
+
 
         zwpls = proBasicWindpowerstationService.list().stream().filter(i -> i.getIsAble() == 1).collect(Collectors.toList());
         QueryWrapper<ProBasicPowerstation> queryWpWrapper = new QueryWrapper<>();
@@ -284,6 +439,7 @@ public class CacheContext implements CommandLineRunner {
 
 
 
+
         wpls.stream().forEach(wp -> {
 
             wpmap.put(wp.getId(), wp);
@@ -312,15 +468,70 @@ public class CacheContext implements CommandLineRunner {
                     wpmapls.put(wp.getId(), ls);
                 }
 
+
+//                if(wp.getWindType().equals(-1) && wp.getWindType().equals(-2)){
+//                    List<ProBasicPowerstation> ls = stationls.get(wp.getWindType());
+//                    stationls.put(wp.getWindType()+QS,ls);
+//                }
+
+
                 wpmap.put(wp.getId(), wp);
             }
         }
 
+
+//        Map<String,ProBasicPowerstationPoint> items=null;
+//        powerpointls = proBasicPowerstationPointService.list().stream().filter(i ->i.getId() != null).collect(Collectors.toList());
+//        if(powerpointls!=null && !powerpointls.isEmpty()){
+//            for(int i=0;i<powerpointls.size();i++){
+//
+//                if(pjmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
+//                {
+//                    ProBasicPowerstationPoint point=powerpointls.get(i);
+//                    if(pjPointmap.containsKey(point.getWindpowerstationId())){
+//                        items=pjPointmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        pjPointmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                }else if(lnmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
+//                {
+//                    ProBasicPowerstationPoint point=powerpointls.get(i);
+//                    if(lnPointmap.containsKey(point.getWindpowerstationId())){
+//                        items=lnPointmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        lnPointmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                }else
+//                {
+//                    ProBasicPowerstationPoint point = powerpointls.get(i);
+//                    if(pointwpmap.containsKey(point.getWindpowerstationId())){
+//                        items=pointwpmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        pointwpmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                }
+//            }
+//        }
+
         stations = windpowerstationService.list();
         for (ProBasicPowerstation station : stations) {
             wppmap.put(station.getId(),station.getName());
             wpmaps.put(station.getId(),station);
         }
+
+
         logger.info("缓存结束------------------------------------------------------------");
     }
 }

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/fj/DataFittingController.java

@@ -7,9 +7,11 @@ import com.gyee.power.fitting.common.result.ResultCode;
 import com.gyee.power.fitting.model.ProEconPowerFittingAnalySis;
 import com.gyee.power.fitting.model.custom.PowerPointData;
 import com.gyee.power.fitting.service.custom.curve.DataFittingService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +27,9 @@ public class DataFittingController {
     @Resource
     private DataFittingService fittingService;
 
+    @Autowired
+    private HttpServletRequest request;
+
 
     /**
      * 数据拟合
@@ -58,7 +63,7 @@ public class DataFittingController {
      */
     @GetMapping("tree")
     public JSONObject dataFIttingTree(){
-        List<Object> result = fittingService.dataFittingTree();
+        List<Object> result = fittingService.dataFittingTree(request);
         return JsonResult.successData(ResultCode.SUCCESS, result);
     }
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/fj/DataPrepareController.java

@@ -10,6 +10,7 @@ import com.gyee.power.fitting.service.custom.curve.DataPrepareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
@@ -27,6 +28,9 @@ public class DataPrepareController {
     @Autowired
     private ProEconPowerFittingAnalySisService powerService;
 
+    @Autowired
+    private HttpServletRequest request;
+
 
     /**
      * 数据准备  golden-file
@@ -54,7 +58,7 @@ public class DataPrepareController {
      */
     @GetMapping("tree")
     public JSONObject dataPrepareTree(){
-        List<Object> result = prepareService.dataPrepareTree();
+        List<Object> result = prepareService.dataPrepareTree(request);
         return JsonResult.successData(ResultCode.SUCCESS, result);
     }
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/fj/DataProcessController.java

@@ -10,6 +10,7 @@ import com.gyee.power.fitting.service.custom.curve.DataProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
@@ -28,6 +29,9 @@ public class DataProcessController {
     @Autowired
     private DataProcessService processService;
 
+    @Autowired
+    private HttpServletRequest request;
+
 
     /**
      * 数据预处理
@@ -77,7 +81,7 @@ public class DataProcessController {
      */
     @GetMapping("tree")
     public JSONObject dataProcessTree(){
-        List<Object> result = processService.dataProcessTree();
+        List<Object> result = processService.dataProcessTree(request);
         return JsonResult.successData(ResultCode.SUCCESS, result);
     }
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/ProBasicCompanyMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.power.fitting.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.power.fitting.model.ProBasicCompany;
+
+/**
+ * <p>
+ * 省公司表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicCompanyMapper extends BaseMapper<ProBasicCompany> {
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/ProBasicEnergyGroupMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.power.fitting.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.power.fitting.model.ProBasicEnergyGroup;
+
+/**
+ * <p>
+ * 集团 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicEnergyGroupMapper extends BaseMapper<ProBasicEnergyGroup> {
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/mapper/ProBasicRegionMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.power.fitting.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.power.fitting.model.ProBasicRegion;
+
+/**
+ * <p>
+ * 区域 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+public interface ProBasicRegionMapper extends BaseMapper<ProBasicRegion> {
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/ProBasicCompany.java

@@ -0,0 +1,186 @@
+package com.gyee.power.fitting.model;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 省公司表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicCompany extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风电装机容量
+     */
+    private Double windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
+     */
+    private Double capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private Double jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private Double jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 风电场站数量
+     */
+    private Integer windNumber;
+
+    /**
+     * 光伏场站数量
+     */
+    private Integer number;
+
+    /**
+     * 接入风电场站数量
+     */
+    private Integer jrWindNumber;
+
+    /**
+     * 接入光伏场站数量
+     */
+    private Integer jrNumber;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 集团编号
+     */
+    private String groupId;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/ProBasicEnergyGroup.java

@@ -0,0 +1,181 @@
+package com.gyee.power.fitting.model;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 集团
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicEnergyGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 父编号
+     */
+    private String parentid;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风电装机容量
+     */
+    private Double windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
+     */
+    private Double capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private Double jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private Double jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 风电场站数量
+     */
+    private Integer windNumber;
+
+    /**
+     * 光伏场站数量
+     */
+    private Integer number;
+
+    /**
+     * 接入风电场站数量
+     */
+    private Integer jrWindNumber;
+
+    /**
+     * 接入光伏场站数量
+     */
+    private Integer jrNumber;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/ProBasicRegion.java

@@ -0,0 +1,176 @@
+package com.gyee.power.fitting.model;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 区域
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicRegion extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID", type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风电装机容量
+     */
+    private Double windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
+     */
+    private Double capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private Double jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private Double jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 风电场站数量
+     */
+    private Integer windNumber;
+
+    /**
+     * 光伏场站数量
+     */
+    private Integer number;
+
+    /**
+     * 接入风电场站数量
+     */
+    private Integer jrWindNumber;
+
+    /**
+     * 接入光伏场站数量
+     */
+    private Integer jrNumber;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/IProBasicCompanyService.java

@@ -0,0 +1,20 @@
+package com.gyee.power.fitting.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.power.fitting.model.ProBasicCompany;
+
+/**
+ * <p>
+ * 省公司表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicCompanyService extends IService<ProBasicCompany> {
+
+    Double getProBasicCompanyCapacity(String regionId, String companyId);
+
+    Integer getProBasicCompanyQuantity(String regionId, String companyId);
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/IProBasicEnergyGroupService.java

@@ -0,0 +1,16 @@
+package com.gyee.power.fitting.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.power.fitting.model.ProBasicEnergyGroup;
+
+/**
+ * <p>
+ * 集团 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicEnergyGroupService extends IService<ProBasicEnergyGroup> {
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/IProBasicRegionService.java

@@ -0,0 +1,16 @@
+package com.gyee.power.fitting.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.power.fitting.model.ProBasicRegion;
+
+/**
+ * <p>
+ * 区域 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicRegionService extends IService<ProBasicRegion> {
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/ProEconPowerFittingAnalySisService.java

@@ -23,7 +23,7 @@ public interface ProEconPowerFittingAnalySisService extends IService<ProEconPowe
      * @param type   prepare
      * @return
      */
-    List<ProEconPowerFittingAnalySis> selectList(String type);
+    List<ProEconPowerFittingAnalySis> selectList(List<String> stations ,String type);
 
     void insertItem(ProEconPowerFittingAnalySis obj);
 

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/auth/TokenService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 
 import com.gyee.power.fitting.common.config.StringUtils;
 import com.gyee.power.fitting.common.spring.CacheContext;
+import com.gyee.power.fitting.model.ProBasicCompany;
 import com.gyee.power.fitting.model.ProBasicEquipment;
 import com.gyee.power.fitting.model.ProBasicPowerstation;
 import com.gyee.power.fitting.model.ProBasicWeatherStation;
@@ -121,17 +122,18 @@ public class TokenService {
                             wplist.add(newWp);
                         }
 
-                    }else if (CacheContext.rgwpmap.containsKey(depId)) {
-                        List<ProBasicPowerstation> rgcpls = CacheContext.rgwpmap.get(depId);
-                        for (ProBasicPowerstation cp : rgcpls) {
-                            List<ProBasicPowerstation> wpls = CacheContext.rgwpmap.get(cp.getId());
+                    }else if (CacheContext.rgmap.containsKey(depId)) {
+                        List<ProBasicCompany> rgcpls = CacheContext.rgcpmap.get(depId);
+                        for (ProBasicCompany cp : rgcpls) {
+                            List<ProBasicPowerstation> wpls = CacheContext.cpwpmap.get(cp.getId());
                             for (ProBasicPowerstation wp : wpls) {
                                 ProBasicPowerstation newWp = new ProBasicPowerstation();
                                 BeanUtil.copyProperties(wp, newWp);
                                 wplist.add(newWp);
                             }
                         }
-                    }  else if (depId.equals("0")) {
+
+                    }   else if (depId.equals("0")) {
                         List<ProBasicPowerstation> wpls = CacheContext.wpls;
                         for (ProBasicPowerstation wp : wpls) {
                             ProBasicPowerstation newWp = new ProBasicPowerstation();

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/custom/curve/DataFittingService.java

@@ -15,12 +15,14 @@ import com.gyee.power.fitting.model.anno.FixedVo;
 import com.gyee.power.fitting.model.custom.*;
 import com.gyee.power.fitting.service.ProEconPowerFittingAnalySisService;
 import com.gyee.power.fitting.service.ProEconPowerModelService;
+import com.gyee.power.fitting.service.auth.TokenService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -44,6 +46,8 @@ public class DataFittingService {
     @Resource
     private ProEconPowerFittingAnalySisService powerService;
 
+    @Resource
+    private TokenService tokenService;
 
     /**
      * 曲线拟合
@@ -125,8 +129,13 @@ public class DataFittingService {
      * 拟合模块展示  tree
      * @return
      */
-    public List<Object> dataFittingTree(){
-        List<ProEconPowerFittingAnalySis> list = powerService.selectList(Constants.DATA_FITTING);
+    public List<Object> dataFittingTree(HttpServletRequest request){
+        List<ProBasicPowerstation> powerstationList = tokenService.getWpls(request);
+        if(powerstationList.size()<=0){
+            return null;
+        }
+        List<String> stations = powerstationList.stream().map(e -> e.getId()).collect(Collectors.toList());
+        List<ProEconPowerFittingAnalySis> list = powerService.selectList(stations,Constants.DATA_FITTING);
         List<Object> ls = PowerFittingUtil.powerDataTree(list, Constants.DATA_FITTING);
         return ls;
     }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/custom/curve/DataPrepareService.java

@@ -11,6 +11,7 @@ import com.gyee.power.fitting.common.util.FileUtil;
 import com.gyee.power.fitting.common.util.NumberUtil;
 import com.gyee.power.fitting.common.util.PowerFittingUtil;
 import com.gyee.power.fitting.model.ProBasicEquipmentPoint;
+import com.gyee.power.fitting.model.ProBasicPowerstation;
 import com.gyee.power.fitting.model.ProEconPowerFittingAnalySis;
 import com.gyee.power.fitting.model.anno.AnnotationTool;
 import com.gyee.power.fitting.model.anno.FixedVo;
@@ -18,6 +19,7 @@ import com.gyee.power.fitting.model.custom.PowerPointData;
 import com.gyee.power.fitting.model.custom.TableTitle;
 import com.gyee.power.fitting.model.custom.TsDoubleData;
 import com.gyee.power.fitting.service.ProEconPowerFittingAnalySisService;
+import com.gyee.power.fitting.service.auth.TokenService;
 import com.gyee.power.fitting.service.custom.socket.WebSocketServer;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -25,6 +27,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -46,6 +50,9 @@ public class DataPrepareService {
     @Autowired
     private RemoteServiceBuilder remoteService;
 
+    @Resource
+    private TokenService tokenService;
+
     /**
      * 数据准备
      * @param station 场站
@@ -107,8 +114,14 @@ public class DataPrepareService {
      * 数据准备模块展示  tree
      * @return
      */
-    public List<Object> dataPrepareTree(){
-        List<ProEconPowerFittingAnalySis> list = powerService.selectList(Constants.DATA_PREPARE);
+    public List<Object> dataPrepareTree(HttpServletRequest request){
+
+        List<ProBasicPowerstation> powerstationList = tokenService.getWpls(request);
+        if(powerstationList.size()<=0){
+            return null;
+        }
+        List<String> stations = powerstationList.stream().map(e -> e.getId()).collect(Collectors.toList());
+        List<ProEconPowerFittingAnalySis> list = powerService.selectList(stations,Constants.DATA_PREPARE);
         List<Object> ls = PowerFittingUtil.powerDataTree(list, Constants.DATA_PREPARE);
         return ls;
     }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/custom/curve/DataProcessService.java

@@ -9,16 +9,20 @@ import com.gyee.power.fitting.common.util.FileUtil;
 import com.gyee.power.fitting.common.util.PowerFittingUtil;
 import com.gyee.power.fitting.common.util.SnowFlakeUtil;
 import com.gyee.power.fitting.model.ProBasicModelPower;
+import com.gyee.power.fitting.model.ProBasicPowerstation;
 import com.gyee.power.fitting.model.ProEconPowerFittingAnalySis;
 import com.gyee.power.fitting.model.anno.AnnotationTool;
 import com.gyee.power.fitting.model.anno.FixedVo;
 import com.gyee.power.fitting.model.custom.PowerPointData;
 import com.gyee.power.fitting.model.custom.TableTitle;
 import com.gyee.power.fitting.service.ProEconPowerFittingAnalySisService;
+import com.gyee.power.fitting.service.auth.TokenService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -33,6 +37,9 @@ public class DataProcessService {
     @Autowired
     private ProEconPowerFittingAnalySisService powerService;
 
+    @Resource
+    private TokenService tokenService;
+
     /**
      * 数据预处理
      *
@@ -93,8 +100,14 @@ public class DataProcessService {
      *
      * @return
      */
-    public List<Object> dataProcessTree() {
-        List<ProEconPowerFittingAnalySis> list = powerService.selectList(Constants.DATA_PROCESS);
+    public List<Object> dataProcessTree(HttpServletRequest request){
+
+        List<ProBasicPowerstation> powerstationList = tokenService.getWpls(request);
+        if(powerstationList.size()<=0){
+            return null;
+        }
+        List<String> stations = powerstationList.stream().map(e -> e.getId()).collect(Collectors.toList());
+        List<ProEconPowerFittingAnalySis> list = powerService.selectList(stations,Constants.DATA_PROCESS);
         List<Object> ls = PowerFittingUtil.powerDataTree(list, Constants.DATA_PROCESS);
         return ls;
     }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicCompanyServiceImpl.java

@@ -0,0 +1,72 @@
+package com.gyee.power.fitting.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.power.fitting.common.config.StringUtils;
+import com.gyee.power.fitting.mapper.ProBasicCompanyMapper;
+import com.gyee.power.fitting.model.ProBasicCompany;
+import com.gyee.power.fitting.service.IProBasicCompanyService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 省公司表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMapper, ProBasicCompany> implements IProBasicCompanyService {
+
+    @Override
+    public Double getProBasicCompanyCapacity(String regionId, String companyId) {
+
+
+        QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
+
+        //判断后缀是区域还是公司
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_ZGS")) {
+            qw.lambda().eq(ProBasicCompany::getId, companyId);
+        }
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_RGN")) {
+            qw.lambda().eq(ProBasicCompany::getRegionId, companyId);
+        }
+
+
+//        BigDecimal sumall = new BigDecimal("0.0000");
+
+        Double sumall = new Double(0.00);
+        List<ProBasicCompany> list = getBaseMapper().selectList(qw);
+        for (ProBasicCompany i : list) {
+            sumall = sumall + i.getJrwindCapacity() + i.getJrCapacity();
+        }
+
+        return sumall;
+    }
+
+    @Override
+    public Integer getProBasicCompanyQuantity(String regionId, String companyId) {
+        QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
+
+        //判断后缀是区域还是公司
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_ZGS")) {
+            qw.lambda().eq(ProBasicCompany::getId, companyId);
+        }
+        if (StringUtils.isNotEmpty(companyId) && companyId.endsWith("_RGN")) {
+            qw.lambda().eq(ProBasicCompany::getRegionId, companyId);
+        }
+
+
+        Integer quantity = new Integer(0);
+        List<ProBasicCompany> list = getBaseMapper().selectList(qw);
+        for (ProBasicCompany i : list) {
+            quantity = quantity + i.getJrquantityJz() + i.getJrquantityZc() + i.getJrwindQuantityHs() + i.getJrwindQuantityLd();
+        }
+
+        return quantity;
+    }
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicEnergyGroupServiceImpl.java

@@ -0,0 +1,21 @@
+package com.gyee.power.fitting.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.power.fitting.mapper.ProBasicEnergyGroupMapper;
+import com.gyee.power.fitting.model.ProBasicEnergyGroup;
+import com.gyee.power.fitting.service.IProBasicEnergyGroupService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 集团 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicEnergyGroupServiceImpl extends ServiceImpl<ProBasicEnergyGroupMapper, ProBasicEnergyGroup> implements IProBasicEnergyGroupService {
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicRegionServiceImpl.java

@@ -0,0 +1,21 @@
+package com.gyee.power.fitting.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.power.fitting.mapper.ProBasicRegionMapper;
+import com.gyee.power.fitting.model.ProBasicRegion;
+import com.gyee.power.fitting.service.IProBasicRegionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 区域 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper, ProBasicRegion> implements IProBasicRegionService {
+
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProEconPowerFittingAnalySisServiceImpl.java

@@ -40,12 +40,15 @@ public class ProEconPowerFittingAnalySisServiceImpl extends ServiceImpl<ProEconP
     }
 
     @Override
-    public List<ProEconPowerFittingAnalySis> selectList(String type) {
+    public List<ProEconPowerFittingAnalySis> selectList(List<String> stations,String type) {
         List<ProEconPowerFittingAnalySis> list = new ArrayList();
 
         ExcludeQueryWrapper wrapper = new ExcludeQueryWrapper();
         wrapper.eq("type", type);
 
+
+        wrapper.in("station", stations);
+
         try{
             list = baseMapper.selectList(wrapper);
         }catch (Exception e){

power-fitting-JN/src/main/resources/mapper/WindpowerstationMapper.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.power.fitting.mapper.WindpowerstationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gyee.power.fitting.model.Windpowerstation">
-        <id column="ID" property="id" />
-        <result column="CODE" property="code" />
-        <result column="NAME" property="name" />
-        <result column="ADDRESS" property="address" />
-        <result column="TELEPHONE" property="telephone" />
-        <result column="CAPACITY" property="capacity" />
-        <result column="CAPACITYUNIT" property="capacityunit" />
-        <result column="QUANTITY" property="quantity" />
-        <result column="ANAME" property="aname" />
-        <result column="LONGITUDE" property="longitude" />
-        <result column="LATITUDE" property="latitude" />
-        <result column="PHOTO" property="photo" />
-        <result column="COMPANYID" property="companyid" />
-        <result column="SYSTEMMANUFACT" property="systemmanufact" />
-        <result column="HEADFARM" property="headfarm" />
-        <result column="HEADFARMPHONE" property="headfarmphone" />
-        <result column="MODEL" property="model" />
-        <result column="ORDERNUM" property="ordernum" />
-        <result column="ALTITUDE" property="altitude" />
-        <result column="HEIGHT" property="height" />
-<!--        <result column="AQTS" property="aqts" />-->
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        ID, CODE, NAME, ADDRESS, TELEPHONE, CAPACITY, CAPACITYUNIT, QUANTITY, ANAME, LONGITUDE, LATITUDE, PHOTO, COMPANYID, SYSTEMMANUFACT, HEADFARM, HEADFARMPHONE, MODEL, ORDERNUM, ALTITUDE, HEIGHT
-    </sql>
-
-</mapper>

power-fitting-JN/src/main/resources/mapper/WindturbineMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.power.fitting.mapper.WindturbineMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gyee.power.fitting.model.Windturbine">
-        <id column="ID" property="id" />
-        <result column="CODE" property="code" />
-        <result column="WINDPOWERSTATIONID" property="windpowerstationid" />
-        <result column="LONGITUDE" property="longitude" />
-        <result column="LATITUDE" property="latitude" />
-        <result column="MODELID" property="modelid" />
-        <result column="STATUS" property="status" />
-        <result column="PROJECTID" property="projectid" />
-        <result column="LINEID" property="lineid" />
-        <result column="FIRSTINTEGRATEDTIME" property="firstintegratedtime" />
-        <result column="PHOTO" property="photo" />
-        <result column="NAME" property="name" />
-        <result column="STANDARDID" property="standardid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        ID, CODE, WINDPOWERSTATIONID, LONGITUDE, LATITUDE, MODELID, STATUS, PROJECTID, LINEID, FIRSTINTEGRATEDTIME, PHOTO, NAME, STANDARDID
-    </sql>
-
-</mapper>

power-fitting-JN/src/main/resources/mapper/Windturbinetestingpointai2Mapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.power.fitting.mapper.Windturbinetestingpointai2Mapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gyee.power.fitting.model.Windturbinetestingpointai2">
-        <id column="ID" property="id" />
-        <result column="CODE" property="code" />
-        <result column="NAME" property="name" />
-        <result column="MODEL" property="model" />
-        <result column="VALUEUNIT" property="valueunit" />
-        <result column="ENGLISHNAME" property="englishname" />
-        <result column="TYPEID" property="typeid" />
-        <result column="MODELID" property="modelid" />
-        <result column="MAXVAL" property="maxval" />
-        <result column="MINVAL" property="minval" />
-        <result column="REASONABLEMAXVAL" property="reasonablemaxval" />
-        <result column="REASONABLEMINVAL" property="reasonableminval" />
-        <result column="WINDTURBINEID" property="windturbineid" />
-        <result column="UNIFORMCODE" property="uniformcode" />
-        <result column="SHORTID" property="shortid" />
-        <result column="LONGID" property="longid" />
-        <result column="WINDPOWERSTATIONID" property="windpowerstationid" />
-        <result column="REALTIMEID" property="realtimeid" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        ID, CODE, NAME, MODEL, VALUEUNIT, ENGLISHNAME, TYPEID, MODELID, MAXVAL, MINVAL, REASONABLEMAXVAL, REASONABLEMINVAL, WINDTURBINEID, UNIFORMCODE, SHORTID, LONGID, WINDPOWERSTATIONID, REALTIMEID
-    </sql>
-
-</mapper>