Merge remote-tracking branch 'origin/master'

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java

@@ -388,6 +388,8 @@ public class BackConfigService {
         Page<Companys> page1 = companysService.page(page, queryWrapper);
         return page1;
     }
+
+    //计划电量树
     public List<Companys> wtls() {
 
         List<Companys> cpls = CacheContext.cpls;

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

@@ -180,7 +180,7 @@ public class PointGenerateService {
                         stationpoint.setCode(qugfsb.toString());
                         stationpoint.setName(c.getName() + p.getName());
                         stationpoint.setUniformcode(p.getUniformcode());
-                        stationpoint.setWindpowerstationid(r.getId());
+                        stationpoint.setWindpowerstationid(r.getId() + "_" + gf);
                         stationpoint.setRealtimeid("JSFW");
                         stationList.add(stationpoint);
 
@@ -208,6 +208,7 @@ public class PointGenerateService {
                     stationpoint.setCode(stationsb.toString() + "XX_XX_XXX_" + p.getUniformcode());
                     stationpoint.setName(station.getName() + p.getName());
                     stationpoint.setUniformcode(p.getUniformcode());
+                    stationpoint.setWindpowerstationid(station.getId());
                     stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
                     stationList.add(stationpoint);
 
@@ -230,6 +231,7 @@ public class PointGenerateService {
                         stationpoint.setCode(projectsb.toString()+"_XX_XXX_"+p.getUniformcode());
                         stationpoint.setName(project.getName() + p.getName());
                         stationpoint.setUniformcode(p.getUniformcode());
+                        stationpoint.setWindpowerstationid(project.getId());
                         stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
                         stationList.add(stationpoint);
 
@@ -252,6 +254,7 @@ public class PointGenerateService {
                             stationpoint.setCode(linesb.toString());
                             stationpoint.setName(l.getName() + p.getName());
                             stationpoint.setUniformcode(p.getUniformcode());
+                            stationpoint.setWindpowerstationid(l.getId());
                             stationpoint.setRealtimeid(substaion + (station.getId().endsWith("_FDC") ? "FCJSFW" : "GCJSFW"));
                             stationList.add(stationpoint);
 
@@ -310,7 +313,7 @@ public class PointGenerateService {
 
                 testing.setName(w.getName() + p.getName());
                 testing.setUniformcode(p.getUniformcode());
-                testing.setWindpowerstationid(w.getWindpowerstationid());
+                testing.setWindpowerstationid(w.getId());
                 testingList.add(testing);
             }
         }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindturbinetestingpointnewService.java

@@ -24,6 +24,6 @@ public interface IWindturbinetestingpointnewService extends IService<Windturbine
 
     boolean  removeByIds(String ids);
 
-    List<Windturbinetestingpointnew> list(String uniformcode, String windpowerstationid);
+    List<Windturbinetestingpointnew> list(String windpowerstationid , String uniformcode);
 
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationpointnewServiceImpl.java

@@ -84,7 +84,7 @@ public class WindpowerstationpointnewServiceImpl extends ServiceImpl<Windpowerst
         }
 
         if (StringUtils.isNotEmpty(windpowerstationid)){
-            qw.like("windpowerstationid",windpowerstationid);
+            qw.eq("windpowerstationid",windpowerstationid);
         }
 
         List<Windpowerstationpointnew> list = baseMapper.selectList(qw);

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindturbinetestingpointnewServiceImpl.java

@@ -75,14 +75,14 @@ public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<Windturbi
     }
 
     @Override
-    public List<Windturbinetestingpointnew> list(String uniformcode, String windpowerstationid) {
+    public List<Windturbinetestingpointnew> list(String windpowerstationid , String uniformcode) {
 
         QueryWrapper<Windturbinetestingpointnew> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(uniformcode)){
             qw.eq("uniformcode",uniformcode);
         }
         if (StringUtils.isNotEmpty(windpowerstationid)){
-            qw.like("windpowerstationid",windpowerstationid);
+            qw.eq("windpowerstationid",windpowerstationid);
         }
         List<Windturbinetestingpointnew> list = baseMapper.selectList(qw);
         return list;