Prechádzať zdrojové kódy

更新测点生成方法

wangchangsheng 2 rokov pred
rodič
commit
83864beb5b

+ 12 - 14
web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/PointGenerateController.java

@@ -3,11 +3,14 @@ package com.gyee.backconfig.controller;
 
 import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.Project;
+import com.gyee.backconfig.model.auto.Standardpoint;
+import com.gyee.backconfig.service.PointGenerateService;
 import com.gyee.backconfig.service.auto.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -22,36 +25,31 @@ import javax.annotation.Resource;
 public class PointGenerateController {
 
 
-    @Autowired
-    private IRegionService regionService;//区域
-
-    @Resource
-    private ICompanysService companysService;//公司
 
-    @Resource
-    private IProjectService projectService;//期次
 
-    @Resource
-    private ILineService lineService;//线路
-
-    @Resource
-    private IWindpowerstationService windpowerstationService;//场站
 
     @Autowired
-    private IWindturbineService windturbineService;//风机
+    private PointGenerateService pointGenerateService;
 
 
 
     @PostMapping(value = "/add")
-    public R GeneratePoint(
+    public R addGeneratePoint(
                            @RequestParam(value = "regionCode", required = false) String regionCode,
                            @RequestParam(value = "companysId", required = false) String companysId,
                            @RequestParam(value = "stationId", required = false) String stationId,
                            @RequestParam(value = "projectId", required = false) String projectId,
                            @RequestParam(value = "lineId", required = false) String lineId,
+                           @RequestParam(value = "pointList", required = false) List<Standardpoint> pointList,
                            @RequestParam(value = "type", required = false) String type){
 
 
+        pointGenerateService.addGeneratePoint(regionCode, companysId, stationId, projectId, lineId, pointList);
+
+
+
+
+
 
 
 

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

@@ -1,11 +1,153 @@
 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.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.List;
+
 /**
  * 生成测点服务类
  */
 @Service
 public class PointGenerateService {
+
+
+    @Autowired
+    private IRegionService regionService;//区域
+
+    @Resource
+    private ICompanysService companysService;//公司
+
+    @Resource
+    private IProjectService projectService;//期次
+
+    @Resource
+    private ILineService lineService;//线路
+
+    @Resource
+    private IWindpowerstationService windpowerstationService;//场站
+
+    @Autowired
+    private IWindturbineService windturbineService;//风机
+
+
+    public int addGeneratePoint(String regionCode, String companysId, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
+
+
+        int tag = 0;
+        //区域
+        List<Region> regionList = regionService.getReginBycode(regionCode);
+
+        //判断公司是否为空
+        if (null != companysId && companysId.length() > 0) {
+            //不为空
+            for (Region r : regionList) {
+                List<Companys> companysList = companysService.getCompanysByidAndRid(companysId, r.getId());
+
+                //判断是否有匹配的的公司
+                if (null != companysList && companysList.size() > 0) {
+                    for (Companys c : companysList) {
+
+
+                    }
+                }
+            }
+        }
+
+        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId)
+                && StringUtils.isNotNull(stationId) && StringUtils.isNotNull(projectId) && StringUtils.isNotNull(lineId)) {
+            tag = 1;
+        }
+
+        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId)
+                && StringUtils.isNotNull(stationId) && StringUtils.isNotNull(projectId)) {
+            tag = 2;
+        }
+
+        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId) && StringUtils.isNotNull(stationId)) {
+            tag = 3;
+        }
+        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId)) {
+            tag = 4;
+        }
+
+        if (StringUtils.isNotNull(regionCode)) {
+            tag = 5;
+        }
+
+        switch (tag) {
+            case 1:
+                addPoint(regionCode, companysId, stationId, projectId, lineId, pointList);
+                break;
+            case 2:
+                addPoint(regionCode, companysId, stationId, projectId, pointList);
+                break;
+            case 3:
+                addPoint(regionCode, companysId, stationId, pointList);
+                break;
+            case 4:
+                addPoint(regionCode, companysId, pointList);
+                break;
+
+            case 5:
+                addPoint(regionCode, pointList);
+                break;
+            default:
+                addPoint(pointList);
+                break;
+
+        }
+
+
+        return 0;
+    }
+
+
+    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){
+
+        }
+
+
+        return 0;
+
+    }
+
+    int addPoint(String regionCode, String companysId, String stationId, String projectId, List<Standardpoint> uniformcodes) {
+
+        return 0;
+    }
+
+
+    int addPoint(String regionCode, String companysId, String stationId, List<Standardpoint> uniformcodes) {
+
+        return 0;
+    }
+
+    int addPoint(String regionCode, String companysId, List<Standardpoint> uniformcodes) {
+
+        return 0;
+    }
+
+    int addPoint(String regionCode, List<Standardpoint> uniformcodes) {
+
+        return 0;
+    }
+
+    int addPoint(List<Standardpoint> uniformcodes) {
+
+        return 0;
+    }
+
 }

+ 3 - 0
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/ICompanysService.java

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

+ 2 - 0
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IRegionService.java

@@ -19,4 +19,6 @@ public interface IRegionService extends IService<Region> {
 
     IPage<Region> list(String id, String name, String code, String pageNum, String pageSize);
 
+    List<Region> getReginBycode(String code);
+
 }

+ 2 - 0
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/IWindturbineService.java

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

+ 15 - 0
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/CompanysServiceImpl.java

@@ -36,4 +36,19 @@ public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> i
         List<Companys> list = companysPage.getRecords();
         return list;
     }
+
+    @Override
+    public List<Companys> getCompanysByidAndRid(String id, String rid) {
+
+        QueryWrapper<Companys> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)){
+            qw.like("id",id);
+        }
+        if (StringUtils.isNotEmpty(rid)){
+            qw.like("rid",rid);
+        }
+        List<Companys> list = baseMapper.selectList(qw);
+        return list;
+
+    }
 }

+ 13 - 0
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/RegionServiceImpl.java

@@ -47,4 +47,17 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         return pageData;
     }
 
+    @Override
+    public List<Region> getReginBycode(String code) {
+
+        QueryWrapper<Region> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(code)){
+            qw.eq("code",code);
+        }
+
+        List<Region> list = baseMapper.selectList(qw);
+        return list;
+    }
+
+
 }

+ 12 - 0
web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/WindturbineServiceImpl.java

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