提交

web/backmanagerconfig/src/main/java/com/gyee/backconfig/controller/PointGenerateController.java

@@ -35,8 +35,8 @@ public class PointGenerateController {
 
     @PostMapping(value = "/add")
     public R addGeneratePoint(
-                           @RequestParam(value = "regionCode", required = false) String regionCode,
-                           @RequestParam(value = "companysId", required = false) String companysId,
+                           @RequestParam(value = "regioncompanyid", required = false) String regioncompanyid,
+                           @RequestParam(value = "id", required = false) String id,
                            @RequestParam(value = "stationId", required = false) String stationId,
                            @RequestParam(value = "projectId", required = false) String projectId,
                            @RequestParam(value = "lineId", required = false) String lineId,
@@ -44,7 +44,7 @@ public class PointGenerateController {
                            @RequestParam(value = "type", required = false) String type){
 
 
-        pointGenerateService.addGeneratePoint(regionCode, companysId, stationId, projectId, lineId, pointList);
+        pointGenerateService.addGeneratePoint(regioncompanyid, id, stationId, projectId, lineId, pointList);
 
 
 

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

@@ -39,18 +39,18 @@ public class PointGenerateService {
     private IWindturbineService windturbineService;//风机
 
 
-    public int addGeneratePoint(String regionCode, String companysId, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
+    public int addGeneratePoint(String regioncompanyid, String id, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
 
 
         int tag = 0;
         //区域
-        List<Region> regionList = regionService.getReginBycode(regionCode);
+        List<Region> regionList = regionService.getReginBycode(regioncompanyid);
 
         //判断公司是否为空
-        if (null != companysId && companysId.length() > 0) {
+        if (null != id && id.length() > 0) {
             //不为空
             for (Region r : regionList) {
-                List<Companys> companysList = companysService.getCompanysByidAndRid(companysId, r.getId());
+                List<Companys> companysList = companysService.getCompanysByidAndRid(r.getCompanyid());
 
                 //判断是否有匹配的的公司
                 if (null != companysList && companysList.size() > 0) {
@@ -62,43 +62,43 @@ public class PointGenerateService {
             }
         }
 
-        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId)
+        if (StringUtils.isNotNull(regioncompanyid) && StringUtils.isNotNull(id)
                 && StringUtils.isNotNull(stationId) && StringUtils.isNotNull(projectId) && StringUtils.isNotNull(lineId)) {
             tag = 1;
         }
 
-        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId)
+        if (StringUtils.isNotNull(regioncompanyid) && StringUtils.isNotNull(id)
                 && StringUtils.isNotNull(stationId) && StringUtils.isNotNull(projectId)) {
             tag = 2;
         }
 
-        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId) && StringUtils.isNotNull(stationId)) {
+        if (StringUtils.isNotNull(regioncompanyid) && StringUtils.isNotNull(id) && StringUtils.isNotNull(stationId)) {
             tag = 3;
         }
-        if (StringUtils.isNotNull(regionCode) && StringUtils.isNotNull(companysId)) {
+        if (StringUtils.isNotNull(regioncompanyid) && StringUtils.isNotNull(id)) {
             tag = 4;
         }
 
-        if (StringUtils.isNotNull(regionCode)) {
+        if (StringUtils.isNotNull(regioncompanyid)) {
             tag = 5;
         }
 
         switch (tag) {
             case 1:
-                addPoint(regionCode, companysId, stationId, projectId, lineId, pointList);
+                addPoint(regioncompanyid, id, stationId, projectId, lineId, pointList);
                 break;
             case 2:
-                addPoint(regionCode, companysId, stationId, projectId, pointList);
+                addPoint(regioncompanyid, id, stationId, projectId, pointList);
                 break;
             case 3:
-                addPoint(regionCode, companysId, stationId, pointList);
+                addPoint(regioncompanyid, id, stationId, pointList);
                 break;
             case 4:
-                addPoint(regionCode, companysId, pointList);
+                addPoint(regioncompanyid, id, pointList);
                 break;
 
             case 5:
-                addPoint(regionCode, pointList);
+                addPoint(regioncompanyid, pointList);
                 break;
             default:
                 addPoint(pointList);
@@ -111,7 +111,7 @@ public class PointGenerateService {
     }
 
 
-    int addPoint(String regionCode, String companysId, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
+    int addPoint(String regioncompanyid, String id, String stationId, String projectId, String lineId, List<Standardpoint> pointList) {
 
 
         List<Windturbine> windturbineList = windturbineService.getWindturbineGyLine(lineId);
@@ -124,23 +124,23 @@ public class PointGenerateService {
 
     }
 
-    int addPoint(String regionCode, String companysId, String stationId, String projectId, List<Standardpoint> uniformcodes) {
+    int addPoint(String regioncompanyid, String id, String stationId, String projectId, List<Standardpoint> uniformcodes) {
 
         return 0;
     }
 
 
-    int addPoint(String regionCode, String companysId, String stationId, List<Standardpoint> uniformcodes) {
+    int addPoint(String regioncompanyid, String id, String stationId, List<Standardpoint> uniformcodes) {
 
         return 0;
     }
 
-    int addPoint(String regionCode, String companysId, List<Standardpoint> uniformcodes) {
+    int addPoint(String regioncompanyid, String id, List<Standardpoint> uniformcodes) {
 
         return 0;
     }
 
-    int addPoint(String regionCode, List<Standardpoint> uniformcodes) {
+    int addPoint(String regioncompanyid, List<Standardpoint> uniformcodes) {
 
         return 0;
     }

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

@@ -18,6 +18,6 @@ public interface ICompanysService extends IService<Companys> {
 
  IPage<Companys> list(String id, String name, String aname, Integer windcapacity, String windcapacityunit, Integer windquantity, Integer capacity, String capacityunit, Integer quantityjz, Integer quantityzc, Integer jrwindcapacity, String jrwindcapacityunit, Integer jrwindquantity, Integer jrcapacity, String jrcapacityunit, Integer jrquantityjz, Integer jrquantityzc, Integer ordernum, String pageNum, String pageSize);
 
-    List<Companys> getCompanysByidAndRid(String id, String name);
+    List<Companys> getCompanysByidAndRid(String id);
 
 }

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

@@ -42,15 +42,12 @@ public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> i
     }
 
     @Override
-    public List<Companys> getCompanysByidAndRid(String id, String name) {
+    public List<Companys> getCompanysByidAndRid(String id) {
 
         QueryWrapper<Companys> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.like("id",id);
         }
-        if (StringUtils.isNotEmpty(name)){
-            qw.like("name",name);
-        }
         List<Companys> list = baseMapper.selectList(qw);
         return list;