代码优化

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

@@ -33,7 +33,7 @@ public class CacheContext implements CommandLineRunner {
     private IProBasicCompanyService proBasicCompanyService;//公司
 
     @Resource
-    private IProBasicPowerstationService proBasicWindpowerstationService;//场站
+    private IProBasicPowerstationService proBasicPowerstationService;//场站
 
     @Resource
     private IProBasicProjectService proBasicProjectService;//期次
@@ -42,26 +42,35 @@ public class CacheContext implements CommandLineRunner {
     private IProBasicLineService proBasicLineService;//线路
 
     @Autowired
-    private IProBasicEquipmentService proBasicWindturbineService;//风机
+    private IProBasicEquipmentService proBasicEquipmentService;//风机
 
     @Autowired
     private IProBasicSubStationService proBasicSubStationServicel;//变电所
 
+    @Autowired
+    private IProBasicSquareService proBasicSquareService;
+
     //集团
     public static Map<String, ProBasicEnergyGroup> energymap = new HashMap<>();
-    public static List<ProBasicEnergyGroup> energy = new ArrayList<>();
+    public static List<ProBasicEnergyGroup> groups = new ArrayList<>();
 
     //区域
     public static Map<String, ProBasicRegion> regionmap = new HashMap<>();
     public static List<ProBasicRegion> regions = new ArrayList<>();
 
     //公司
-    public static Map<String, ProBasicCompany> cpmap = new HashMap<>();
-    public static List<ProBasicCompany> cpls = new ArrayList<>();
+    public static Map<String, ProBasicCompany> companymap = new HashMap<>();
+    public static List<ProBasicCompany> companys = new ArrayList<>();
 
     //场站
     public static Map<String, ProBasicPowerstation> wpmap = new HashMap<>();
     public static List<ProBasicPowerstation> wpls = new ArrayList<>();
+    public static Map<String, List<ProBasicPowerstation>> wpmapGroupGCRegion = new HashMap<>();
+    public static Map<String, List<ProBasicPowerstation>> wpmapGroupGCCompany = new HashMap<>();
+    public static Map<String, List<ProBasicPowerstation>> wpmapGroupFCRegion = new HashMap<>();
+    public static Map<String, List<ProBasicPowerstation>> wpmapGroupFCCompany = new HashMap<>();
+
+
 
     //期次
     public static Map<String, ProBasicProject> promap = new HashMap<>();
@@ -84,56 +93,172 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, List<ProBasicSubStation>> poSubStationMap = new HashMap<>();//更据场站分组
 
 
+    //方阵
+    public static List<ProBasicSquare> squares = new ArrayList<>();
+    public static Map<String, ProBasicSquare> squareMap = new HashMap<>();
+
+
 
     @Override
     public void run(String... args) throws Exception {
-
+        System.out.println(">>>>>>>>>>>>>>>服务启动，正在缓存数据<<<<<<<<<<<<<<");
         //集团
-        energy = proBasicEnergyGroupService.list();
-        energy.stream().forEach(energy -> {
-            energymap.put(energy.getId(), energy);
-        });
+        initGroupList();
 
         //区域
+        initSegionList();
+        //公司
+        initCompanyList();
+
+        //场站
+        initPowerstationList();
+
+        //期次
+        initProjectList();
+
+        //线路
+        initLineList();
+
+        //发电设备
+        initEquipmentList();
+
+        //变电所
+        initSubStationList();
+
+        //方阵
+        initSquaresList();
+
+        System.out.println(">>>>>>>>>>>>>>>数据缓存完成<<<<<<<<<<<<<<");
+
+    }
+
+
+    /**
+     * 初始化集团表
+     */
+   public void initGroupList(){
+       //清理集合中的数据
+       groups.clear();
+       energymap.clear();
+       //重新加载集合数据
+       groups = proBasicEnergyGroupService.list();
+       groups.stream().forEach(energy -> {
+           energymap.put(energy.getId(), energy);
+       });
+    }
+
+    /**
+     * 初始化区域数据
+     */
+    public void initSegionList(){
+        //清理集合中的数据
+        regions.clear();
+        regionmap.clear();
         regions = proBasicRegionService.list();
         regions.stream().forEach(region -> {
             regionmap.put(region.getId(), region);
         });
+    }
 
-        //公司
-        cpls = proBasicCompanyService.list();
-        cpls.stream().forEach(Companys -> {
-            cpmap.put(Companys.getRegionId(), Companys);
+
+    /**
+     * 初始化公司数据
+     */
+    public void initCompanyList(){
+        //清理集合中的数据
+        companys.clear();
+        companymap.clear();
+
+        companys = proBasicCompanyService.list();
+        companys.stream().forEach(Companys -> {
+            companymap.put(Companys.getId(), Companys);
         });
+    }
 
-        //场站
-        wpls = proBasicWindpowerstationService.list();
+    /**
+     * 初始化场站数据
+     */
+    public void initPowerstationList(){
+        //清理集合数据
+        wpls.clear();
+        wpmap.clear();
+        wpmapGroupGCCompany.clear();
+        wpmapGroupFCCompany.clear();
+        wpmapGroupGCRegion.clear();
+        wpmapGroupFCRegion.clear();
+
+        wpls = proBasicPowerstationService.list();
         wpls.stream().forEach(windpowerstation -> {
-            wpmap.put(windpowerstation.getCompanyId(), windpowerstation);
+            wpmap.put(windpowerstation.getId(), windpowerstation);
         });
 
-        //期次
+
+        wpmapGroupGCRegion =  wpls.stream().filter(p-> p.getId().indexOf("_GDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getRegionId));
+        wpmapGroupFCRegion =  wpls.stream().filter(p-> p.getId().indexOf("_FDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getRegionId));
+
+
+        wpmapGroupGCCompany = wpls.stream().filter(p-> p.getId().indexOf("_GDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getCompanyId));
+        wpmapGroupFCCompany = wpls.stream().filter(p-> p.getId().indexOf("_FDC_") >= 0).collect(Collectors.groupingBy(ProBasicPowerstation::getCompanyId));
+
+
+
+    }
+
+
+    /**
+     * 初始化期次工程数据
+     */
+    public void initProjectList(){
+        //请立集合数据
+        prols.clear();
+        promap.clear();
         prols = proBasicProjectService.list();
         prols.stream().forEach(Project -> {
             promap.put(Project.getId(), Project);
         });
+    }
 
-        //线路
+    /**
+     * 初始化线路数据
+     */
+    public void initLineList(){
+        lines.clear();
+        linemap.clear();
         lines = proBasicLineService.list();
         lines.stream().forEach(line -> {
             linemap.put(line.getId(), line);
         });
+    }
 
-        //风机
-        equipments = proBasicWindturbineService.list();
+    /**
+     * 初始化线路数据
+     */
+    public void initEquipmentList(){
+        //清理集合数据
+        equipments.clear();
+        equipmentmap.clear();
+        poequipmentmap.clear();
+        pjequipmentmap.clear();
+        liequipmentmap.clear();
+
+        equipments = proBasicEquipmentService.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));
+    }
+
+    /**
+     * 初始化线路数据
+     */
+    public void initSubStationList(){
+        //清理集合数据
+        subStations.clear();
+        subStationMap.clear();
+        poSubStationMap.clear();
 
-        //变电所
         subStations = proBasicSubStationServicel.list();
         subStations.stream().forEach(s->{
             subStationMap.put(s.getId(),s);
@@ -142,4 +267,20 @@ public class CacheContext implements CommandLineRunner {
         poSubStationMap =  subStations.stream().collect(Collectors.groupingBy(ProBasicSubStation::getWindpowerstationId));
 
     }
+
+
+    /**
+     * 初始化方阵数据
+     */
+    public void initSquaresList(){
+        squares.clear();
+        squareMap.clear();
+        squares = proBasicSquareService.list();
+        squares.stream().forEach(i->{
+            squareMap.put(i.getId(),i);
+        });
+    }
+
+
+
 }

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

@@ -0,0 +1,14 @@
+package com.gyee.backconfig.config;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+public class DistinctObject {
+
+    public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
+        Map<Object, Boolean> seen = new ConcurrentHashMap<>(16);
+        return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
+    }
+}

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

@@ -16,6 +16,6 @@ import java.util.List;
  */
 public interface IProBasicPowerstationService extends IService<ProBasicPowerstation> {
     IPage<ProBasicPowerstation> getList(String id, String name, String code,String groupId, String companyId,String regionId, String pageNum, String pageSize);
-    List<ProBasicPowerstation> getList(String regionId);
+    List<ProBasicPowerstation> getList(String regionId,String companyId,String nemCode);
 
 }

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

@@ -11,9 +11,9 @@ import java.util.stream.Collectors;
 public class SttreeService {
     public List<ProBasicEnergyGroup> energytree(String tag) {
 
-        List<ProBasicEnergyGroup> energyls = CacheContext.energy;//集团
+        List<ProBasicEnergyGroup> energyls = CacheContext.groups;//集团
         List<ProBasicRegion> regionsls = CacheContext.regions;//区域
-        List<ProBasicCompany> cpls = CacheContext.cpls;//公司
+        List<ProBasicCompany> cpls = CacheContext.companys;//公司
         List<ProBasicPowerstation> wpls = CacheContext.wpls;//场站
         List<ProBasicProject> prols = CacheContext.prols;//期次
         List<ProBasicLine> list = CacheContext.lines;//线路
@@ -84,9 +84,9 @@ public class SttreeService {
     //区域树
     public List<ProBasicRegion> Regiontree(String tag) {
 
-        List<ProBasicEnergyGroup> energyls = CacheContext.energy;//集团
+        List<ProBasicEnergyGroup> energyls = CacheContext.groups;//集团
         List<ProBasicRegion> regionsls = CacheContext.regions;//区域
-        List<ProBasicCompany> cpls = CacheContext.cpls;//公司
+        List<ProBasicCompany> cpls = CacheContext.companys;//公司
         List<ProBasicPowerstation> wpls = CacheContext.wpls;//场站
         List<ProBasicProject> prols = CacheContext.prols;//期次
         List<ProBasicLine> list = CacheContext.lines;//线路

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

@@ -66,11 +66,19 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
     }
 
     @Override
-    public List<ProBasicPowerstation> getList(String regionId) {
+    public List<ProBasicPowerstation> getList(String regionId,String companyId,String nemCode) {
         QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(regionId)){
-            qw.eq("region_id",regionId);
+            qw.lambda().eq(ProBasicPowerstation::getRegionId,regionId);
+        }
+
+        if (StringUtils.isNotEmpty(companyId)){
+            qw.lambda().eq(ProBasicPowerstation::getCompanyId,companyId);
+        }
+
+        if (StringUtils.isNotEmpty(nemCode)){
+            qw.lambda().like(ProBasicPowerstation::getNemCode,nemCode);
         }
 
         List<ProBasicPowerstation> list = baseMapper.selectList(qw);

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

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.backconfig.config.CacheContext;
+import com.gyee.backconfig.config.DistinctObject;
 import com.gyee.backconfig.mapper.auto.ProEconTestingPointMapper;
 import com.gyee.backconfig.model.auto.*;
 import com.gyee.backconfig.service.auto.*;
 import com.gyee.common.model.StringUtils;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +27,7 @@ import java.util.stream.Collectors;
  * @author wang
  * @since 2022-11-10
  */
+@Log4j2
 @Service
 public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPointMapper, ProEconTestingPoint> implements IProEconTestingPointService {
 
@@ -46,15 +49,20 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     @Autowired
     private IProBasicPowerstationPointService proBasicPowerstationPointService;
 
+    @Autowired
+    public IProBasicPowerstationService proBasicPowerstationService;
+
     @Override
     public void generatePoint(String station, String[] setpoints) {
 
             List<ProBasicEquipmentPoint> equipmentPoints =  initalFj(station,setpoints);
             List<ProBasicPowerstationPoint> powerstationPoints = initalFc();
 
+
             proBasicEquipmentPointService.batchAddEquipmentPoint(equipmentPoints);
             proBasicPowerstationPointService.batchAddPowerstationPoints(powerstationPoints);
 
+            generateSubStationPoint(station,setpoints);
 
     }
 
@@ -105,8 +113,8 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
     public List<ProBasicPowerstationPoint> initalSbs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
-        List<ProEconTestingPoint> fcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") || i.getTypeId().equals("cft")).collect(Collectors.toList());
-        List<ProEconTestingPoint> gcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw")).collect(Collectors.toList());
+        List<ProEconTestingPoint> fcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") || i.getTypeId().equals("fggl") || i.getTypeId().equals("cft")).collect(Collectors.toList());
+        List<ProEconTestingPoint> gcs = proEconTestingPointService.list().stream().filter(i -> i.getTypeId().equals("agc") || i.getTypeId().equals("agcjsfw") || i.getTypeId().equals("fggl") || i.getTypeId().equals("qxz")).collect(Collectors.toList());
         //获取场站
         for (ProBasicPowerstation postation : CacheContext.wpls) {
             if (null != station && !"".equals(station) && !station.equals(postation.getId())) {
@@ -189,7 +197,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     po.setName(String.valueOf(sb));
                     po.setWindpowerstationId(sub.getId());
                     po.setUniformCode(p.getUniformCode());
-
+                    po.setTypeId(p.getTypeId());
                     sb = new StringBuilder();
                     sb.append(sbtable.toString().substring(0, sbtable.toString().lastIndexOf(".")));
                     po.setRealtimeId(String.valueOf(sb));
@@ -336,6 +344,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         po.setModelId(wt.getModelId());
                         po.setWindturbineId(wt.getId());
                         po.setUniformCode(stp.getUniformCode());
+                        po.setTypeId(stp.getTypeId());
                         po.setWindpowerstationId(wt.getWindpowerstationId());
                         po.setLogicalUnitId(ls.get(i).getLogicalUnitId());
 
@@ -374,6 +383,8 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
         List<ProEconTestingPoint> pointls = proEconTestingPointService.list().stream()
                 .filter(i -> i.getTypeId().equals(FCJSFW) || i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());
 
+        pointls = pointls.stream().filter(DistinctObject.distinctByKey(p->p.getUniformCode())).collect(Collectors.toList());
+
         List<ProEconTestingPoint> fdpointls = proEconTestingPointService.list().stream()
                 .filter(i -> i.getTypeId().equals(FCJSFW)).collect(Collectors.toList());
         List<ProEconTestingPoint> gfpointls = proEconTestingPointService.list().stream()
@@ -397,8 +408,17 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                 List<ProBasicPowerstationPoint> points = new ArrayList<>();
                 for (int i = 0; i < pointls.size(); i++) {
-
                     ProEconTestingPoint stp = pointls.get(i);
+                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.getId());
+                    if((null == groupFCRegion || groupFCRegion.size()<=0) && stp.getTypeId().equals(FCJSFW) ){
+                        continue;
+                    }
+
+                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCRegion.get(re.getId());
+                    if((null == groupGCRegion || groupGCRegion.size()<=0) && stp.getTypeId().equals(GCJSFW) ){
+                        continue;
+                    }
+
                     StringBuilder sb = new StringBuilder();
                     StringBuilder sbtable = new StringBuilder();
                     sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
@@ -430,7 +450,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                     po.setWindpowerstationId(String.valueOf(tempsb));
                     po.setUniformCode(stp.getUniformCode());
-
+                    po.setTypeId(stp.getTypeId());
 
                     sb = new StringBuilder();
                     sb.append(re.getNemCode()).append(".JSFW");
@@ -448,6 +468,12 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 points = new ArrayList<>();
 
                 for (int i = 0; i < fdpointls.size(); i++) {
+
+                    List<ProBasicPowerstation> groupFCRegion = CacheContext.wpmapGroupFCRegion.get(re.getId());
+                    if(null == groupFCRegion || groupFCRegion.size()<=0){
+                        break;
+                    }
+
                     sba = new StringBuilder();
 
                     ProEconTestingPoint stp = fdpointls.get(i);
@@ -480,7 +506,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     }
                     po.setWindpowerstationId(String.valueOf(tempsb));
                     po.setUniformCode(stp.getUniformCode());
-
+                    po.setTypeId(stp.getTypeId());
 
                     sb = new StringBuilder();
                     sb.append(re.getNemCode()).append(".JSFW");
@@ -498,6 +524,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                 points = new ArrayList<>();
                 for (int i = 0; i < gfpointls.size(); i++) {
 
+                    List<ProBasicPowerstation> groupGCRegion = CacheContext.wpmapGroupGCRegion.get(re.getId());
+                    if(null == groupGCRegion || groupGCRegion.size()<=0){
+                        break;
+                    }
 
                     ProEconTestingPoint stp = gfpointls.get(i);
                     StringBuilder sb = new StringBuilder();
@@ -530,7 +560,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                     po.setWindpowerstationId(String.valueOf(tempsb));
                     po.setUniformCode(stp.getUniformCode());
-
+                    po.setTypeId(stp.getTypeId());
                     sb = new StringBuilder();
                     sb.append(re.getNemCode()).append(".JSFW");
                     po.setRealtimeId(String.valueOf(sb));
@@ -548,9 +578,17 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 /********************************************区域公司测点**************************************************/
                         points = new ArrayList<>();
                         for (int i = 0; i < pointls.size(); i++) {
+                            ProEconTestingPoint stp = pointls.get(i);
+                            List<ProBasicPowerstation> groupFCCompany = CacheContext.wpmapGroupFCCompany.get(cs.getId());
+                            if((null == groupFCCompany || groupFCCompany.size()<=0) && stp.getTypeId().equals(FCJSFW) ){
+                                continue;
+                            }
 
+                            List<ProBasicPowerstation> groupGCCompany  = CacheContext.wpmapGroupGCCompany.get(cs.getId());
+                            if((null == groupGCCompany || groupGCCompany.size()<=0) && stp.getTypeId().equals(GCJSFW) ){
+                                continue;
+                            }
 
-                            ProEconTestingPoint stp = pointls.get(i);
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
                             sbtable.append(re.getId().substring(0, re.getId().indexOf("_")));
@@ -583,7 +621,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                             po.setWindpowerstationId(String.valueOf(tempsb));
                             po.setUniformCode(stp.getUniformCode());
-
+                            po.setTypeId(stp.getTypeId());
                             sb = new StringBuilder();
                             sb.append(cs.getId()).append(".JSFW");
                             po.setRealtimeId(String.valueOf(sb));
@@ -603,6 +641,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         sba.append(cs.getId().substring(0, cs.getId().lastIndexOf("_"))).append("_");
                         for (int i = 0; i < fdpointls.size(); i++) {
 
+                            List<ProBasicPowerstation> groupFCCompany = CacheContext.wpmapGroupFCCompany.get(cs.getId());
+                            if(null == groupFCCompany || groupFCCompany.size()<=0){
+                                break;
+                            }
                             ProEconTestingPoint stp = fdpointls.get(i);
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
@@ -633,7 +675,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                             }
                             po.setWindpowerstationId(String.valueOf(tempsb));
                             po.setUniformCode(stp.getUniformCode());
-
+                            po.setTypeId(stp.getTypeId());
                             sb = new StringBuilder();
                             sb.append(cs.getId()).append(".JSFW");
                             po.setRealtimeId(String.valueOf(sb));
@@ -654,6 +696,10 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         points = new ArrayList<>();
                         for (int i = 0; i < gfpointls.size(); i++) {
 
+                            List<ProBasicPowerstation> groupGCCompany = CacheContext.wpmapGroupGCCompany.get(cs.getId());
+                            if(null == groupGCCompany || groupGCCompany.size()<=0){
+                                break;
+                            }
                             ProEconTestingPoint stp = gfpointls.get(i);
                             StringBuilder sb = new StringBuilder();
                             StringBuilder sbtable = new StringBuilder();
@@ -685,7 +731,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
                             po.setWindpowerstationId(String.valueOf(tempsb));
                             po.setUniformCode(stp.getUniformCode());
-
+                            po.setTypeId(stp.getTypeId());
                             sb = new StringBuilder();
                             sb.append(cs.getId()).append(".JSFW");
                             po.setRealtimeId(String.valueOf(sb));
@@ -776,7 +822,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
             po.setModelId(null);
             po.setWindpowerstationId(wp.getId());
             po.setUniformCode(stp.getUniformCode());
-
+            po.setTypeId(stp.getTypeId());
 
             sb = new StringBuilder();
 
@@ -858,7 +904,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                     po.setModelId(null);
                     po.setWindpowerstationId(pj.getId());
                     po.setUniformCode(stp.getUniformCode());
-
+                    po.setTypeId(stp.getTypeId());
                     sb = new StringBuilder();
 
                     if (StringUtils.notEmp(wp.getPhoto())) {
@@ -946,7 +992,7 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
                         po.setModelId(null);
                         po.setWindpowerstationId(ln.getId());
                         po.setUniformCode(stp.getUniformCode());
-
+                        po.setTypeId(stp.getTypeId());
                         sb = new StringBuilder();
 
                         if (StringUtils.notEmp(wp.getPhoto())) {
@@ -968,4 +1014,5 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
 
 
+
 }