表结构更新；同步更新代码结构

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/config/CacheContext.java

@@ -32,7 +32,7 @@ public class CacheContext implements CommandLineRunner {
     private IProBasicCompanyService proBasicCompanyService;//公司
 
     @Resource
-    private IProBasicWindpowerstationService proBasicWindpowerstationService;//场站
+    private IProBasicPowerstationService proBasicWindpowerstationService;//场站
 
     @Resource
     private IProBasicProjectService proBasicProjectService;//期次
@@ -41,7 +41,7 @@ public class CacheContext implements CommandLineRunner {
     private IProBasicLineService proBasicLineService;//线路
 
     @Autowired
-    private IProBasicWindturbineService proBasicWindturbineService;//风机
+    private IProBasicEquipmentService proBasicWindturbineService;//风机
 
     //集团
     public static Map<String, ProBasicEnergyGroup> energymap = new HashMap<>();
@@ -56,8 +56,8 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicCompany> cpls = new ArrayList<>();
 
     //场站
-    public static Map<String, ProBasicWindpowerstation> wpmap = new HashMap<>();
-    public static List<ProBasicWindpowerstation> wpls = new ArrayList<>();
+    public static Map<String, ProBasicPowerstation> wpmap = new HashMap<>();
+    public static List<ProBasicPowerstation> wpls = new ArrayList<>();
 
     //期次
     public static Map<String, ProBasicProject> promap = new HashMap<>();
@@ -68,8 +68,8 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicLine> lines = new ArrayList<>();
 
     //风机
-    public static Map<String, ProBasicWindturbine> windturbinemap = new HashMap<>();
-    public static List<ProBasicWindturbine> windturbines = new ArrayList<>();
+    public static Map<String, ProBasicEquipment> windturbinemap = new HashMap<>();
+    public static List<ProBasicEquipment> windturbines = new ArrayList<>();
 
 
     @Override

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEnergyGroupController.java

@@ -3,9 +3,7 @@ package com.gyee.backconfig.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.ProBasicCompany;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
-import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.service.auto.IProBasicEnergyGroupService;
 import org.springframework.web.bind.annotation.*;
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWppointController.java

@@ -21,7 +21,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("//pro-basic-wppoint")
-public class ProBasicWppointController {
+public class ProBasicEquipmentController {
     @Resource
     private IProBasicWppointService proBasicWppointService;
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWindpowerstationController.java

@@ -3,10 +3,9 @@ package com.gyee.backconfig.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
-import com.gyee.backconfig.service.auto.IProBasicWindpowerstationService;
+import com.gyee.backconfig.model.auto.ProBasicPowerstation;
+import com.gyee.backconfig.service.auto.IProBasicPowerstationService;
 import com.gyee.backconfig.vo.WindpowerstationAdmVo;
-import com.gyee.common.model.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -23,9 +22,9 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("//pro-basic-windpowerstation")
-public class ProBasicWindpowerstationController {
+public class ProBasicPowerstationController {
     @Resource
-    private IProBasicWindpowerstationService proBasicWindpowerstationService;
+    private IProBasicPowerstationService proBasicWindpowerstationService;
 
     /**
      * 查询
@@ -45,7 +44,7 @@ public class ProBasicWindpowerstationController {
                       @RequestParam(value = "companyId", required = false) String companyId,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicWindpowerstation> list = proBasicWindpowerstationService.getList(id, name, code, companyId, pageNum, pageSize);
+        IPage<ProBasicPowerstation> list = proBasicWindpowerstationService.getList(id, name, code, companyId, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -61,7 +60,7 @@ public class ProBasicWindpowerstationController {
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody ProBasicWindpowerstation proBasicWindpowerstation) {
+    public R addAll(@RequestBody ProBasicPowerstation proBasicWindpowerstation) {
 
         boolean b = proBasicWindpowerstationService.saveOrUpdate(proBasicWindpowerstation);
         if (b) {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicWindturbineController.java

@@ -3,10 +3,8 @@ package com.gyee.backconfig.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
-import com.gyee.backconfig.model.auto.ProBasicWindturbine;
-import com.gyee.backconfig.service.auto.IProBasicWindturbineService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.gyee.backconfig.model.auto.ProBasicEquipment;
+import com.gyee.backconfig.service.auto.IProBasicEquipmentService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -24,7 +22,7 @@ import java.util.Arrays;
 @RequestMapping("//pro-basic-windturbine")
 public class ProBasicWindturbineController {
     @Resource
-    private IProBasicWindturbineService proBasicWindturbineService;
+    private IProBasicEquipmentService proBasicWindturbineService;
 
     /**
      * 查询
@@ -46,7 +44,7 @@ public class ProBasicWindturbineController {
                       @RequestParam(value = "lineId", required = false) String lineId,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicWindturbine> list = proBasicWindturbineService.list(id, code, windpowerstationId, projectId, lineId, pageNum, pageSize);
+        IPage<ProBasicEquipment> list = proBasicWindturbineService.list(id, code, windpowerstationId, projectId, lineId, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {
@@ -61,7 +59,7 @@ public class ProBasicWindturbineController {
      * @return
      */
     @PostMapping(value = "/add")
-    public R addAll(@RequestBody ProBasicWindturbine proBasicWindpowerstation) {
+    public R addAll(@RequestBody ProBasicEquipment proBasicWindpowerstation) {
 
         boolean b = proBasicWindturbineService.saveOrUpdate(proBasicWindpowerstation);
         if (b) {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/SttreeControllel.java

@@ -1,7 +1,6 @@
 package com.gyee.backconfig.controller;
 
 import com.gyee.backconfig.config.R;
-import com.gyee.backconfig.model.auto.ProBasicCompany;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.service.auto.SttreeService;

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicWindturbineMapper.java

@@ -1,6 +1,6 @@
 package com.gyee.backconfig.mapper.auto;
 
-import com.gyee.backconfig.model.auto.ProBasicWindturbine;
+import com.gyee.backconfig.model.auto.ProBasicEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wang
  * @since 2022-10-15
  */
-public interface ProBasicWindturbineMapper extends BaseMapper<ProBasicWindturbine> {
+public interface ProBasicEquipmentMapper extends BaseMapper<ProBasicEquipment> {
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicWindpowerstationMapper.java

@@ -1,6 +1,6 @@
 package com.gyee.backconfig.mapper.auto;
 
-import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
+import com.gyee.backconfig.model.auto.ProBasicPowerstation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author wang
  * @since 2022-10-15
  */
-public interface ProBasicWindpowerstationMapper extends BaseMapper<ProBasicWindpowerstation> {
+public interface ProBasicPowerstationMapper extends BaseMapper<ProBasicPowerstation> {
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicCompany.java

@@ -4,9 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,7 +31,7 @@ public class ProBasicCompany extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称
@@ -187,5 +185,5 @@ public class ProBasicCompany extends Model {
 
 
     @TableField(exist = false)
-    private List<ProBasicWindpowerstation> Children = new ArrayList<>();
+    private List<ProBasicPowerstation> Children = new ArrayList<>();
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEnergyGroup.java

@@ -4,9 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,13 +15,14 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wang
- * @since 2022-10-15
+ * @since 2022-11-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ProBasicEnergyGroup extends Model {
 
     private static final long serialVersionUID = 1L;
+
     /**
      * 编号
      */
@@ -32,7 +31,7 @@ public class ProBasicEnergyGroup extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 父编号

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWindturbine.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicWindturbine extends Model {
+public class ProBasicEquipment extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -28,7 +28,7 @@ public class ProBasicWindturbine extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 场站编号(冗余)

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicLine.java

@@ -31,7 +31,7 @@ public class ProBasicLine extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称
@@ -93,6 +93,6 @@ public class ProBasicLine extends Model {
      */
     private String spare4;
     @TableField(exist = false)
-    private List<ProBasicWindturbine> Children = new ArrayList<>();
+    private List<ProBasicEquipment> Children = new ArrayList<>();
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicWindpowerstation.java

@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicWindpowerstation extends Model {
+public class ProBasicPowerstation extends Model {
 
     private static final long serialVersionUID = 1L;
 
@@ -33,7 +33,7 @@ public class ProBasicWindpowerstation extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicProject.java

@@ -34,7 +34,7 @@ public class ProBasicProject extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicRegion.java

@@ -4,9 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,13 +15,14 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wang
- * @since 2022-10-15
+ * @since 2022-11-09
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ProBasicRegion extends Model {
 
     private static final long serialVersionUID = 1L;
+
     /**
      * 编号
      */
@@ -32,7 +31,7 @@ public class ProBasicRegion extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicEnergyGroupService.java

@@ -3,7 +3,6 @@ package com.gyee.backconfig.service.auto;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gyee.backconfig.model.auto.ProBasicRegion;
 
 import java.util.List;
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicEquipmentService.java

@@ -0,0 +1,22 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 风机 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-10-15
+ */
+public interface IProBasicEquipmentService extends IService<ProBasicEquipment> {
+    IPage<ProBasicEquipment> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize);
+
+    List<ProBasicEquipment> getWindturbineGyLine(String windpowerstationId, String projectId , String lineId);
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicWindpowerstationService.java

@@ -1,7 +1,7 @@
 package com.gyee.backconfig.service.auto;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
+import com.gyee.backconfig.model.auto.ProBasicPowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.backconfig.vo.WindpowerstationAdmVo;
 
@@ -15,9 +15,9 @@ import java.util.List;
  * @author wang
  * @since 2022-10-15
  */
-public interface IProBasicWindpowerstationService extends IService<ProBasicWindpowerstation> {
-    IPage<ProBasicWindpowerstation> getList(String id, String name, String code, String companyId, String pageNum, String pageSize);
-    List<ProBasicWindpowerstation> getList(String regionId);
+public interface IProBasicPowerstationService extends IService<ProBasicPowerstation> {
+    IPage<ProBasicPowerstation> getList(String id, String name, String code, String companyId, String pageNum, String pageSize);
+    List<ProBasicPowerstation> getList(String regionId);
 
     List<WindpowerstationAdmVo> getList(String id,String regionId, String companyId) throws Exception;
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicRegionService.java

@@ -1,12 +1,9 @@
 package com.gyee.backconfig.service.auto;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
  * 区域 服务类

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicWindturbineService.java

@@ -1,22 +0,0 @@
-package com.gyee.backconfig.service.auto;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gyee.backconfig.model.auto.ProBasicWindturbine;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 风机 服务类
- * </p>
- *
- * @author wang
- * @since 2022-10-15
- */
-public interface IProBasicWindturbineService extends IService<ProBasicWindturbine> {
-    IPage<ProBasicWindturbine> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize);
-
-    List<ProBasicWindturbine> getWindturbineGyLine(String windpowerstationId, String projectId , String lineId);
-
-}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/PointGenerateService.java

@@ -30,7 +30,7 @@ public class PointGenerateService {
     private IProBasicCompanyService proBasicCompanyService;//公司
 
     @Resource
-    private IProBasicWindpowerstationService proBasicWindpowerstationService;//场站
+    private IProBasicPowerstationService proBasicWindpowerstationService;//场站
 
     @Resource
     private IProBasicProjectService proBasicProjectService;//期次
@@ -39,7 +39,7 @@ public class PointGenerateService {
     private IProBasicLineService proBasicLineService;//线路
 
     @Autowired
-    private IProBasicWindturbineService proBasicWindturbineService;//风机
+    private IProBasicEquipmentService proBasicWindturbineService;//风机
 
     @Autowired
     private IProBasicWppointService proBasicWppointService;//场站测点
@@ -77,7 +77,7 @@ public class PointGenerateService {
                 for (ProBasicEnergyGroup c : EnergyList) {
                     List<ProBasicCompany> CompanyList = proBasicCompanyService.getCompanycode(c.getCapacityUnit());
                     for (ProBasicCompany r : CompanyList) {
-                        List<ProBasicWindpowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
+                        List<ProBasicPowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
                         List<ProBasicEquipmentPoint> testingList = czd(p, windpowerstationList, r);
                         for (ProBasicEquipmentPoint i : testingList) {
                             boolean b = proBasicEquipmentPointService.addOrUpdate(i);
@@ -182,8 +182,8 @@ public class PointGenerateService {
                 }
 
 
-                List<ProBasicWindpowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
-                for (ProBasicWindpowerstation station : windpowerstationList) {
+                List<ProBasicPowerstation> windpowerstationList = proBasicWindpowerstationService.getList(r.getId());
+                for (ProBasicPowerstation station : windpowerstationList) {
                     List<ProBasicWppoint> list3 = proBasicWppointService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
                     if (null != list3 && list3.size() > 0) {
                         continue;
@@ -266,14 +266,14 @@ public class PointGenerateService {
      * @param company
      * @return
      */
-    private List<ProBasicEquipmentPoint> czd(Standardpoint p, List<ProBasicWindpowerstation> windpowerstationList, ProBasicCompany company) {
+    private List<ProBasicEquipmentPoint> czd(Standardpoint p, List<ProBasicPowerstation> windpowerstationList, ProBasicCompany company) {
         ProBasicEquipmentPoint testing = null;
         List<ProBasicEquipmentPoint> testingList = new ArrayList<>();
-        for (ProBasicWindpowerstation station : windpowerstationList) {
+        for (ProBasicPowerstation station : windpowerstationList) {
 
 
-            List<ProBasicWindturbine> windturbineList = proBasicWindturbineService.getWindturbineGyLine(station.getId(), "", "");
-            for (ProBasicWindturbine w : windturbineList) {
+            List<ProBasicEquipment> windturbineList = proBasicWindturbineService.getWindturbineGyLine(station.getId(), "", "");
+            for (ProBasicEquipment w : windturbineList) {
                 List<ProBasicEquipmentPoint> list = proBasicEquipmentPointService.list(w.getId(), p.getUniformcode());
                 if (null != list && list.size() > 0) {
                     continue;

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/SttreeService.java

@@ -4,9 +4,7 @@ import com.gyee.backconfig.config.CacheContext;
 import com.gyee.backconfig.model.auto.*;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Scanner;
 import java.util.stream.Collectors;
 
 @Service
@@ -16,10 +14,10 @@ public class SttreeService {
         List<ProBasicEnergyGroup> energyls = CacheContext.energy;//集团
         List<ProBasicRegion> regionsls = CacheContext.regions;//区域
         List<ProBasicCompany> cpls = CacheContext.cpls;//公司
-        List<ProBasicWindpowerstation> wpls = CacheContext.wpls;//场站
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;//场站
         List<ProBasicProject> prols = CacheContext.prols;//期次
         List<ProBasicLine> list = CacheContext.lines;//线路
-        List<ProBasicWindturbine> wbls = CacheContext.windturbines;//风机
+        List<ProBasicEquipment> wbls = CacheContext.windturbines;//风机
 
 //        if (energyls.get(0).getChildren().size() > 0) return energyls;
 
@@ -41,7 +39,7 @@ public class SttreeService {
 
         //公司-场站
         cpls.forEach(wp -> {
-            List<ProBasicWindpowerstation> co = wpls.stream().filter(w -> null != w.getCompanyId() && w.getCompanyId().equals(wp.getId())).collect(Collectors.toList());
+            List<ProBasicPowerstation> co = wpls.stream().filter(w -> null != w.getCompanyId() && w.getCompanyId().equals(wp.getId())).collect(Collectors.toList());
             co.stream().forEach(c -> {
                 c.getChildren().clear();
             });
@@ -76,7 +74,7 @@ public class SttreeService {
         }
         //线路-风机
         list.forEach(fj -> {
-            List<ProBasicWindturbine> fjls = wbls.stream().filter(f -> null != f.getLineId() && f.getLineId().equals(fj.getId())).collect(Collectors.toList());
+            List<ProBasicEquipment> fjls = wbls.stream().filter(f -> null != f.getLineId() && f.getLineId().equals(fj.getId())).collect(Collectors.toList());
             fj.getChildren().addAll(fjls);
         });
 
@@ -89,10 +87,10 @@ public class SttreeService {
         List<ProBasicEnergyGroup> energyls = CacheContext.energy;//集团
         List<ProBasicRegion> regionsls = CacheContext.regions;//区域
         List<ProBasicCompany> cpls = CacheContext.cpls;//公司
-        List<ProBasicWindpowerstation> wpls = CacheContext.wpls;//场站
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;//场站
         List<ProBasicProject> prols = CacheContext.prols;//期次
         List<ProBasicLine> list = CacheContext.lines;//线路
-        List<ProBasicWindturbine> wbls = CacheContext.windturbines;//线路
+        List<ProBasicEquipment> wbls = CacheContext.windturbines;//线路
 
 //        if (energyls.get(0).getChildren().size() > 0) return energyls;
 
@@ -113,7 +111,7 @@ public class SttreeService {
 
         //公司-场站
         cpls.forEach(wp -> {
-            List<ProBasicWindpowerstation> co = wpls.stream().filter(w -> null != w.getCompanyId() && w.getCompanyId().equals(wp.getId())).collect(Collectors.toList());
+            List<ProBasicPowerstation> co = wpls.stream().filter(w -> null != w.getCompanyId() && w.getCompanyId().equals(wp.getId())).collect(Collectors.toList());
             co.stream().forEach(c -> {
                 c.getChildren().clear();
             });
@@ -148,7 +146,7 @@ public class SttreeService {
         }
         //线路-风机
         list.forEach(fj -> {
-            List<ProBasicWindturbine> fjls = wbls.stream().filter(f -> null != f.getLineId() && f.getLineId().equals(fj.getId())).collect(Collectors.toList());
+            List<ProBasicEquipment> fjls = wbls.stream().filter(f -> null != f.getLineId() && f.getLineId().equals(fj.getId())).collect(Collectors.toList());
             fj.getChildren().addAll(fjls);
         });
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicEnergyGroupServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.gyee.backconfig.mapper.auto.ProBasicEnergyGroupMapper;
-import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.service.auto.IProBasicEnergyGroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicWindturbineServiceImpl.java

@@ -3,9 +3,9 @@ package com.gyee.backconfig.service.auto.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.model.auto.ProBasicWindturbine;
-import com.gyee.backconfig.mapper.auto.ProBasicWindturbineMapper;
-import com.gyee.backconfig.service.auto.IProBasicWindturbineService;
+import com.gyee.backconfig.model.auto.ProBasicEquipment;
+import com.gyee.backconfig.mapper.auto.ProBasicEquipmentMapper;
+import com.gyee.backconfig.service.auto.IProBasicEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
@@ -21,16 +21,16 @@ import java.util.List;
  * @since 2022-10-15
  */
 @Service
-public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturbineMapper, ProBasicWindturbine> implements IProBasicWindturbineService {
+public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentMapper, ProBasicEquipment> implements IProBasicEquipmentService {
 
     @Override
-    public IPage<ProBasicWindturbine> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize) {
-        QueryWrapper<ProBasicWindturbine> qw = new QueryWrapper<>();
+    public IPage<ProBasicEquipment> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicEquipment> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
         }
         if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+            qw.like("nemCode",code);
         }
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
@@ -45,16 +45,16 @@ public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturb
             qw.eq("lineId",lineId);
         }
 
-        Page<ProBasicWindturbine> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        IPage<ProBasicWindturbine> companysPage = getBaseMapper().selectPage(page, qw);
+        Page<ProBasicEquipment> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicEquipment> companysPage = getBaseMapper().selectPage(page, qw);
 //        List<Windturbine> list = companysPage.getRecords();
         return companysPage;
 
     }
 
     @Override
-    public List<ProBasicWindturbine> getWindturbineGyLine(String windpowerstationId, String projectId, String lineId) {
-        QueryWrapper<ProBasicWindturbine> qw = new QueryWrapper<>();
+    public List<ProBasicEquipment> getWindturbineGyLine(String windpowerstationId, String projectId, String lineId) {
+        QueryWrapper<ProBasicEquipment> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
             qw.eq("windpowerstationId",windpowerstationId);
@@ -66,7 +66,7 @@ public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturb
             qw.eq("projectId",projectId);
         }
 
-        List<ProBasicWindturbine> list =  baseMapper.selectList(qw);
+        List<ProBasicEquipment> list =  baseMapper.selectList(qw);
 
         return list;
     }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicLineServiceImpl.java

@@ -30,7 +30,7 @@ public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, Pro
             qw.like("id", id);
         }
         if (StringUtils.isNotEmpty(code)) {
-            qw.like("code", code);
+            qw.like("nemCode", code);
         }
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicWindpowerstationServiceImpl.java

@@ -5,9 +5,9 @@ import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.backconfig.model.auto.ProBasicWindpowerstation;
-import com.gyee.backconfig.mapper.auto.ProBasicWindpowerstationMapper;
-import com.gyee.backconfig.service.auto.IProBasicWindpowerstationService;
+import com.gyee.backconfig.model.auto.ProBasicPowerstation;
+import com.gyee.backconfig.mapper.auto.ProBasicPowerstationMapper;
+import com.gyee.backconfig.service.auto.IProBasicPowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.backconfig.service.auto.RedisService;
 import com.gyee.backconfig.until.realtimedate.EdosUtil;
@@ -32,22 +32,22 @@ import java.util.Map;
  * @since 2022-10-15
  */
 @Service
-public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWindpowerstationMapper, ProBasicWindpowerstation> implements IProBasicWindpowerstationService {
+public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerstationMapper, ProBasicPowerstation> implements IProBasicPowerstationService {
     @Resource
     private RedisService redisService;
 
     @Autowired
     private EdosUtil goldenUtil;
     @Override
-    public IPage<ProBasicWindpowerstation> getList(String id, String name, String code, String companyId, String pageNum, String pageSize) {
-        QueryWrapper<ProBasicWindpowerstation> qw = new QueryWrapper<>();
+    public IPage<ProBasicPowerstation> getList(String id, String name, String code, String companyId, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
         }
 
         if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+            qw.like("nemCode",code);
         }
 
         if (StringUtils.isNotEmpty(name)){
@@ -58,22 +58,22 @@ public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWin
             qw.like("companyId",companyId);
         }
 
-        Page<ProBasicWindpowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-        IPage<ProBasicWindpowerstation> companysPage = getBaseMapper().selectPage(page, qw);
+        Page<ProBasicPowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicPowerstation> companysPage = getBaseMapper().selectPage(page, qw);
 //        List<Windpowerstation> list = companysPage.getRecords();
         return companysPage;
 
     }
 
     @Override
-    public List<ProBasicWindpowerstation> getList(String regionId) {
-        QueryWrapper<ProBasicWindpowerstation> qw = new QueryWrapper<>();
+    public List<ProBasicPowerstation> getList(String regionId) {
+        QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(regionId)){
             qw.eq("regionid",regionId);
         }
 
-        List<ProBasicWindpowerstation> list = baseMapper.selectList(qw);
+        List<ProBasicPowerstation> list = baseMapper.selectList(qw);
         return list;
     }
 
@@ -81,7 +81,7 @@ public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWin
     public List<WindpowerstationAdmVo> getList(String id, String regionId, String companyId) throws Exception {
 
         List<WindpowerstationAdmVo> admvos =  new ArrayList<>();
-        QueryWrapper<ProBasicWindpowerstation> qw = new QueryWrapper<>();
+        QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
@@ -94,25 +94,25 @@ public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWin
             qw.eq("companyId",companyId);
         }
 
-        List<ProBasicWindpowerstation> list = baseMapper.selectList(qw);
+        List<ProBasicPowerstation> list = baseMapper.selectList(qw);
 
         list.stream().forEach(i->{
             List<String> codes = new ArrayList<>();
 //            RPJFS
 //            RFDL
             String wpString = redisService.get(i.getId());
-            Map<String, ProBasicWindpowerstation> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicWindpowerstation>>() {
+            Map<String, ProBasicPowerstation> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicPowerstation>>() {
 
             });
             if(null !=stringMapMap){
-                codes.add(stringMapMap.get("RPJFS").getCode());//日平局风速
-                codes.add(stringMapMap.get("RFDL").getCode());//日发电量
+                codes.add(stringMapMap.get("RPJFS").getNemCode());//日平局风速
+                codes.add(stringMapMap.get("RFDL").getNemCode());//日发电量
             }
             try {
                 List<PointData> pointList = goldenUtil.getRealData(codes);
                 WindpowerstationAdmVo vo = new WindpowerstationAdmVo();
                 vo.setId(i.getId());
-                vo.setCode(i.getCode());
+                vo.setCode(i.getNemCode());
                 vo.setName(i.getName());
                 vo.setCapacity(i.getCapacity());//装机容量
                 vo.setCapacityUnit(i.getCapacityUnit());//装机容量单位

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicProjectServiceImpl.java

@@ -32,7 +32,7 @@ public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMappe
         }
 
         if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+            qw.like("nemCode",code);
         }
 
         if (StringUtils.isNotEmpty(name)){

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicRegionServiceImpl.java

@@ -39,7 +39,7 @@ public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper,
             qw.like("aname",aname);
         }
         if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+            qw.like("nemCode",code);
         }
 
         Page<ProBasicRegion> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));