Merge remote-tracking branch 'origin/master'

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

@@ -392,7 +392,7 @@ public class BackConfigService {
 
         List<Companys> cpls = CacheContext.cpls;
 
-        if(cpls.get(1).getChildren().size()>0) return cpls;
+        if(cpls.get(0).getChildren().size()>0) return cpls;
 
         List<Windpowerstation> wpls = CacheContext.wpls;
         List<Project> prols= CacheContext.prols;

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

@@ -18,11 +18,12 @@ import java.util.List;
 public class PointGenerateService {
 
 
+    @Resource
+    private ICompanysService companysService;//公司
+
     @Autowired
     private IRegionService regionService;//区域
 
-    @Resource
-    private ICompanysService companysService;//公司
 
     @Resource
     private IProjectService projectService;//期次
@@ -43,16 +44,11 @@ public class PointGenerateService {
     private IWindturbinetestingpointnewService windturbinetestingpointnewService;
 
 
-
     public int addGeneratePoint(String regioncompanyid, String id, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
 
 
-
         int tag = 0;
         //区域
-
-
-        //ddd
         List<Region> regionList = regionService.getReginBycode(regioncompanyid);
 
         //判断公司是否为空
@@ -123,56 +119,56 @@ public class PointGenerateService {
     int addPoint(String regioncompanyid, String id, String stationId, String projectId, String lineId, List<Standardpoint> 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();
+        List<Windpowerstationpointnew> stationList = new ArrayList<>();
+        List<Windturbinetestingpointnew> testingList = new ArrayList<>();
+
+        List<Windturbine> windturbineList = windturbineService.getWindturbineGyLine("", "", lineId);
+
+        for (Standardpoint p : pointList) {
+
+            if ("1".equals(p.getType())) {
+
+                Windpowerstationpointnew station = new Windpowerstationpointnew();
 
+                station.setCode("");
+                station.setName(stationId + p.getName());
+                station.setModel("");
+                station.setValueunit("");
+                station.setEnglishname("");
+                station.setTypeid("");
+                station.setModelid("");
+                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 {
+                for (Windturbine w : windturbineList) {
+
+                    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.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.setShortid("");
+//                    testing.setLongid("");
                     testing.setWindpowerstationid(w.getWindpowerstationid());
-                    testing.setRealtimeid("");
+//                    testing.setRealtimeid("");
                     testingList.add(testing);
-
                 }
             }
         }
@@ -204,7 +200,120 @@ public class PointGenerateService {
 
     int addPoint(List<Standardpoint> uniformcodes) {
 
+        List<Companys> companysList = companysService.getCompanysByidAndRid("");
+        for (Companys c : companysList) {
+            List<Region> regionList = regionService.getReginBycode(c.getCapacityunit());
+            for (Region r : regionList) {
+                List<Windpowerstation> windpowerstationList = windpowerstationService.getList(r.getCompanyid());
+                for (Standardpoint p : uniformcodes) {
+
+                    if ("czjs".equals(p.getType())) {
+
+                        List<Windpowerstationpointnew> staionList=  fjd(p, windpowerstationList);
+                        for (Windpowerstationpointnew i : staionList){
+                            boolean b = windpowerstationpointnewService.addOrUpdate(i);
+                        }
+
+                    } else {
+                        //fjjs
+                        //fjjcd
+
+                        List<Windturbinetestingpointnew> testingList = czd(p, windpowerstationList);
+                        for (Windturbinetestingpointnew i: testingList){
+                            boolean b = windturbinetestingpointnewService.addOrUpdate(i);
+                        }
+
+                    }
+
+                }
+
+
+            }
+
+        }
+
+
         return 0;
     }
 
+    private List<Windpowerstationpointnew> fjd(Standardpoint p, List<Windpowerstation> windpowerstationList) {
+        List<Windpowerstationpointnew> stationList = new ArrayList<>();
+
+        Windpowerstationpointnew stationpoint = null;
+
+        for (Windpowerstation station : windpowerstationList) {
+            List<Windpowerstationpointnew> list1 = windpowerstationpointnewService.getStationpointByUniformcode(station.getId(), p.getUniformcode());
+            if (null != list1 && list1.size() > 0) {
+                continue;
+            }
+            stationpoint = new Windpowerstationpointnew();
+            stationpoint.setCode("");
+            stationpoint.setName(station.getName() + p.getName());
+            stationpoint.setUniformcode(p.getUniformcode());
+            stationList.add(stationpoint);
+
+            List<Project> projectList = projectService.getList(station.getId());
+            for (Project project : projectList) {
+                List<Windpowerstationpointnew> list2 = windpowerstationpointnewService.getStationpointByUniformcode(project.getId(), p.getUniformcode());
+                if (null != list2 && list2.size() > 0) {
+                    continue;
+                }
+                stationpoint = new Windpowerstationpointnew();
+                stationpoint.setCode("");
+                stationpoint.setName(project.getName() + p.getName());
+                stationpoint.setUniformcode(p.getUniformcode());
+                stationList.add(stationpoint);
+
+                List<Line> lineList = lineService.getList(project.getId());
+                for (Line l : lineList) {
+
+                    List<Windpowerstationpointnew> list3 = windpowerstationpointnewService.getStationpointByUniformcode(l.getId(), p.getUniformcode());
+                    if (null != list3 && list3.size() > 0) {
+                        continue;
+                    }
+                    stationpoint = new Windpowerstationpointnew();
+                    stationpoint.setCode("");
+                    stationpoint.setName(l.getName() + p.getName());
+                    stationpoint.setUniformcode(p.getUniformcode());
+                    stationList.add(stationpoint);
+
+                }
+            }
+        }
+
+        return stationList;
+
+    }
+
+
+    /**
+     * @param p
+     * @param windpowerstationList
+     * @return
+     */
+    private List<Windturbinetestingpointnew> czd(Standardpoint p, List<Windpowerstation> windpowerstationList) {
+        Windturbinetestingpointnew testing = null;
+        List<Windturbinetestingpointnew> testingList = new ArrayList<>();
+        for (Windpowerstation staion : windpowerstationList) {
+
+            List<Windturbine> windturbineList = windturbineService.getWindturbineGyLine(staion.getId(), "", "");
+            for (Windturbine w : windturbineList) {
+                List<Windturbinetestingpointnew> list = windturbinetestingpointnewService.list(w.getId(), p.getUniformcode());
+                if (null != list && list.size() > 0) {
+                    continue;
+                }
+                testing = new Windturbinetestingpointnew();
+                testing.setCode("fjjs".equals(p.getType()) ? "INITIAL" : "");
+                testing.setName(w.getName() + p.getName());
+                testing.setUniformcode(p.getUniformcode());
+                testing.setWindpowerstationid(w.getWindpowerstationid());
+                testingList.add(testing);
+            }
+
+        }
+
+        return testingList;
+
+    }
+
 }

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

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface ICompanysService extends IService<Companys> {
 
- IPage<Companys> list(String id, String name, String aname, String pageNum, String pageSize);
+    IPage<Companys> list(String id, String name, String aname, String pageNum, String pageSize);
 
     List<Companys> getCompanysByidAndRid(String id);
 

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

@@ -22,4 +22,7 @@ public interface ILineService extends IService<Line> {
     boolean addOrUpdate(Line Line);
 
     boolean  removeByIds(String ids);
+
+    List<Line> getList(String projectid);
+
 }

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

@@ -25,4 +25,7 @@ public interface IProjectService extends IService<Project> {
 
     boolean removeByIds(String ids);
 
+    List<Project> getList( String stationid);
+
+
 }

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

@@ -26,4 +26,8 @@ public interface IWindpowerstationService extends IService<Windpowerstation> {
     boolean  removeByIds(String ids);
 
 
+    List<Windpowerstation> getList(String companyid);
+
+
+
 }

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

@@ -26,6 +26,6 @@ public interface IWindpowerstationpointnewService extends IService<Windpowerstat
     boolean  removeByIds(String ids);
 
 
-    List<Windpowerstationpointnew> getStationpointByUniformcode(String uniformcode,String windpowerstationid);
+    List<Windpowerstationpointnew> getStationpointByUniformcode(String windpowerstationid,String uniformcode);
 
 }

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 projectid,String lineid);
+    List<Windturbine> getWindturbineGyLine(String windpowerstationid,String projectid ,String lineid);
 
 
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.Windturbinetestingpointnew;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -22,4 +24,6 @@ public interface IWindturbinetestingpointnewService extends IService<Windturbine
 
     boolean  removeByIds(String ids);
 
+    List<Windturbinetestingpointnew> list(String uniformcode, String windpowerstationid);
+
 }

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

@@ -39,7 +39,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements IL
         if (StringUtils.isNotEmpty(name)){
             qw.like("name",name);
         }
-        if (StringUtils.isNotEmpty(name)){
+        if (StringUtils.isNotEmpty(projectid)){
             qw.eq("projectid",projectid);
         }
         Page<Line> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
@@ -64,4 +64,19 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements IL
         boolean b = this.removeByIds(Arrays.asList(strings));
         return b;
     }
+
+    @Override
+    public List<Line> getList(String projectid) {
+
+        QueryWrapper<Line> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotEmpty(projectid)){
+            qw.eq("projectid",projectid);
+        }
+        List<Line> list = baseMapper.selectList(qw);
+        return list;
+    }
+
+
 }

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

@@ -70,4 +70,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         boolean b = this.removeByIds(Arrays.asList(strings));
         return b;
     }
+
+    @Override
+    public List<Project> getList(String stationid) {
+        QueryWrapper<Project> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotEmpty(stationid)){
+            qw.like("windpowerstationid",stationid);
+        }
+        List<Project> list = baseMapper.selectList(qw);
+        return list;
+    }
+
+
 }

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

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

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

@@ -75,8 +75,21 @@ public class WindpowerstationpointnewServiceImpl extends ServiceImpl<Windpowerst
     }
 
     @Override
-    public List<Windpowerstationpointnew> getStationpointByUniformcode(String uniformcode, String windpowerstationid) {
-        return null;
+    public List<Windpowerstationpointnew> getStationpointByUniformcode(String windpowerstationid,String uniformcode) {
+        QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotEmpty(uniformcode)){
+            qw.eq("uniformcode",uniformcode);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationid)){
+            qw.like("windpowerstationid",windpowerstationid);
+        }
+
+        List<Windpowerstationpointnew> list = baseMapper.selectList(qw);
+
+        return list;
     }
 
 

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

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

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindturbinetestingpointnewServiceImpl.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,19 @@ public class WindturbinetestingpointnewServiceImpl extends ServiceImpl<Windturbi
         boolean b = this.removeByIds(Arrays.asList(strings));
         return b;
     }
+
+    @Override
+    public List<Windturbinetestingpointnew> list(String uniformcode, String windpowerstationid) {
+
+        QueryWrapper<Windturbinetestingpointnew> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(uniformcode)){
+            qw.eq("uniformcode",uniformcode);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationid)){
+            qw.like("windpowerstationid",windpowerstationid);
+        }
+        List<Windturbinetestingpointnew> list = baseMapper.selectList(qw);
+        return list;
+    }
+
 }