Merge remote-tracking branch 'origin/master'

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

@@ -1,14 +1,16 @@
 package com.gyee.backconfig.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
 import com.gyee.backconfig.model.auto.ProBasicCompany;
 import com.gyee.backconfig.service.auto.IProBasicCompanyService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.gyee.common.model.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -24,10 +26,102 @@ public class ProBasicCompanyController {
     @Resource
     private IProBasicCompanyService proBasicCompanyService;
 
-    @GetMapping(value = "/companys")
-    public List<ProBasicCompany> list(){
-        List<ProBasicCompany> list = proBasicCompanyService.list();
-        return list;
+    /**
+     * 查询
+     *
+     * @param id
+     * @param name
+     * @param aname
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    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 = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicCompany> list = proBasicCompanyService.list(id, name, aname, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/companys/{id}")
+    public R findOne(@PathVariable("id") String id) {
+        QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
+        qw.eq("id", id);
+        ProBasicCompany companys = proBasicCompanyService.getOne(qw);
+        if (StringUtils.isNotNull(companys)) {
+            return R.ok().data(companys);
+        } else {
+            return R.error().data("查询失败！");
+        }
+
+    }
+
+    /**
+     * 插入（批量）
+     *
+     * @param company
+     * @return
+     */
+    @PostMapping(value = "/add-companys")
+    public R addAll(@RequestBody ProBasicCompany company) {
+
+        boolean b = proBasicCompanyService.saveOrUpdate(company);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+
     }
 
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-companys/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+
+        boolean b = proBasicCompanyService.removeByIds(Arrays.asList(strings));
+
+
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+    /**
+     * 批量修改
+     *
+     * @param list
+     * @return
+     */
+    @PutMapping(value = "/companys")
+    public R update(@RequestBody List<ProBasicCompany> list) {
+        boolean b = proBasicCompanyService.updateBatchById(list);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("更新失败！");
+        }
+    }
+
+
 }

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

@@ -1,9 +1,16 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicCompany;
+import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
+import com.gyee.backconfig.service.auto.IProBasicEnergyGroupService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +23,61 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-energy-group")
 public class ProBasicEnergyGroupController {
+    @Resource
+    private IProBasicEnergyGroupService proBasicEnergyGroupService;
 
+    /**
+     * 查询
+     * @param id
+     * @param name
+     * @param aname
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/List")
+    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 = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicEnergyGroup> list = proBasicEnergyGroupService.list(id, name, aname, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proBasicEnergyGroup
+     * @return
+     */
+    @PostMapping(value = "/add-EnergyGroup")
+    public R addAll(@RequestBody ProBasicEnergyGroup proBasicEnergyGroup) {
+
+        boolean b = proBasicEnergyGroupService.saveOrUpdate(proBasicEnergyGroup);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-EnergyGroup/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicEnergyGroupService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 }

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

@@ -1,9 +1,14 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicLine;
+import com.gyee.backconfig.service.auto.IProBasicLineService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +21,66 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-line")
 public class ProBasicLineController {
+    @Resource
+    private IProBasicLineService proBasicLineService;
+
+    /**
+     * 查询
+     * @param id
+     * @param code
+     * @param name
+     * @param aname
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    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 = "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);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 新增
+     * @param proBasicLine
+     * @return
+     */
+    @PostMapping("/add-Line")
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R addModifyProjectPlan(@RequestBody ProBasicLine proBasicLine){
+        boolean saveOrUpdate = proBasicLineService.saveOrUpdate(proBasicLine);
+        if (saveOrUpdate) {
+            return R.ok().data("保存或更新成功");
+        }else{
+            return R.error().message("保存失败");
+        }
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-lines/{ids}")
+    public  R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+
+        boolean  b = proBasicLineService.removeByIds(Arrays.asList(strings));
+
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 
 }

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

@@ -1,9 +1,14 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicProject;
+import com.gyee.backconfig.service.auto.IProBasicProjectService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +21,68 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-project")
 public class ProBasicProjectController {
+    @Resource
+    private IProBasicProjectService proBasicProjectService;
+
+    /**
+     * 查询
+     * @param id
+     * @param name
+     * @param code
+     * @param windpowerstationId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/List")
+    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 = "windpowerstationId",required = false) String windpowerstationId,
+                      @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);
+        if (null != list){
+            return R.ok().data(list);
+        }else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+    /**
+     * 批量保存（修改）
+     * @param proBasicProject
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody ProBasicProject proBasicProject){
+
+        boolean b = proBasicProjectService.saveOrUpdate(proBasicProject);
+        if (b){
+            return R.ok().data(b);
+        }else {
+            return R.error().data("保存失败！");
+        }
+
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-Project/{ids}")
+    public  R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+
+        boolean  b = proBasicProjectService.removeByIds(Arrays.asList(strings));
+
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 
 }

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

@@ -1,9 +1,15 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicProject;
+import com.gyee.backconfig.model.auto.ProBasicProjectPlan;
+import com.gyee.backconfig.service.auto.IProBasicProjectPlanService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +22,64 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-project-plan")
 public class ProBasicProjectPlanController {
+    @Resource
+    private IProBasicProjectPlanService proBasicProjectPlanService;
+
+    /**
+     * 查询
+     * @param id
+     * @param projectId
+     * @param windpowerstationId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/List")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "projectId", required = false) String projectId,
+                      @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicProjectPlan> list = proBasicProjectPlanService.List(id, projectId, windpowerstationId, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 新增
+     * @param proBasicProjectPlan
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public R addAll(@RequestBody ProBasicProjectPlan proBasicProjectPlan){
+
+        boolean b = proBasicProjectPlanService.saveOrUpdate(proBasicProjectPlan);
+        if (b){
+            return R.ok().data(b);
+        }else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/remove-ProjectPlan/{ids}")
+    public  R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+
+        boolean  b = proBasicProjectPlanService.removeByIds(Arrays.asList(strings));
+
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 
 }

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

@@ -1,9 +1,14 @@
 package com.gyee.backconfig.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
+import com.gyee.backconfig.service.auto.IProBasicRegionService;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -16,5 +21,62 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("//pro-basic-region")
 public class ProBasicRegionController {
+    @Resource
+    private IProBasicRegionService proBasicRegionService;
+
+    /**
+     * 查询
+     *
+     * @param id
+     * @param groupId
+     * @param name
+     * @param aname
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/List")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "groupId", required = false) String groupId,
+                      @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<ProBasicRegion> list = proBasicRegionService.list(id, name, groupId, aname, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 保存
+     *
+     * @param proBasicRegion
+     * @return
+     */
+    @PostMapping(value = "/save")
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R addAll(@RequestBody ProBasicRegion proBasicRegion) {
+
+        boolean b = proBasicRegionService.saveOrUpdate(proBasicRegion);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+    @DeleteMapping(value = "/{ids}")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicRegionService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
 
 }

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

@@ -133,5 +133,5 @@ public class ProBasicEnergyGroup extends Model {
      */
     private Integer jrNumber;
 
-    private Integer isAble;
+//    private Integer isAble;
 }

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

@@ -1,8 +1,11 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicCompany;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 省公司表 服务类
@@ -12,5 +15,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicCompanyService extends IService<ProBasicCompany> {
+    IPage<ProBasicCompany> list(String id, String name, String aname, String pageNum, String pageSize);
+
+    List<ProBasicCompany> getCompanysByidAndRid(String id);
 
 }

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

@@ -1,7 +1,9 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
 
 /**
  * <p>
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicEnergyGroupService extends IService<ProBasicEnergyGroup> {
-
+    IPage<ProBasicEnergyGroup> list(String id, String name, String aname, String pageNum, String pageSize);
 }

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

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicLine;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @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);
 }

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

@@ -1,5 +1,7 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicProject;
 import com.gyee.backconfig.model.auto.ProBasicProjectPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicProjectPlanService extends IService<ProBasicProjectPlan> {
-
+    IPage<ProBasicProjectPlan> List(String id,String projectId, String windpowerstationId, String pageNum, String pageSize);
 }

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

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicProject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @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);
 }

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

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-15
  */
 public interface IProBasicRegionService extends IService<ProBasicRegion> {
-
+    IPage<ProBasicRegion> list(String id, String name, String groupId, String aname, String pageNum, String pageSize);
 }

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

@@ -1,11 +1,17 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicCompany;
 import com.gyee.backconfig.mapper.auto.ProBasicCompanyMapper;
 import com.gyee.backconfig.service.auto.IProBasicCompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 省公司表 服务实现类
@@ -17,4 +23,26 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMapper, ProBasicCompany> implements IProBasicCompanyService {
 
+    @Override
+    public IPage<ProBasicCompany> list(String id, String name, String aname, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        if (StringUtils.isNotEmpty(aname)) {
+            qw.like("aname", aname);
+        }
+        Page<ProBasicCompany> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicCompany> companysPage = getBaseMapper().selectPage(page, qw);
+        List<ProBasicCompany> list = companysPage.getRecords();
+        return companysPage;
+    }
+
+    @Override
+    public List<ProBasicCompany> getCompanysByidAndRid(String id) {
+        return null;
+    }
 }

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

@@ -1,9 +1,14 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicEnergyGroup;
 import com.gyee.backconfig.mapper.auto.ProBasicEnergyGroupMapper;
+import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.service.auto.IProBasicEnergyGroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicEnergyGroupServiceImpl extends ServiceImpl<ProBasicEnergyGroupMapper, ProBasicEnergyGroup> implements IProBasicEnergyGroupService {
 
+    @Override
+    public IPage<ProBasicEnergyGroup> list(String id, String name, String aname, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicEnergyGroup> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.eq("name",name);
+        }
+        if (StringUtils.isNotEmpty(aname)){
+            qw.like("aname",aname);
+        }
+
+
+        Page<ProBasicEnergyGroup> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicEnergyGroup> pageData = baseMapper.selectPage(page, qw);
+        return pageData;
+
+    }
 }

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

@@ -1,11 +1,17 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicLine;
 import com.gyee.backconfig.mapper.auto.ProBasicLineMapper;
 import com.gyee.backconfig.service.auto.IProBasicLineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 集电线路 服务实现类
@@ -17,4 +23,25 @@ import org.springframework.stereotype.Service;
 @Service
 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) {
+        QueryWrapper<ProBasicLine> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.like("id", id);
+        }
+        if (StringUtils.isNotEmpty(code)) {
+            qw.like("code", code);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.like("name", name);
+        }
+        if (StringUtils.isNotEmpty(aname)) {
+            qw.like("aname", aname);
+        }
+        Page<ProBasicLine> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicLine> ProBasicLine = getBaseMapper().selectPage(page, qw);
+        List<ProBasicLine> list = ProBasicLine.getRecords();
+        return ProBasicLine;
+    }
+
 }

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

@@ -1,9 +1,14 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.backconfig.model.auto.ProBasicProject;
 import com.gyee.backconfig.model.auto.ProBasicProjectPlan;
 import com.gyee.backconfig.mapper.auto.ProBasicProjectPlanMapper;
 import com.gyee.backconfig.service.auto.IProBasicProjectPlanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicProjectPlanServiceImpl extends ServiceImpl<ProBasicProjectPlanMapper, ProBasicProjectPlan> implements IProBasicProjectPlanService {
 
+    @Override
+    public IPage<ProBasicProjectPlan> List(String id, String projectId, String windpowerstationId, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicProjectPlan> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(projectId)){
+            qw.like("projectId",projectId);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.like("windpowerstationId",windpowerstationId);
+        }
+
+        Page<ProBasicProjectPlan> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicProjectPlan> ProjectPlanPage = getBaseMapper().selectPage(page, qw);
+        return ProjectPlanPage;
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicProject;
 import com.gyee.backconfig.mapper.auto.ProBasicProjectMapper;
 import com.gyee.backconfig.service.auto.IProBasicProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,28 @@ import org.springframework.stereotype.Service;
 @Service
 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) {
+        QueryWrapper<ProBasicProject> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(code)){
+            qw.like("code",code);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.like("name",name);
+        }
+
+        if (StringUtils.isNotEmpty(windpowerstationId)){
+            qw.like("windpowerstationId",windpowerstationId);
+        }
+
+        Page<ProBasicProject> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicProject> ProjectPage = getBaseMapper().selectPage(page, qw);
+        return ProjectPage;
+    }
 }

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

@@ -1,9 +1,13 @@
 package com.gyee.backconfig.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.backconfig.model.auto.ProBasicRegion;
 import com.gyee.backconfig.mapper.auto.ProBasicRegionMapper;
 import com.gyee.backconfig.service.auto.IProBasicRegionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,28 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper, ProBasicRegion> implements IProBasicRegionService {
 
+    @Override
+    public IPage<ProBasicRegion> list(String id, String name, String groupId, String aname, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicRegion> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(id)){
+            qw.eq("id",id);
+        }
+
+        if (StringUtils.isNotEmpty(name)){
+            qw.eq("name",name);
+        }
+
+        if (StringUtils.isNotEmpty(groupId)){
+            qw.like("groupId",groupId);
+        }
+        if (StringUtils.isNotEmpty(aname)){
+            qw.like("aname",aname);
+        }
+
+
+        Page<ProBasicRegion> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        IPage<ProBasicRegion> pageData = baseMapper.selectPage(page, qw);
+        return pageData;
+    }
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/conf/AccessConfig.java

@@ -0,0 +1,26 @@
+package com.gyee.frame.common.conf;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 预警配置
+ */
+@Component
+@ConfigurationProperties(prefix = "accesslist")
+public class AccessConfig {
+
+    private static Map<String,String> wpmap;
+
+
+    public static Map<String, String> getWpmap() {
+        return wpmap;
+    }
+
+    public  void setWpmap(Map<String, String> wpmap) {
+        AccessConfig.wpmap = wpmap;
+    }
+}
+

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -1,6 +1,7 @@
 package com.gyee.frame.service.websocket;
 
 
+import com.gyee.frame.common.conf.AccessConfig;
 import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
@@ -128,7 +129,6 @@ public class GenreSetPushService {
                 }
 
 
-
                 Map<String, Double> sftjmap = new HashMap<>();//省份装机容量和台数统计
                 for (Windpowerstation wp : wplist) {
 
@@ -1778,9 +1778,58 @@ public class GenreSetPushService {
                 }
 
 
+                double fd_zjrl=0;
+                double gf_zjrl=0;
+                double qjny_fj_ts=0;
+                double qjny_gf_zcts=0;
+                double qjny_gf_jzts=0;
+
+                double jr_fj_ts=0;
+                double jr_gf_zcts=0;
+                double jr_gf_jzts=0;
+
+                double fd_r_ycdl=0;
+                double fd_y_ycdl=0;
+                double gf_r_ycdl=0;
+                double gf_y_ycdl=0;
+
+
+
+                Calendar c = Calendar.getInstance();
+
+               c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+                int daynum = c.get(Calendar.DAY_OF_MONTH);
 
                 Map<String, Double> sftjmap = new HashMap<>();//省份装机容量和台数统计
                 for (Windpowerstation wp : wplist) {
+                    String rfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL).getCode();
+
+                    String yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL).getCode();
+
+
+                    PointData rfdldata = realApiUtil.getRealData(rfdlpoint);
+                    PointData yfdldata = realApiUtil.getRealData(yfdlpoint);
+
+                    double rfdl=MathUtil.twoBit(rfdldata.getPointValueInDouble()/1000);
+                    double yfdl=MathUtil.twoBit(yfdldata.getPointValueInDouble()/1000);
+
+                    if(wp.getId().endsWith("FDC"))
+                    {
+                        fd_r_ycdl =fd_r_ycdl+(rfdl * YCFDLXS) ;
+
+                        c = Calendar.getInstance();
+                        double yycfdl = (yfdl + fd_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
+                        fd_y_ycdl=fd_y_ycdl+yycfdl;
+                    }else
+                    {
+                        gf_r_ycdl =gf_r_ycdl+(rfdl * YCFDLXS) ;
+
+                        c = Calendar.getInstance();
+                        double yycfdl = (yfdl + gf_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
+                        gf_y_ycdl=gf_y_ycdl+yycfdl;
+                    }
+
+
 
                     if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_zjrl")) {
 
@@ -1794,6 +1843,8 @@ public class GenreSetPushService {
 
                     if(wp.getId().endsWith("GDC") && InitialRunner.gp_sqmap.containsKey(wp.getId()))
                     {
+
+                        gf_zjrl=gf_zjrl+wp.getCapacity();
                         List<Square> sqls=InitialRunner.gp_sqmap.get(wp.getId());
                         for(Square sq:sqls)
                         {
@@ -1806,13 +1857,21 @@ public class GenreSetPushService {
                                     {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
+
+                                        qjny_gf_zcts=qjny_gf_zcts + nbqls.size();
+                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+                                        {
+                                            jr_gf_zcts=jr_gf_zcts + nbqls.size();
+                                        }
                                     }
 
                                     sftjmap.put(wp.getPhoto() + "_zc_zjts", temp);
                                 } else {
-                                    double temp = wp.getCapacity();
+                                    double temp = wp.getQuantity();
                                     sftjmap.put(wp.getPhoto() + "_zc_zjts", temp);
                                 }
+
+
                             }else
                             {
                                 if (StringUtils.notEmp(wp.getPhoto()) && sftjmap.containsKey(wp.getPhoto() + "_jz_zjts")) {
@@ -1822,10 +1881,16 @@ public class GenreSetPushService {
                                     {
                                         List<Inverter> nbqls=InitialRunner.sq_nbqmap.get(sq.getId());
                                         temp = temp + nbqls.size();
+
+                                        qjny_gf_jzts=qjny_gf_jzts + nbqls.size();
+                                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+                                        {
+                                            jr_gf_jzts=jr_gf_jzts + nbqls.size();
+                                        }
                                     }
                                     sftjmap.put(wp.getPhoto() + "_jz_zjts", temp);
                                 } else {
-                                    double temp = wp.getCapacity();
+                                    double temp = wp.getQuantity();
                                     sftjmap.put(wp.getPhoto() + "_jz_zjts", temp);
                                 }
                             }
@@ -1838,14 +1903,41 @@ public class GenreSetPushService {
 
                             double temp = sftjmap.get(wp.getPhoto() + "_zjts");
                             temp = temp + wp.getQuantity();
+
+
                             sftjmap.put(wp.getPhoto() + "_zjts", temp);
                         } else {
                             double temp = wp.getQuantity();
                             sftjmap.put(wp.getPhoto() + "_zjts", temp);
                         }
+
+                        fd_zjrl=fd_zjrl+wp.getCapacity();
+                        qjny_fj_ts=qjny_fj_ts + wp.getQuantity();
+                        if(AccessConfig.getWpmap().containsKey(wp.getId()))
+                        {
+                            jr_fj_ts=jr_fj_ts + wp.getQuantity();
+                        }
                     }
 
                 }
+
+
+
+                Map<String,Double> newpointmap=new HashMap<>();
+
+                newpointmap.put("fd_zjrl",StringUtils.round(fd_zjrl,2));
+                newpointmap.put("gf_zjrl",StringUtils.round(gf_zjrl,2));
+                newpointmap.put("qjny_fj_ts",StringUtils.round(qjny_fj_ts,2));
+                newpointmap.put("qjny_gf_zcts",StringUtils.round(qjny_gf_zcts,2));
+                newpointmap.put("qjny_gf_jzts",StringUtils.round(qjny_gf_jzts,2));
+                newpointmap.put("jr_fj_ts",StringUtils.round(jr_fj_ts,2));
+                newpointmap.put("jr_gf_zcts",StringUtils.round(jr_gf_zcts,2));
+                newpointmap.put("jr_gf_jzts",StringUtils.round(jr_gf_jzts,2));
+                newpointmap.put("fd_r_ycdl",StringUtils.round(fd_r_ycdl,2));
+                newpointmap.put("fd_y_ycdl",StringUtils.round(fd_y_ycdl,2));
+                newpointmap.put("gf_r_ycdl",StringUtils.round(gf_r_ycdl,2));
+                newpointmap.put("gf_y_ycdl",StringUtils.round(gf_y_ycdl,2));
+                map.put("newpointmap",newpointmap);
 //                for (Windpowerstation wp : wplist) {
 //
 //                    if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_zjrl")) {

web/monitor-web-sxjn/src/main/resources/application-jn.yml

@@ -219,6 +219,27 @@ ztconfig:
       - A
     SY_GDC_DNLB:
       - A
+accesslist:
+  wpmap:
+    GJY_FDC: GJY_FDC
+    BHB3_FDC: BHB3_FDC
+    BHB_FDC: BHB_FDC
+    DJY_FDC: DJY_FDC
+    HSM_FDC: HSM_FDC
+    NJL_FDC: NJL_FDC
+    PDL_FDC: PDL_FDC
+    PTZ_FDC: PTZ_FDC
+    SY_GDC: SY_GDC
+    XWT_FDC: XWT_FDC
+    YF_FDC: YF_FDC
+    YLZ_FDC: YLZ_FDC
+    YTY_FDC: YTY_FDC
+    ZK_FDC: ZK_FDC
+
+
+
+
+
 #mysql 8.0
 
 #spring: