冲突解决

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

@@ -43,7 +43,6 @@ public class CompanysController {
      * @param id
      * @param name
      * @param aname
-     * @param capacity
      * @param pageNum
      * @param pageSize
      * @return
@@ -52,24 +51,9 @@ public class CompanysController {
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
-                      @RequestParam(value = "windcapacity", required = false) Integer windcapacity,
-                      @RequestParam(value = "windcapacityunit", required = false) String windcapacityunit,
-                      @RequestParam(value = "windquantity", required = false) Integer windquantity,
-                      @RequestParam(value = "capacity", required = false) Integer capacity,
-                      @RequestParam(value = "capacityunit", required = false) String capacityunit,
-                      @RequestParam(value = "quantityjz", required = false) Integer quantityjz,
-                      @RequestParam(value = "quantityzc", required = false) Integer quantityzc,
-                      @RequestParam(value = "jrwindcapacity", required = false) Integer jrwindcapacity,
-                      @RequestParam(value = "jrwindcapacityunit", required = false) String jrwindcapacityunit,
-                      @RequestParam(value = "jrwindquantity", required = false) Integer jrwindquantity,
-                      @RequestParam(value = "jrcapacity", required = false) Integer jrcapacity,
-                      @RequestParam(value = "jrcapacityunit", required = false) String jrcapacityunit,
-                      @RequestParam(value = "jrquantityjz", required = false) Integer jrquantityjz,
-                      @RequestParam(value = "jrquantityzc", required = false) Integer jrquantityzc,
-                      @RequestParam(value = "ordernum", required = false) Integer ordernum,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<Companys> list = companysService.list(id, name, aname,windcapacity, windcapacityunit, windquantity, capacity, capacityunit, quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, pageNum, pageSize);
+        IPage<Companys> list = companysService.list(id, name, aname, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

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/controller/RegionController.java

@@ -43,24 +43,9 @@ public class RegionController {
                       @RequestParam(value = "companyid",required = false) String companyid,
                       @RequestParam(value = "name",required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
-                      @RequestParam(value = "windcapacity", required = false) Integer windcapacity,
-                      @RequestParam(value = "windcapacityunit", required = false) String windcapacityunit,
-                      @RequestParam(value = "windquantity", required = false) Integer windquantity,
-                      @RequestParam(value = "capacity", required = false) Integer capacity,
-                      @RequestParam(value = "capacityunit", required = false) String capacityunit,
-                      @RequestParam(value = "quantityjz", required = false) Integer quantityjz,
-                      @RequestParam(value = "quantityzc", required = false) Integer quantityzc,
-                      @RequestParam(value = "jrwindcapacity", required = false) Integer jrwindcapacity,
-                      @RequestParam(value = "jrwindcapacityunit", required = false) String jrwindcapacityunit,
-                      @RequestParam(value = "jrwindquantity", required = false) Integer jrwindquantity,
-                      @RequestParam(value = "jrcapacity", required = false) Integer jrcapacity,
-                      @RequestParam(value = "jrcapacityunit", required = false) String jrcapacityunit,
-                      @RequestParam(value = "jrquantityjz", required = false) Integer jrquantityjz,
-                      @RequestParam(value = "jrquantityzc", required = false) Integer jrquantityzc,
-                      @RequestParam(value = "ordernum", required = false) Integer ordernum,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<Region> list = regionService.list(id,name,companyid,aname,windcapacity, windcapacityunit, windquantity, capacity, capacityunit, quantityjz, quantityzc, jrwindcapacity, jrwindcapacityunit, jrwindquantity, jrcapacity, jrcapacityunit, jrquantityjz, jrquantityzc, ordernum, pageNum, pageSize);
+        IPage<Region> list = regionService.list(id,name,companyid,aname, pageNum, pageSize);
         if (null != list){
             return R.ok().data(list);
         }else {

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(0).getChildren().size()>0) return cpls;
+        if(cpls.get(1).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

@@ -36,7 +36,6 @@ public class PointGenerateService {
     @Autowired
     private IWindturbineService windturbineService;//风机
 
-
     @Autowired
     private IWindpowerstationpointnewService windpowerstationpointnewService;
 
@@ -44,18 +43,20 @@ public class PointGenerateService {
     private IWindturbinetestingpointnewService windturbinetestingpointnewService;
 
 
-    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) {
@@ -67,43 +68,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);
@@ -116,7 +117,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<Windpowerstationpointnew>  stationList = new ArrayList<>();
@@ -177,23 +178,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

@@ -16,8 +16,8 @@ import java.util.List;
  */
 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);
+ IPage<Companys> list(String id, String name, String aname, String pageNum, String pageSize);
 
-    List<Companys> getCompanysByidAndRid(String id, String rid);
+    List<Companys> getCompanysByidAndRid(String id);
 
 }

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

@@ -17,8 +17,8 @@ import java.util.List;
 public interface IRegionService extends IService<Region> {
 
 
-    IPage<Region> list(String id, String name, String companyid, 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);
+    IPage<Region> list(String id, String name, String companyid, String aname, String pageNum, String pageSize);
 
-    List<Region> getReginBycode(String code);
+    List<Region> getReginBycode(String companyid);
 }
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> implements ICompanysService {
 
     @Override
-    public 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) {
+    public IPage<Companys> list(String id, String name, String aname, String pageNum, String pageSize) {
         QueryWrapper<Companys> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
             qw.like("id", id);
@@ -42,15 +42,12 @@ public class CompanysServiceImpl extends ServiceImpl<CompanysMapper, Companys> i
     }
 
     @Override
-    public List<Companys> getCompanysByidAndRid(String id, String rid) {
+    public List<Companys> getCompanysByidAndRid(String id) {
 
         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;
 

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

@@ -25,7 +25,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
 
     @Override
-    public IPage<Region> list(String id, String name, String companyid, 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) {
+    public IPage<Region> list(String id, String name, String companyid, String aname,String pageNum, String pageSize) {
         QueryWrapper<Region> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -51,11 +51,11 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
     }
 
     @Override
-    public List<Region> getReginBycode(String code) {
+    public List<Region> getReginBycode(String companyid) {
 
         QueryWrapper<Region> qw = new QueryWrapper<>();
-        if (StringUtils.isNotEmpty(code)){
-            qw.eq("code",code);
+        if (StringUtils.isNotEmpty(companyid)){
+            qw.eq("companyid",companyid);
         }
 
         List<Region> list = baseMapper.selectList(qw);