代码优化

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicCompanyController.java

@@ -42,16 +42,20 @@ public class ProBasicCompanyController {
     @GetMapping(value = "/listByPage")
     @ApiOperation(value = "省公司-列表", notes = "省公司-列表")
     @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "公司id", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "groupId", value = "集团id", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "regionId", value = "集团id", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "aname", value = "别名", required = false, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "pageNum", value = "当前页码", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "每页大小", required = true, dataType = "string", paramType = "query")})
     public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "groupId", required = false) String groupId,
+                      @RequestParam(value = "regionId", required = false) String regionId,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "aname", required = false) String aname,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicCompany> list = proBasicCompanyService.list(id, name, aname, pageNum, pageSize);
+        IPage<ProBasicCompany> list = proBasicCompanyService.list(id, groupId,regionId,name, aname, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicEquipmentController.java

@@ -29,26 +29,31 @@ public class ProBasicEquipmentController {
 
     /**
      * 查询
-     *
      * @param id
      * @param code
+     * @param companyId
+     * @param regionId
      * @param windpowerstationId
      * @param projectId
      * @param lineId
+     * @param substationId
      * @param pageNum
      * @param pageSize
      * @return
      */
     @GetMapping(value = "/list")
-    @ApiOperation(value = "风机-列表", notes = "风机-列表")
+    @ApiOperation(value = "发电设备-列表", notes = "发电设备-列表")
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "companyId", required = false) String companyId,
+                      @RequestParam(value = "regionId", required = false) String regionId,
                       @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
                       @RequestParam(value = "projectId", required = false) String projectId,
                       @RequestParam(value = "lineId", required = false) String lineId,
+                      @RequestParam(value = "substationId", required = false) String substationId,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicEquipment> list = proBasicWindturbineService.list(id, code, windpowerstationId, projectId, lineId, pageNum, pageSize);
+        IPage<ProBasicEquipment> list = proBasicWindturbineService.list(id, code, companyId,regionId,windpowerstationId, projectId, lineId,substationId, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicLineController.java

@@ -42,10 +42,11 @@ public class ProBasicLineController {
     public R findList(@RequestParam(value = "id", required = false) String id,
                       @RequestParam(value = "code", required = false) String code,
                       @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "projectId", required = false) String projectId,
                       @RequestParam(value = "aname", required = false) String aname,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicLine> list = proBasicLineService.list(id, code,name, aname, pageNum, pageSize);
+        IPage<ProBasicLine> list = proBasicLineService.list(id, code,name, aname,projectId, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicPowerstationController.java

@@ -41,14 +41,15 @@ public class ProBasicPowerstationController {
      */
     @GetMapping(value = "/List")
     @ApiOperation(value = "场站-列表", notes = "场站-列表")
-    public R findList(@ApiParam(name = "场站id") @RequestParam(value = "id", required = false) String id,
-                      @ApiParam(name = "场站名称") @RequestParam(value = "name", required = false) String name,
-                      @ApiParam(name = "场站code")  @RequestParam(value = "code", required = false) String code,
-                      @ApiParam(name = "公司id") @RequestParam(value = "companyId", required = false) String companyId,
-                      @ApiParam(name = "集团id") @RequestParam(value = "groupId", required = false) String groupId,
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "code", required = false) String code,
+                      @RequestParam(value = "companyId", required = false) String companyId,
+                      @RequestParam(value = "groupId", required = false) String groupId,
+                      @RequestParam(value = "regionId", required = false) String regionId,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicPowerstation> list = proBasicWindpowerstationService.getList(id, name, code, groupId,companyId, pageNum, pageSize);
+        IPage<ProBasicPowerstation> list = proBasicWindpowerstationService.getList(id, name, code, groupId,companyId,regionId, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/controller/ProBasicProjectController.java

@@ -43,9 +43,10 @@ public class ProBasicProjectController {
                       @RequestParam(value = "name",required = false) String name,
                       @RequestParam(value = "code",required = false) String code,
                       @RequestParam(value = "windpowerstationId",required = false) String windpowerstationId,
+                      @RequestParam(value = "windsubStationId",required = false) String windsubStationId,
                       @RequestParam(value = "pageNum",required = true) String pageNum,
                       @RequestParam(value = "pageSize",required = true) String pageSize){
-        IPage<ProBasicProject> list = proBasicProjectService.getList(id,name,code,windpowerstationId,pageNum,pageSize);
+        IPage<ProBasicProject> list = proBasicProjectService.getList(id,name,code,windpowerstationId,windsubStationId,pageNum,pageSize);
         if (null != list){
             return R.ok().data(list);
         }else {

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicEquipment.java

@@ -142,5 +142,10 @@ public class ProBasicEquipment extends Model {
      */
     private Integer orderNum;
 
+    /**
+     * 变电所id
+     */
+    private String substationId;
+
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/model/auto/ProBasicSubStation.java

@@ -76,4 +76,9 @@ public class ProBasicSubStation extends Model {
      * 备用4
      */
     private String spare4;
+
+    /**
+     * 装机容量
+     */
+    private Double capacity;
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicCompanyService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicCompanyService extends IService<ProBasicCompany> {
-    IPage<ProBasicCompany> list(String id, String name, String aname, String pageNum, String pageSize);
+    IPage<ProBasicCompany> list(String id, String groupId,String regionId,String name, String aname, String pageNum, String pageSize);
 
     List<ProBasicCompany> getCompanysByidAndRid(String id);
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicEquipmentService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicEquipmentService extends IService<ProBasicEquipment> {
-    IPage<ProBasicEquipment> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize);
+    IPage<ProBasicEquipment> list(String id, String code,  String companyId, String regionId,String windpowerstationId, String projectId, String lineId, String substationId,String pageNum, String pageSize);
 
     List<ProBasicEquipment> getWindturbineGyLine(String windpowerstationId, String projectId , String lineId);
 

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicLineService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicLineService extends IService<ProBasicLine> {
-    IPage<ProBasicLine> list(String id,String code, String name, String aname, String pageNum, String pageSize);
+    IPage<ProBasicLine> list(String id,String code, String name, String aname,String projectId, String pageNum, String pageSize);
 
     List<ProBasicLine> getList(String projectId);
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicPowerstationService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicPowerstationService extends IService<ProBasicPowerstation> {
-    IPage<ProBasicPowerstation> getList(String id, String name, String code,String groupId, String companyId, String pageNum, String pageSize);
+    IPage<ProBasicPowerstation> getList(String id, String name, String code,String groupId, String companyId,String regionId, String pageNum, String pageSize);
     List<ProBasicPowerstation> getList(String regionId);
 
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/IProBasicProjectService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @since 2022-10-15
  */
 public interface IProBasicProjectService extends IService<ProBasicProject> {
-    IPage<ProBasicProject> getList(String id, String name, String code, String windpowerstationId, String pageNum, String pageSize);
+    IPage<ProBasicProject> getList(String id, String name, String code, String windpowerstationId,String windsubStationId, String pageNum, String pageSize);
 
     List<ProBasicProject> getList(String windpowerstationId);
 }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicCompanyServiceImpl.java

@@ -25,11 +25,18 @@ import java.util.List;
 public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMapper, ProBasicCompany> implements IProBasicCompanyService {
 
     @Override
-    public IPage<ProBasicCompany> list(String id, String name, String aname, String pageNum, String pageSize) {
+    public IPage<ProBasicCompany> list(String id, String groupId,String regionId,String name, String aname, String pageNum, String pageSize) {
         QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
+        if (StringUtils.isNotEmpty(groupId)) {
+            qw.eq("group_id", groupId);
+        }
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.eq("region_id", regionId);
+        }
+
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);
         }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicEquipmentPointServiceImpl.java

@@ -31,7 +31,7 @@ public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquip
     public IPage<ProBasicEquipmentPoint> list(String id, String code, String name, String aname, String model, String uniformCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(code)) {
             qw.like("code", code);
@@ -49,7 +49,7 @@ public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquip
         }
 
         if (StringUtils.isNotEmpty(uniformCode)) {
-            qw.eq("uniformCode", uniformCode);
+            qw.eq("uniform_code", uniformCode);
         }
 
         Page<ProBasicEquipmentPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicEquipmentServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.List;
 public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentMapper, ProBasicEquipment> implements IProBasicEquipmentService {
 
     @Override
-    public IPage<ProBasicEquipment> list(String id, String code, String windpowerstationId, String projectId, String lineId, String pageNum, String pageSize) {
+    public IPage<ProBasicEquipment> list(String id, String code,  String companyId, String regionId,String windpowerstationId, String projectId, String lineId, String substationId,String pageNum, String pageSize) {
         QueryWrapper<ProBasicEquipment> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)){
             qw.eq("id",id);
@@ -32,9 +32,15 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
         if (StringUtils.isNotEmpty(code)){
             qw.like("nem_code",code);
         }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.eq("company_id", companyId);
+        }
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.eq("region_id", regionId);
+        }
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.like("windpowerstation_id",windpowerstationId);
+            qw.eq("windpowerstation_id",windpowerstationId);
         }
 
         if (StringUtils.isNotEmpty(projectId)){
@@ -45,6 +51,11 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
             qw.eq("line_id",lineId);
         }
 
+        if (StringUtils.isNotEmpty(substationId)){
+            qw.eq("substation_id",substationId);
+        }
+
+
         Page<ProBasicEquipment> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<ProBasicEquipment> companysPage = getBaseMapper().selectPage(page, qw);
 //        List<Windturbine> list = companysPage.getRecords();

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicLineServiceImpl.java

@@ -24,11 +24,16 @@ import java.util.List;
 public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, ProBasicLine> implements IProBasicLineService {
 
     @Override
-    public IPage<ProBasicLine> list(String id, String code, String name, String aname, String pageNum, String pageSize) {
+    public IPage<ProBasicLine> list(String id, String code, String name, String aname, String projectId,String pageNum, String pageSize) {
         QueryWrapper<ProBasicLine> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
+
+        if (StringUtils.isNotEmpty(projectId)) {
+            qw.eq("project_id", projectId);
+        }
+
         if (StringUtils.isNotEmpty(code)) {
             qw.like("nem_code", code);
         }

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicPowerstationServiceImpl.java

@@ -32,7 +32,7 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
     @Autowired
     private EdosUtil goldenUtil;
     @Override
-    public IPage<ProBasicPowerstation> getList(String id, String name, String code, String groupId,String companyId, String pageNum, String pageSize) {
+    public IPage<ProBasicPowerstation> getList(String id, String name, String code, String groupId,String companyId, String regionId,String pageNum, String pageSize) {
         QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -48,12 +48,16 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
         }
 
         if (StringUtils.isNotEmpty(companyId)){
-            qw.like("company_id",companyId);
+            qw.eq("company_id",companyId);
         }
 
         if (StringUtils.isNotEmpty(groupId)){
-            qw.like("group_id",groupId);
+            qw.eq("group_id",groupId);
         }
+        if (StringUtils.isNotEmpty(regionId)){
+            qw.eq("region_id",regionId);
+        }
+
         Page<ProBasicPowerstation> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
         IPage<ProBasicPowerstation> companysPage = getBaseMapper().selectPage(page, qw);
 //        List<Windpowerstation> list = companysPage.getRecords();

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/service/auto/impl/ProBasicProjectServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.List;
 public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMapper, ProBasicProject> implements IProBasicProjectService {
 
     @Override
-    public IPage<ProBasicProject> getList(String id, String name, String code, String windpowerstationId, String pageNum, String pageSize) {
+    public IPage<ProBasicProject> getList(String id, String name, String code, String windpowerstationId, String windsubStationId,String pageNum, String pageSize) {
         QueryWrapper<ProBasicProject> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -40,7 +40,11 @@ public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMappe
         }
 
         if (StringUtils.isNotEmpty(windpowerstationId)){
-            qw.like("windpowerstation_id",windpowerstationId);
+            qw.eq("windpowerstation_id",windpowerstationId);
+        }
+
+        if (StringUtils.isNotEmpty(windsubStationId)){
+            qw.eq("windsub_station_id",windsubStationId);
         }
 
         Page<ProBasicProject> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));