代码优化修改

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

@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -68,8 +69,11 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicLine> lines = new ArrayList<>();
 
     //风机
-    public static Map<String, ProBasicEquipment> windturbinemap = new HashMap<>();
-    public static List<ProBasicEquipment> windturbines = new ArrayList<>();
+    public static Map<String, ProBasicEquipment> equipmentmap = new HashMap<>();
+    public static List<ProBasicEquipment> equipments = new ArrayList<>();
+    public static Map<String,List<ProBasicEquipment>> poequipmentmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> pjequipmentmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> liequipmentmap = new HashMap<>();
 
 
     @Override
@@ -112,9 +116,12 @@ public class CacheContext implements CommandLineRunner {
         });
 
         //风机
-        windturbines = proBasicWindturbineService.list();
-        windturbines.stream().forEach(windturbine -> {
-            windturbinemap.put(windturbine.getId(), windturbine);
+        equipments = proBasicWindturbineService.list();
+        equipments.stream().forEach(windturbine -> {
+            equipmentmap.put(windturbine.getId(), windturbine);
         });
+        poequipmentmap =  equipments.stream().collect(Collectors.groupingBy(ProBasicEquipment::getWindpowerstationId));
+        pjequipmentmap =  equipments.stream().collect(Collectors.groupingBy(ProBasicEquipment::getProjectId));
+        liequipmentmap =  equipments.stream().collect(Collectors.groupingBy(ProBasicEquipment::getLineId));
     }
 }

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

@@ -2,10 +2,12 @@ package com.gyee.backconfig.controller;
 
 
 import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.service.auto.IProEconTestingPointService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -24,18 +26,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//pro-econ-testing-point")
 public class ProEconTestingPointController {
 
-    @PostMapping(value = "/add")
+    @Autowired
+    private IProEconTestingPointService proEconTestingPointService;
+
+    @PostMapping(value = "/generatePoint")
     @ApiOperation(value = "生成测点", notes = "生成测点")
     @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query")})
-    public R addGeneratePoint(@RequestParam(value = "points", required = false) String[] points) {
-
-        int code =0;// pointGenerateService.addGeneratePoint(points);
-
-        if (code > 0) {
-            return R.ok();
-        } else {
-            return R.ok().data("插入失败" + code + "条测点");
+    public R generatePoint(@RequestParam(value = "points", required = false) String[] points,
+                              @RequestParam(value = "station", required = false) String station) {
+        try {
+            proEconTestingPointService.generatePoint(station,points);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error();
         }
+        return R.ok().data(true);
     }
 
 }

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -188,4 +189,9 @@ public class ProBasicCompany extends Model {
 
     @TableField(exist = false)
     private List<ProBasicPowerstation> Children = new ArrayList<>();
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+    public List<ProBasicPowerstation> getChildren() {
+        return Children;
+    }
 }

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -182,4 +183,9 @@ public class ProBasicEnergyGroup extends Model {
 
     @TableField(exist = false)
     private List<ProBasicCompany> Children = new ArrayList<>();
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+    public List<ProBasicCompany> getChildren() {
+        return Children;
+    }
 }

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

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

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -97,4 +98,9 @@ public class ProBasicLine extends Model {
     @TableField(exist = false)
     private List<ProBasicEquipment> Children = new ArrayList<>();
 
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+    public List<ProBasicEquipment> getChildren() {
+        return Children;
+    }
 }

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

@@ -4,10 +4,9 @@ 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 com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -163,6 +162,14 @@ public class ProBasicPowerstation extends Model {
     private String spare4;
 
 
+    @JsonInclude(value = JsonInclude.Include.NON_NULL)
     @TableField(exist = false)
     private List<ProBasicProject> Children = new ArrayList<>();
+
+
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+    public List<ProBasicProject> getChildren() {
+        return Children;
+    }
 }

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

@@ -2,14 +2,13 @@ package com.gyee.backconfig.model.auto;
 
 import java.math.BigDecimal;
 
-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 java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -129,4 +128,9 @@ public class ProBasicProject extends Model {
     private String spare4;
     @TableField(exist = false)
     private List<ProBasicLine> Children = new ArrayList<>();
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+    public List<ProBasicLine> getChildren() {
+        return Children;
+    }
 }

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -178,4 +179,8 @@ public class ProBasicRegion extends Model {
     @TableField(exist = false)
     private List<ProBasicCompany> Children = new ArrayList<>();
 
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+    public List<ProBasicCompany> getChildren() {
+        return Children;
+    }
 }

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

@@ -24,4 +24,6 @@ public interface IProBasicEquipmentPointService extends IService<ProBasicEquipme
     boolean removeByIds(String ids);
 
     List<ProBasicEquipmentPoint> list(String windpowerstationId , String uniformCode);
+
+    boolean batchAddEquipmentPoint (List<ProBasicEquipmentPoint> proBasicEquipmentPoints);
 }

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

@@ -3,6 +3,8 @@ package com.gyee.backconfig.service.auto;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
 
+import java.util.List;
+
 /**
  * <p>
  * 场站测点，期次测点，线路测点，三级公司测点，区域测点
@@ -17,4 +19,6 @@ import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
  */
 public interface IProBasicPowerstationPointService extends IService<ProBasicPowerstationPoint> {
 
+    boolean batchAddPowerstationPoints(List<ProBasicPowerstationPoint> proBasicPowerstationPoints);
+
 }

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

@@ -13,4 +13,6 @@ import com.gyee.backconfig.model.auto.ProEconTestingPoint;
  */
 public interface IProEconTestingPointService extends IService<ProEconTestingPoint> {
 
+     void generatePoint(String station,String[] points);
+
 }

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

@@ -82,7 +82,7 @@ public class PointGenerateService {
                         for (ProBasicEquipmentPoint i : testingList) {
                             boolean b = proBasicEquipmentPointService.addOrUpdate(i);
                             if (!b) {
-                                logger.error(i.getCode() + "测点插入失败");
+                                logger.error(i.getNemCode() + "测点插入失败");
                                 num++;
                             }
                         }
@@ -296,10 +296,10 @@ public class PointGenerateService {
 
                     //BHB3FJJSFW.SX_JN_BHB3F_JS_P1_L30_001_CI0060
                     //SYGFJSFW.SX_JN_SYG_JS_P2_L3_NBQ0061_CI0174
-                    testing.setCode(stationsb.toString() + p.getPoint());
+                    testing.setNemCode(stationsb.toString() + p.getPoint());
                     testing.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FJJSFW" : "GFJSFW"));
                 } else if ("fjjcd".equals(p.getType())) {
-                    testing.setCode("INITIAL");
+                    testing.setNemCode("INITIAL");
                     testing.setRealtimeId(substaion + (station.getId().endsWith("_FDC") ? "FJ" : "GF"));
                 }
 

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

@@ -17,7 +17,7 @@ public class SttreeService {
         List<ProBasicPowerstation> wpls = CacheContext.wpls;//场站
         List<ProBasicProject> prols = CacheContext.prols;//期次
         List<ProBasicLine> list = CacheContext.lines;//线路
-        List<ProBasicEquipment> wbls = CacheContext.windturbines;//风机
+        List<ProBasicEquipment> wbls = CacheContext.equipments;//风机
 
 //        if (energyls.get(0).getChildren().size() > 0) return energyls;
 
@@ -90,7 +90,7 @@ public class SttreeService {
         List<ProBasicPowerstation> wpls = CacheContext.wpls;//场站
         List<ProBasicProject> prols = CacheContext.prols;//期次
         List<ProBasicLine> list = CacheContext.lines;//线路
-        List<ProBasicEquipment> wbls = CacheContext.windturbines;//线路
+        List<ProBasicEquipment> wbls = CacheContext.equipments;//线路
 
 //        if (energyls.get(0).getChildren().size() > 0) return energyls;
 

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

@@ -24,39 +24,42 @@ import java.util.List;
 @Service
 public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquipmentPointMapper, ProBasicEquipmentPoint> implements IProBasicEquipmentPointService {
 
+
+    ProBasicEquipmentPointMapper proBasicEquipmentPointMapper;
+
     @Override
-    public IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String aname,String model, String uniformCode, String pageNum, String pageSize) {
+    public IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String aname, String model, String uniformCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(id)){
-            qw.like("id",id);
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
         }
-        if (StringUtils.isNotEmpty(code)){
-            qw.like("code",code);
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
         }
 
-        if (StringUtils.isNotEmpty(name)){
-            qw.like("name",name);
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
         }
-        if (StringUtils.isNotEmpty(aname)){
-            qw.like("aname",aname);
+        if (StringUtils.isNotEmpty(aname)) {
+            qw.like("aname", aname);
         }
 
-        if (StringUtils.isNotEmpty(model)){
-            qw.like("model",model);
+        if (StringUtils.isNotEmpty(model)) {
+            qw.like("model", model);
         }
 
-        if (StringUtils.isNotEmpty(uniformCode)){
-            qw.eq("uniformCode",uniformCode);
+        if (StringUtils.isNotEmpty(uniformCode)) {
+            qw.eq("uniformCode", uniformCode);
         }
 
-        Page<ProBasicEquipmentPoint> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<ProBasicEquipmentPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<ProBasicEquipmentPoint> EquipmentPage = getBaseMapper().selectPage(page, qw);
         return EquipmentPage;
     }
 
     @Override
     public ProBasicEquipmentPoint getOne(String id) {
-        ProBasicEquipmentPoint pointnew =  this.getById(id);
+        ProBasicEquipmentPoint pointnew = this.getById(id);
         return pointnew;
     }
 
@@ -76,13 +79,35 @@ public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquip
     @Override
     public List<ProBasicEquipmentPoint> list(String windpowerstationId, String uniformCode) {
         QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(uniformCode)){
-            qw.eq("uniformCode",uniformCode);
+        if (StringUtils.isNotEmpty(uniformCode)) {
+            qw.eq("uniformCode", uniformCode);
         }
-        if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.eq("windpowerstationId",windpowerstationId);
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.eq("windpowerstationId", windpowerstationId);
         }
         List<ProBasicEquipmentPoint> list = baseMapper.selectList(qw);
         return list;
     }
+
+    @Override
+    public boolean batchAddEquipmentPoint(List<ProBasicEquipmentPoint> proBasicEquipmentPoints) {
+
+        try {
+            proBasicEquipmentPoints.stream().forEach(i -> {
+                QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
+                qw.eq("uniform_code", i.getUniformCode());
+                qw.eq("windturbine_id", i.getWindturbineId());
+                int count = baseMapper.selectCount(qw);
+                if (count <= 0) {
+                    baseMapper.insert(i);
+                }
+
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
+    }
 }

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

@@ -30,19 +30,19 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
             qw.eq("id",id);
         }
         if (StringUtils.isNotEmpty(code)){
-            qw.like("nemCode",code);
+            qw.like("nem_code",code);
         }
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.like("windpowerstationId",windpowerstationId);
+            qw.like("windpowerstation_id",windpowerstationId);
         }
 
         if (StringUtils.isNotEmpty(projectId)){
-            qw.eq("projectId",projectId);
+            qw.eq("project_id",projectId);
         }
 
         if (StringUtils.isNotEmpty(lineId)){
-            qw.eq("lineId",lineId);
+            qw.eq("line_id",lineId);
         }
 
         Page<ProBasicEquipment> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
@@ -57,13 +57,13 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
         QueryWrapper<ProBasicEquipment> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.eq("windpowerstationId",windpowerstationId);
+            qw.eq("windpowerstation_id",windpowerstationId);
         }
         if (StringUtils.isNotEmpty(lineId)){
-            qw.eq("lineId",lineId);
+            qw.eq("line_id",lineId);
         }
         if (StringUtils.isNotEmpty(projectId)){
-            qw.eq("projectId",projectId);
+            qw.eq("project_id",projectId);
         }
 
         List<ProBasicEquipment> list =  baseMapper.selectList(qw);

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("nemCode", code);
+            qw.like("nem_code", code);
         }
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);
@@ -50,7 +50,7 @@ public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, Pro
 
 
         if (StringUtils.isNotEmpty(projectId)){
-            qw.eq("projectid",projectId);
+            qw.eq("project_id",projectId);
         }
         List<ProBasicLine> list = baseMapper.selectList(qw);
         return list;

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

@@ -31,7 +31,7 @@ public class ProBasicMeterPointServiceImpl extends ServiceImpl<ProBasicMeterPoin
             qw.like("code", code);
         }
         if (StringUtils.isNotEmpty(windpowerstationId)) {
-            qw.like("windpowerstationId", windpowerstationId);
+            qw.like("windpowerstation_id", windpowerstationId);
         }
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);

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

@@ -1,18 +1,21 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.backconfig.mapper.auto.ProBasicPowerstationPointMapper;
 import com.gyee.backconfig.model.auto.ProBasicPowerstationPoint;
 import com.gyee.backconfig.service.auto.IProBasicPowerstationPointService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 场站测点，期次测点，线路测点，三级公司测点，区域测点
-
-
-
-+方阵测点 服务实现类
+ * <p>
+ * <p>
+ * <p>
+ * +方阵测点 服务实现类
  * </p>
  *
  * @author wang
@@ -21,4 +24,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPowerstationPointMapper, ProBasicPowerstationPoint> implements IProBasicPowerstationPointService {
 
+
+    @Override
+    public boolean batchAddPowerstationPoints(List<ProBasicPowerstationPoint> proBasicPowerstationPoints) {
+        try {
+            proBasicPowerstationPoints.stream().forEach(i -> {
+                QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+                qw.eq("uniform_code", i.getUniformCode());
+                qw.eq("windpowerstation_id", i.getWindpowerstationId());
+                int count = baseMapper.selectCount(qw);
+                if (count <= 0) {
+                    baseMapper.insert(i);
+                }
+
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        return true;
+    }
+
+
 }

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

@@ -47,7 +47,7 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
         }
 
         if (StringUtils.isNotEmpty(code)){
-            qw.like("nemCode",code);
+            qw.like("nem_code",code);
         }
 
         if (StringUtils.isNotEmpty(name)){
@@ -55,7 +55,7 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
         }
 
         if (StringUtils.isNotEmpty(companyId)){
-            qw.like("companyId",companyId);
+            qw.like("company_id",companyId);
         }
 
         Page<ProBasicPowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
@@ -70,7 +70,7 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
         QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(regionId)){
-            qw.eq("regionid",regionId);
+            qw.eq("region_id",regionId);
         }
 
         List<ProBasicPowerstation> list = baseMapper.selectList(qw);
@@ -87,11 +87,11 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
             qw.eq("id",id);
         }
         if (StringUtils.isNotEmpty(regionId)){
-            qw.eq("regionId",regionId);
+            qw.eq("region_id",regionId);
         }
 
         if (StringUtils.isNotEmpty(companyId)){
-            qw.eq("companyId",companyId);
+            qw.eq("company_id",companyId);
         }
 
         List<ProBasicPowerstation> list = baseMapper.selectList(qw);

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

@@ -3,7 +3,6 @@ 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.ProBasicProject;
 import com.gyee.backconfig.model.auto.ProBasicProjectPlan;
 import com.gyee.backconfig.mapper.auto.ProBasicProjectPlanMapper;
 import com.gyee.backconfig.service.auto.IProBasicProjectPlanService;
@@ -31,11 +30,11 @@ public class ProBasicProjectPlanServiceImpl extends ServiceImpl<ProBasicProjectP
         }
 
         if (StringUtils.isNotEmpty(projectId)){
-            qw.like("projectId",projectId);
+            qw.eq("project_id",projectId);
         }
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.like("windpowerstationId",windpowerstationId);
+            qw.eq("windpowerstation_id",windpowerstationId);
         }
 
         Page<ProBasicProjectPlan> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));

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("nemCode",code);
+            qw.like("nem_code",code);
         }
 
         if (StringUtils.isNotEmpty(name)){
@@ -40,7 +40,7 @@ public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMappe
         }
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.like("windpowerstationId",windpowerstationId);
+            qw.like("windpowerstation_id",windpowerstationId);
         }
 
         Page<ProBasicProject> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
@@ -54,7 +54,7 @@ public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMappe
 
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.like("windpowerstationId",windpowerstationId);
+            qw.like("windpowerstation_id",windpowerstationId);
         }
         List<ProBasicProject> list = baseMapper.selectList(qw);
         return list;

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

@@ -28,10 +28,10 @@ public class ProBasicRealtimeDbconfigServiceImpl extends ServiceImpl<ProBasicRea
             qw.like("id", id);
         }
         if (StringUtils.isNotEmpty(surName)) {
-            qw.like("surName", surName);
+            qw.like("sur_name", surName);
         }
         if (StringUtils.isNotEmpty(windpowerstationId)) {
-            qw.like("windpowerstationId", windpowerstationId);
+            qw.like("windpowerstation_id", windpowerstationId);
         }
         Page<ProBasicRealtimeDbconfig> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<ProBasicRealtimeDbconfig> ModelpowerPage =getBaseMapper().selectPage(page, qw);

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

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 
 /**
  * <p>
@@ -39,7 +38,7 @@ public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper,
             qw.like("aname",aname);
         }
         if (StringUtils.isNotEmpty(code)){
-            qw.like("nemCode",code);
+            qw.like("nem_code",code);
         }
 
         Page<ProBasicRegion> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));

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

@@ -41,7 +41,7 @@ public class ProBasicWppointServiceImpl extends ServiceImpl<ProBasicWppointMappe
             qw.like(model, "model");
         }
         if (StringUtils.isNotEmpty(uniformCode)) {
-            qw.eq(uniformCode, "uniformCode");
+            qw.eq(uniformCode, "uniform_code");
         }
 
         Page<ProBasicWppoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));

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

@@ -1,11 +1,20 @@
 package com.gyee.backconfig.service.auto.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.backconfig.config.CacheContext;
 import com.gyee.backconfig.mapper.auto.ProEconTestingPointMapper;
-import com.gyee.backconfig.model.auto.ProEconTestingPoint;
-import com.gyee.backconfig.service.auto.IProEconTestingPointService;
+import com.gyee.backconfig.model.auto.*;
+import com.gyee.backconfig.service.auto.*;
+import com.gyee.common.model.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 逻辑测点 服务实现类
@@ -17,4 +26,783 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPointMapper, ProEconTestingPoint> implements IProEconTestingPointService {
 
+    private final String GCJSFW = "gcjsfw";
+    private final String FCJSFW = "fcjsfw";
+
+    @Resource
+    private IProEconTestingPointService proEconTestingPointService;
+
+    @Resource
+    private IProBasicRegionService proBasicRegionService;
+
+    @Resource
+    private IProBasicCompanyService proBasicCompanyService;
+
+    @Autowired
+    private IProBasicEquipmentPointService proBasicEquipmentPointService;
+
+    @Autowired
+    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    @Override
+    public void generatePoint(String station, String[] points) {
+
+            List<ProBasicEquipmentPoint> equipmentPoints =  initalFj();
+            List<ProBasicPowerstationPoint> powerstationPoints = initalFc();
+
+            proBasicEquipmentPointService.batchAddEquipmentPoint(equipmentPoints);
+            proBasicPowerstationPointService.batchAddPowerstationPoints(powerstationPoints);
+
+
+    }
+
+
+    public List<ProBasicEquipmentPoint> initalFj() {
+
+        List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
+
+        List<ProEconTestingPoint> fdls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("fj") || i.getTypeId().equals("fjjsfw")).collect(Collectors.toList());
+
+        List<ProEconTestingPoint> gfls = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("gf") || i.getTypeId().equals("gfjsfw")).collect(Collectors.toList());
+
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
+
+            List<ProEconTestingPoint> ls = null;
+            if (wp.getId().indexOf("FDC") >= 0) {
+                ls = fdls;
+
+            } else {
+                ls = gfls;
+
+            }
+            List<ProBasicEquipment> wtls = CacheContext.poequipmentmap.get(wp.getId());
+
+
+            if (!ls.isEmpty()) {
+                for (ProBasicEquipment wt : wtls) {
+
+                    List<ProBasicEquipmentPoint> points = new ArrayList<>();
+                    for (int i = 0; i < ls.size(); i++) {
+
+
+                        ProEconTestingPoint stp = ls.get(i);
+                        StringBuilder sb = new StringBuilder();
+                        String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_") + 1);
+                        if (wp.getId().indexOf("FDC") >= 0) {
+                            sb.append(wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_F_");
+                        } else {
+                            sb.append(wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_G_");
+                        }
+
+
+                        temp = null;
+                        temp = wt.getProjectId().substring(0, wt.getProjectId().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                        temp = wt.getLineId().substring(0, wt.getProjectId().lastIndexOf("_"));
+                        sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+
+                        temp = wt.getId().substring(wt.getId().lastIndexOf("_") - 4, wt.getId().lastIndexOf("_"));
+
+                        if (temp.length() == 1) {
+                            sb.append("000").append(temp).append("_");
+                        } else if (temp.length() == 2) {
+                            sb.append("00").append(temp).append("_");
+                        } else if (temp.length() == 3) {
+                            sb.append("0").append(temp).append("_");
+                        } else {
+                            sb.append(temp).append("_");
+                        }
+
+
+                        if (ls.get(i).getUniformCode().indexOf("AI") >= 0) {
+                            sb.append("AI");
+
+                        } else if (ls.get(i).getUniformCode().indexOf("DI") >= 0) {
+                            sb.append("DI");
+
+                        } else {
+                            sb.append("CI");
+
+                        }
+
+                        sb.append(stp.getNemCode());
+
+                        StringBuilder sba = new StringBuilder();
+
+                        temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_") + 1);
+
+                        String temp2 = wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"));
+                        temp2 = temp2.substring(temp2.indexOf("_") + 1);
+
+                        String temp3 = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp3 = temp3.substring(0, temp3.lastIndexOf("_"));
+                        temp3 = temp3.substring(temp3.lastIndexOf("_") + 1);
+                        if (wp.getId().indexOf("FDC") >= 0) {
+                            sba.append(temp2).append(temp3).append("FJ");
+                        } else if (wp.getId().indexOf("GDC") >= 0) {
+                            sba.append(temp2).append(temp3).append("GF");
+                        }
+
+                        StringBuilder sbtable = new StringBuilder();
+
+
+                        if (stp.getUniformCode().indexOf("AI") < 0 && stp.getUniformCode().indexOf("DI") < 0) {
+                            sbtable.append(sba).append("JSFW.");
+                            sbtable.append(sb);
+                        } else {
+                            sbtable.append(sba).append(".");
+                            sbtable.append(sb);
+                        }
+
+                        ProBasicEquipmentPoint po = new ProBasicEquipmentPoint();
+                        po.setId(StringUtils.getUUID());
+//                        po.setNemCode(V2Config.getInitialcode());
+
+                        if (stp.getUniformCode().indexOf("AI") < 0 && stp.getUniformCode().indexOf("DI") < 0) {
+                            po.setNemCode(String.valueOf(sbtable));
+                        } else {
+                            po.setNemCode("INITIAL");
+                        }
+
+                        sb = new StringBuilder();
+                        sb.append(wt.getName()).append(stp.getName());
+                        po.setName(String.valueOf(sb));
+                        po.setModel(wt.getModelId());
+                        po.setModelId(wt.getModelId());
+                        po.setWindturbineId(wt.getId());
+                        po.setUniformCode(stp.getUniformCode());
+                        po.setWindpowerstationId(wt.getWindpowerstationId());
+                        po.setLogicalUnitId(ls.get(i).getLogicalUnitId());
+
+                        if (stp.getUniformCode().indexOf("AI") < 0 && stp.getUniformCode().indexOf("DI") < 0) {
+                            sb = new StringBuilder();
+
+                            sb.append(wp.getId().substring(0, wp.getId().lastIndexOf("_")).replace("_", "")).append(".JSFW").append(sba);
+
+                            po.setRealtimeId(String.valueOf(sb));
+                        } else {
+                            sb = new StringBuilder();
+
+                            sb.append(wp.getId().substring(0, wp.getId().lastIndexOf("_")).replace("_", "")).append(".").append(sba);
+
+                            po.setRealtimeId(String.valueOf(sb));
+                        }
+
+                        points.add(po);
+
+
+                    }
+                    allpoints.addAll(points);
+                }
+
+            }
+//            }
+
+        }
+        return allpoints;
+
+    }
+
+
+    public List<ProBasicPowerstationPoint> initalFc() {
+
+        List<ProEconTestingPoint> pointls = proEconTestingPointService.list().stream()
+                .filter(i -> i.getTypeId().equals(FCJSFW) || i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());
+
+        List<ProEconTestingPoint> fdpointls = proEconTestingPointService.list().stream()
+                .filter(i -> i.getTypeId().equals(FCJSFW)).collect(Collectors.toList());
+        List<ProEconTestingPoint> gfpointls = proEconTestingPointService.list().stream()
+                .filter(i -> i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());
+
+
+        List<ProBasicRegion> regions = proBasicRegionService.list();
+
+
+        List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
+
+        if (!regions.isEmpty()) {
+
+
+            for (ProBasicRegion re : regions) {
+
+                StringBuilder sba = new StringBuilder();
+                sba.append(re.getId().substring(0, re.getId().indexOf("_"))).append("_");
+/********************************************区域公司测点**************************************************/
+
+
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
+                for (int i = 0; i < pointls.size(); i++) {
+
+                    ProEconTestingPoint stp = pointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sbtable = new StringBuilder();
+                    sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append("XXXX_XXX_X_XX_XX_XXXX_");
+                    sb.append("CI");
+                    sb.append(stp.getNemCode());
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(re.getName()).append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb = new StringBuilder();
+
+                    if (StringUtils.notEmp(re.getNemCode())) {
+                        tempsb.append(re.getNemCode()).append("0");
+                    } else {
+                        tempsb.append("0");
+                    }
+
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+
+
+                    sb = new StringBuilder();
+                    sb.append(re.getNemCode()).append(".JSFW");
+                    po.setRealtimeId(String.valueOf(sb));
+
+
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+                // windPowerstationTestingPointService.insertBatch(points);
+
+/*******************************************区域公司测点*******************************************************/
+/********************************************风电场公司测点**************************************************/
+                points = new ArrayList<>();
+
+                for (int i = 0; i < fdpointls.size(); i++) {
+                    sba = new StringBuilder();
+
+                    ProEconTestingPoint stp = fdpointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sbtable = new StringBuilder();
+                    sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append(re.getId().substring(0, re.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
+                    sb.append("CI");
+                    sb.append(stp.getNemCode());
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(re.getName()).append("风电").append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb = new StringBuilder();
+                    if (StringUtils.notEmp(re.getNemCode())) {
+                        tempsb.append(re.getNemCode()).append("-1");
+                    } else {
+                        tempsb.append("-1");
+                    }
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+
+
+                    sb = new StringBuilder();
+                    sb.append(re.getNemCode()).append(".JSFW");
+                    po.setRealtimeId(String.valueOf(sb));
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+
+                /*******************************************风电测点生成*******************************************************/
+
+
+/*********************************************光伏测点生成*****************************************************/
+
+                points = new ArrayList<>();
+                for (int i = 0; i < gfpointls.size(); i++) {
+
+
+                    ProEconTestingPoint stp = gfpointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sbtable = new StringBuilder();
+                    sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append(re.getId().substring(0, re.getId().indexOf("_"))).append("_XXXX_XXX_G_XX_XX_XXXX_");
+                    sb.append("CI");
+                    sb.append(stp.getNemCode());
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(re.getName()).append("光伏").append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+                    StringBuilder tempsb = new StringBuilder();
+
+                    if (StringUtils.notEmp(re.getNemCode())) {
+                        tempsb.append(re.getNemCode()).append("-2");
+                    } else {
+                        tempsb.append("-2");
+                    }
+
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+
+                    sb = new StringBuilder();
+                    sb.append(re.getNemCode()).append(".JSFW");
+                    po.setRealtimeId(String.valueOf(sb));
+
+
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+                List<ProBasicCompany> companys = proBasicCompanyService.list().stream().filter(i -> i.getRegionId().equals(re.getId())).collect(Collectors.toList());
+                if (!companys.isEmpty()) {
+                    for (ProBasicCompany cs : companys) {
+                        sba = new StringBuilder();
+                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
+/********************************************区域公司测点**************************************************/
+                        points = new ArrayList<>();
+                        for (int i = 0; i < pointls.size(); i++) {
+
+
+                            ProEconTestingPoint stp = pointls.get(i);
+                            StringBuilder sb = new StringBuilder();
+                            StringBuilder sbtable = new StringBuilder();
+                            sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
+
+                            sb.append(String.valueOf(sba));
+                            sb.append("XXX_X_XX_XX_XXXX_");
+                            sb.append("CI");
+                            sb.append(stp.getNemCode());
+
+                            sbtable.append("JSFW.");
+                            sbtable.append(sb);
+
+                            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                            po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
+                            sb = new StringBuilder();
+                            sb.append(cs.getName()).append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+
+                            StringBuilder tempsb = new StringBuilder();
+
+                            if (StringUtils.notEmp(cs.getNemCode())) {
+                                tempsb.append(cs.getNemCode()).append("0");
+                            } else {
+                                tempsb.append("0");
+                            }
+
+                            po.setWindpowerstationId(String.valueOf(tempsb));
+                            po.setUniformCode(stp.getUniformCode());
+
+                            sb = new StringBuilder();
+                            sb.append(cs.getId()).append(".JSFW");
+                            po.setRealtimeId(String.valueOf(sb));
+
+
+                            points.add(po);
+                        }
+
+                        allpoints.addAll(points);
+                        // windPowerstationTestingPointService.insertBatch(points);
+
+/*******************************************区域公司测点*******************************************************/
+/********************************************风电场公司测点**************************************************/
+                        points = new ArrayList<>();
+
+                        sba = new StringBuilder();
+                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
+                        for (int i = 0; i < fdpointls.size(); i++) {
+
+                            ProEconTestingPoint stp = fdpointls.get(i);
+                            StringBuilder sb = new StringBuilder();
+                            StringBuilder sbtable = new StringBuilder();
+                            sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
+                            sb.append(String.valueOf(sba));
+                            sb.append("XXX_F_XX_XX_XXXX_");
+                            sb.append("CI");
+                            sb.append(stp.getNemCode());
+
+                            sbtable.append("JSFW.");
+                            sbtable.append(sb);
+
+                            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                            po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
+                            sb = new StringBuilder();
+                            sb.append(cs.getName()).append("风电").append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+
+                            StringBuilder tempsb = new StringBuilder();
+                            if (StringUtils.notEmp(cs.getNemCode())) {
+                                tempsb.append(cs.getNemCode()).append("-1");
+                            } else {
+                                tempsb.append("-1");
+                            }
+                            po.setWindpowerstationId(String.valueOf(tempsb));
+                            po.setUniformCode(stp.getUniformCode());
+
+                            sb = new StringBuilder();
+                            sb.append(cs.getId()).append(".JSFW");
+                            po.setRealtimeId(String.valueOf(sb));
+
+
+                            points.add(po);
+                        }
+
+                        allpoints.addAll(points);
+                        // windPowerstationTestingPointService.insertBatch(points);
+
+                        /*******************************************风电测点生成*******************************************************/
+
+
+/*********************************************光伏测点生成*****************************************************/
+                        sba = new StringBuilder();
+                        sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
+                        points = new ArrayList<>();
+                        for (int i = 0; i < gfpointls.size(); i++) {
+
+                            ProEconTestingPoint stp = gfpointls.get(i);
+                            StringBuilder sb = new StringBuilder();
+                            StringBuilder sbtable = new StringBuilder();
+                            sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
+                            sb.append(String.valueOf(sba));
+                            sb.append("XXX_G_XX_XX_XXXX_");
+                            sb.append("CI");
+                            sb.append(stp.getNemCode());
+
+                            sbtable.append("JSFW.");
+                            sbtable.append(sb);
+
+                            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                            po.setId(StringUtils.getUUID());
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
+                            sb = new StringBuilder();
+                            sb.append(cs.getName()).append("光伏").append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+                            StringBuilder tempsb = new StringBuilder();
+
+                            if (StringUtils.notEmp(cs.getNemCode())) {
+                                tempsb.append(cs.getNemCode()).append("-2");
+                            } else {
+                                tempsb.append("-2");
+                            }
+
+                            po.setWindpowerstationId(String.valueOf(tempsb));
+                            po.setUniformCode(stp.getUniformCode());
+
+                            sb = new StringBuilder();
+                            sb.append(cs.getId()).append(".JSFW");
+                            po.setRealtimeId(String.valueOf(sb));
+
+                            points.add(po);
+                        }
+
+                        allpoints.addAll(points);
+                    }
+                }
+            }
+        }
+
+
+//        }
+
+
+        /*********************************************场站、项目、线路测点生成*****************************************************/
+
+
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
+            List<ProEconTestingPoint> ls = null;
+            if (wp.getId().indexOf("FDC") >= 0) {
+                ls = fdpointls;
+
+            } else {
+                ls = gfpointls;
+
+            }
+            createWpPoints(wp, ls, allpoints);
+            createPjPoints(wp, ls, allpoints);
+            createLnPoints(wp, ls, allpoints);
+
+        }
+        return allpoints;
+    }
+
+
+    private void createWpPoints(ProBasicPowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
+        List<ProBasicPowerstationPoint> points = new ArrayList<>();
+        for (int i = 0; i < stpointls.size(); i++) {
+
+
+            ProEconTestingPoint stp = stpointls.get(i);
+            StringBuilder sb = new StringBuilder();
+//            sb.append(wp.getPhoto());
+            String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+            temp = temp.substring(0, temp.lastIndexOf("_"));
+            temp = temp.substring(temp.lastIndexOf("_") + 1);
+            StringBuilder sba = new StringBuilder();
+
+
+            String temp2 = wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"));
+            temp2 = temp2.substring(temp2.indexOf("_") + 1);
+
+            String temp3 = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+            temp3 = temp3.substring(0, temp3.lastIndexOf("_"));
+            temp3 = temp3.substring(temp3.lastIndexOf("_") + 1);
+
+            sb.append(wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"))).append("_");
+            if (wp.getId().indexOf("FDC") >= 0) {
+
+
+                sba.append(temp2).append(temp3).append("FC");
+                sb.append(temp).append("_F").append("_XX_XX_XXXX_");
+            } else if (wp.getId().indexOf("GDC") >= 0) {
+
+                sba.append(temp2).append(temp3).append("GC");
+                sb.append(temp).append("_G").append("_XX_XX_XXXX_");
+            }
+
+            sb.append("CI");
+            sb.append(stp.getNemCode());
+            StringBuilder sbtable = new StringBuilder();
+
+
+            sbtable.append(sba).append("JSFW.");
+            sbtable.append(sb);
+
+            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+            po.setId(StringUtils.getUUID());
+//            po.setNemCode(V2Config.getInitialcode());
+            po.setNemCode(String.valueOf(sbtable));
+            sb = new StringBuilder();
+            sb.append(wp.getName()).append(stp.getName());
+            po.setName(String.valueOf(sb));
+            po.setModel(null);
+            po.setModelId(null);
+            po.setWindpowerstationId(wp.getId());
+            po.setUniformCode(stp.getUniformCode());
+
+
+            sb = new StringBuilder();
+
+            if (StringUtils.notEmp(wp.getPhoto())) {
+                sb.append(wp.getPhoto().replace("_", "")).append(".JSFW").append(sba);
+            }
+
+            po.setRealtimeId(String.valueOf(sb));
+
+            points.add(po);
+        }
+
+        allpoints.addAll(points);
+        //windPowerstationTestingPointService.insertBatch(points);
+    }
+
+
+    private void createPjPoints(ProBasicPowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
+
+
+        for (ProBasicProject pj : CacheContext.prols) {
+            if (pj.getWindpowerstationId().equals(wp.getId())) {
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
+                for (int i = 0; i < stpointls.size(); i++) {
+
+
+                    ProEconTestingPoint stp = stpointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+
+                    String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                    temp = temp.substring(0, temp.lastIndexOf("_"));
+                    temp = temp.substring(temp.lastIndexOf("_") + 1);
+                    sb.append(wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"))).append("_");
+
+
+                    StringBuilder sba = new StringBuilder();
+
+                    String temp2 = wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"));
+                    temp2 = temp2.substring(temp2.indexOf("_") + 1);
+
+                    String temp3 = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                    temp3 = temp3.substring(0, temp3.lastIndexOf("_"));
+                    temp3 = temp3.substring(temp3.lastIndexOf("_") + 1);
+
+                    if (wp.getId().indexOf("FDC") >= 0) {
+
+                        sba.append(temp2).append(temp3).append("FC");
+                        sb.append(temp).append("_F_");
+                        temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                        sb.append("XX_XXXX_");
+                    } else if (wp.getId().indexOf("GDC") >= 0) {
+
+                        sba.append(temp2).append(temp3).append("GC");
+                        sb.append(temp).append("_G_");
+                        temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                        sb.append("XX_XXXX_");
+                    }
+
+                    sb.append("CI");
+                    sb.append(stp.getNemCode());
+
+                    StringBuilder sbtable = new StringBuilder();
+
+
+                    sbtable.append(sba).append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+
+                    po.setId(StringUtils.getUUID());
+
+                    po.setNemCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(pj.getName()).append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+                    po.setWindpowerstationId(pj.getId());
+                    po.setUniformCode(stp.getUniformCode());
+
+                    sb = new StringBuilder();
+
+                    if (StringUtils.notEmp(wp.getPhoto())) {
+                        sb.append(wp.getPhoto().replace("_", "")).append(".JSFW").append(sba);
+                    }
+
+                    po.setRealtimeId(String.valueOf(sb));
+
+                    points.add(po);
+                }
+                allpoints.addAll(points);
+            }
+        }
+
+    }
+
+
+    private void createLnPoints(ProBasicPowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
+
+        for (ProBasicLine ln : CacheContext.lines) {
+            if (CacheContext.promap.containsKey(ln.getProjectId())) {
+                ProBasicProject pj = CacheContext.promap.get(ln.getProjectId());
+
+                if (pj.getWindpowerstationId().equals(wp.getId())) {
+                    List<ProBasicPowerstationPoint> points = new ArrayList<>();
+                    for (int i = 0; i < stpointls.size(); i++) {
+
+
+                        ProEconTestingPoint stp = stpointls.get(i);
+                        StringBuilder sb = new StringBuilder();
+//                        sb.append(wp.getPhoto());
+                        String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_") + 1);
+                        sb.append(wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"))).append("_");
+
+
+                        StringBuilder sba = new StringBuilder();
+
+                        String temp2 = wp.getCompanyId().substring(0, wp.getCompanyId().lastIndexOf("_"));
+                        temp2 = temp2.substring(temp2.indexOf("_") + 1);
+
+                        String temp3 = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp3 = temp3.substring(0, temp3.lastIndexOf("_"));
+                        temp3 = temp3.substring(temp3.lastIndexOf("_") + 1);
+
+                        if (wp.getId().indexOf("FDC") >= 0) {
+
+                            sba.append(temp2).append(temp3).append("FC");
+                            sb.append(temp).append("_F_");
+                            temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                            sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            temp = ln.getId().substring(0, ln.getId().lastIndexOf("_"));
+                            sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            sb.append("XXXX_");
+//                            sb.append(CI);
+                        } else if (wp.getId().indexOf("GDC") >= 0) {
+
+                            sba.append(temp2).append(temp3).append("GC");
+                            sb.append(temp).append("G_");
+                            temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                            sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            temp = ln.getId().substring(0, ln.getId().lastIndexOf("_"));
+                            sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            sb.append("XXXX_");
+//                            sb.append(CI);
+                        }
+
+                        sb.append("CI");
+                        sb.append(stp.getNemCode());
+
+                        StringBuilder sbtable = new StringBuilder();
+
+                        sbtable.append(sba).append("JSFW.");
+                        sbtable.append(sb);
+
+                        ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
+                        po.setId(StringUtils.getUUID());
+
+                        po.setNemCode(String.valueOf(sbtable));
+                        sb = new StringBuilder();
+                        sb.append(ln.getName()).append(stp.getName());
+                        po.setName(String.valueOf(sb));
+                        po.setModel(null);
+                        po.setModelId(null);
+                        po.setWindpowerstationId(ln.getId());
+                        po.setUniformCode(stp.getUniformCode());
+
+                        sb = new StringBuilder();
+
+                        if (StringUtils.notEmp(wp.getPhoto())) {
+                            sb.append(wp.getPhoto().replace("_", "")).append(".JSFW").append(sba);
+                        }
+
+                        po.setRealtimeId(String.valueOf(sb));
+
+                        points.add(po);
+                    }
+                    allpoints.addAll(points);
+
+                }
+            }
+
+        }
+
+    }
+
 }

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

@@ -33,7 +33,7 @@ public class StandardpointServiceImpl extends ServiceImpl<StandardpointMapper, S
         }
 
         if (StringUtils.isNotEmpty(uniformcode)){
-            qw.like("uniformcode",uniformcode);
+            qw.like("uniform_code",uniformcode);
         }
 
         if (StringUtils.isNotEmpty(name)){
@@ -74,7 +74,7 @@ public class StandardpointServiceImpl extends ServiceImpl<StandardpointMapper, S
 
 
         if (StringUtils.isNotEmpty(uniformcodes)){
-            qw.in("uniformcode",uniformcodes);
+            qw.in("uniform_code",uniformcodes);
         }
         List<Standardpoint> list = baseMapper.selectList(qw);
         return list;
@@ -110,7 +110,7 @@ public class StandardpointServiceImpl extends ServiceImpl<StandardpointMapper, S
         QueryWrapper<Standardpoint> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(uniformcode)){
-            qw.eq("uniformcode",uniformcode);
+            qw.eq("uniform_code",uniformcode);
         }
         List<Standardpoint> list = baseMapper.selectList(qw);
         return list;