更新测点生成方法

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

@@ -1,16 +1,14 @@
 package com.gyee.backconfig.service;
 
 
-import com.gyee.backconfig.model.auto.Companys;
-import com.gyee.backconfig.model.auto.Region;
-import com.gyee.backconfig.model.auto.Standardpoint;
-import com.gyee.backconfig.model.auto.Windturbine;
+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.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,6 +37,13 @@ public class PointGenerateService {
     private IWindturbineService windturbineService;//风机
 
 
+    @Autowired
+    private IWindpowerstationpointnewService windpowerstationpointnewService;
+
+    @Autowired
+    private IWindturbinetestingpointnewService windturbinetestingpointnewService;
+
+
     public int addGeneratePoint(String regionCode, String companysId, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
 
 
@@ -114,12 +119,60 @@ public class PointGenerateService {
     int addPoint(String regionCode, String companysId, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
 
 
-        List<Windturbine> windturbineList = windturbineService.getWindturbineGyLine(lineId);
-        for (Standardpoint point : pointList){
+        List<Windpowerstationpointnew>  stationList = new ArrayList<>();
+        List<Windturbinetestingpointnew> testingList =  new ArrayList<>();
+
+        List<Windturbine> windturbineList = windturbineService.getWindturbineGyLine("",lineId);
+        for (Windturbine w : windturbineList) {
+            for (Standardpoint p : pointList) {
+
+                if ("1".equals(p.getType())) {
+
+                    Windpowerstationpointnew station = new Windpowerstationpointnew();
+
+                    station.setCode("");
+                    station.setName(w.getName()+p.getName());
+                    station.setModel("");
+                    station.setValueunit("");
+                    station.setEnglishname("");
+                    station.setTypeid("");
+                    station.setModelid(w.getModelid());
+                    station.setMaxval(null);
+                    station.setMinval(null);
+                    station.setReasonablemaxval(null);
+                    station.setReasonableminval(null);
+                    station.setUniformcode(p.getUniformcode());
+                    station.setShortid("");
+                    station.setLongid("");
+                    station.setWindpowerstationid("");
+                    station.setRealtimeid("");
+                    stationList.add(station);
+
+                } else {
+                    Windturbinetestingpointnew testing = new Windturbinetestingpointnew();
+
+                    testing.setCode("2".equals(p.getType()) ? "INITIAL" : "");
+                    testing.setName(w.getName()+p.getName());
+                    testing.setModel("");
+                    testing.setValueunit("");
+                    testing.setEnglishname("");
+                    testing.setTypeid("");
+                    testing.setModelid("");
+                    testing.setMaxval(null);
+                    testing.setMinval(null);
+                    testing.setReasonablemaxval(null);
+                    testing.setReasonableminval(null);
+                    testing.setUniformcode(p.getUniformcode());
+                    testing.setShortid("");
+                    testing.setLongid("");
+                    testing.setWindpowerstationid(w.getWindpowerstationid());
+                    testing.setRealtimeid("");
+                    testingList.add(testing);
 
+                }
+            }
         }
 
-
         return 0;
 
     }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.Windpowerstationpointnew;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -23,4 +25,7 @@ public interface IWindpowerstationpointnewService extends IService<Windpowerstat
 
     boolean  removeByIds(String ids);
 
+
+    List<Windpowerstationpointnew> getStationpointByUniformcode(String uniformcode,String windpowerstationid);
+
 }

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

@@ -25,7 +25,7 @@ public interface IWindturbineService extends IService<Windturbine> {
 
     boolean  removeByIds(String ids);
 
-    List<Windturbine> getWindturbineGyLine(String line);
+    List<Windturbine> getWindturbineGyLine(String projectid,String lineid);
 
 
 }

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

@@ -11,6 +11,7 @@ import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -72,4 +73,11 @@ public class WindpowerstationpointnewServiceImpl extends ServiceImpl<Windpowerst
         boolean b = this.removeByIds(Arrays.asList(strings));
         return b;
     }
+
+    @Override
+    public List<Windpowerstationpointnew> getStationpointByUniformcode(String uniformcode, String windpowerstationid) {
+        return null;
+    }
+
+
 }

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

@@ -74,11 +74,14 @@ public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windt
     }
 
     @Override
-    public List<Windturbine> getWindturbineGyLine(String line) {
+    public List<Windturbine> getWindturbineGyLine(String projectid ,String lineid) {
 
         QueryWrapper<Windturbine> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(line)){
-            qw.eq("lineid",line);
+        if (StringUtils.isNotEmpty(lineid)){
+            qw.eq("lineid",lineid);
+        }
+        if (StringUtils.isNotEmpty(projectid)){
+            qw.eq("projectid",projectid);
         }
         List<Windturbine> list =  baseMapper.selectList(qw);