Browse Source

修改测点生成规则3

wangchangsheng 2 years ago
parent
commit
7f693e02a9

+ 2 - 0
web/backmanagerconfig/src/main/java/com/gyee/backconfig/model/auto/Windpowerstation.java

@@ -63,6 +63,8 @@ public class Windpowerstation extends Model {
 
     private Integer height;
 
+    private String regionid;
+
     @TableField(exist = false)
     private List<Project> Children = new ArrayList<>();
 }

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

@@ -74,7 +74,7 @@ public class PointGenerateService {
                 for (Companys c : companysList) {
                     List<Region> regionList = regionService.getReginBycode(c.getCapacityunit());
                     for (Region r : regionList) {
-                        List<Windpowerstation> windpowerstationList = windpowerstationService.getList(r.getCompanyid());
+                        List<Windpowerstation> windpowerstationList = windpowerstationService.getList(r.getId());
                         List<Windturbinetestingpointnew> testingList = czd(p, windpowerstationList, r);
                         for (Windturbinetestingpointnew i : testingList) {
                             boolean b = windturbinetestingpointnewService.addOrUpdate(i);
@@ -181,7 +181,7 @@ public class PointGenerateService {
                 }
 
 
-                List<Windpowerstation> windpowerstationList = windpowerstationService.getList(r.getCompanyid());
+                List<Windpowerstation> windpowerstationList = windpowerstationService.getList(r.getId());
                 for (Windpowerstation station : windpowerstationList) {
                     List<Windpowerstationpointnew> list3 = windpowerstationpointnewService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
                     if (null != list3 && list3.size() > 0) {

+ 3 - 3
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindpowerstationServiceImpl.java

@@ -77,11 +77,11 @@ public class WindpowerstationServiceImpl extends ServiceImpl<WindpowerstationMap
     }
 
     @Override
-    public List<Windpowerstation> getList(String companyid) {
+    public List<Windpowerstation> getList(String regionid) {
         QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
 
-        if (StringUtils.isNotEmpty(companyid)){
-            qw.eq("companyid",companyid);
+        if (StringUtils.isNotEmpty(regionid)){
+            qw.eq("regionid",regionid);
         }
 
         List<Windpowerstation> list = baseMapper.selectList(qw);