Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,91 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicModelPower;
+import com.gyee.backconfig.service.auto.IProBasicModelPowerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@RestController
+@Api(value = "设备类型对应功率表配置" ,tags =  "设备类型对应功率表配置")
+@RequestMapping("//pro-basic-model-power")
+public class ProBasicModelPowerController {
+
+    @Autowired
+    private IProBasicModelPowerService proBasicModelPowerService;
+
+    /**
+     *
+     * @param id
+     * @param modelId
+     * @param windpowerstationId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "设备类型对应功率表-列表", notes = "设备类型对应功率表-列表")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "modelId", required = false) String modelId,
+                      @RequestParam(value = "windpowerstationId",required  = false) String windpowerstationId,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicModelPower> list = proBasicModelPowerService.list( id,  modelId,  windpowerstationId, pageNum,  pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proBasicModelPower
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "设备类型对应功率表-新增or修改", notes = "设备类型对应功率表-新增or修改")
+    public R addAll(@RequestBody ProBasicModelPower proBasicModelPower) {
+
+        boolean b = proBasicModelPowerService.saveOrUpdate(proBasicModelPower);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "设备类型对应功率表-删除", notes = "设备类型对应功率表-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicModelPowerService.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

@@ -42,9 +42,11 @@ public class ProBasicProjectPlanController {
     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 = "year", required = false) String year,
+                      @RequestParam(value = "month", required = false) String month,
                       @RequestParam(value = "pageNum", required = true) String pageNum,
                       @RequestParam(value = "pageSize", required = true) String pageSize) {
-        IPage<ProBasicProjectPlan> list = proBasicProjectPlanService.List(id, projectId, windpowerstationId, pageNum, pageSize);
+        IPage<ProBasicProjectPlan> list = proBasicProjectPlanService.List(id, projectId, windpowerstationId, year, month, pageNum, pageSize);
         if (null != list) {
             return R.ok().data(list);
         } else {

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

@@ -0,0 +1,95 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProBasicTargetPlan;
+import com.gyee.backconfig.service.auto.IProBasicTargetPlanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 指标计划表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@RestController
+@RequestMapping("//pro-basic-target-plan")
+@Api(value = "指标计划表" ,tags =  "指标计划表")
+public class ProBasicTargetPlanController {
+
+
+    @Autowired
+    private IProBasicTargetPlanService proBasicTargetPlanService;
+
+
+    /**
+     *
+     * @param id
+     * @param companyCode
+     * @param targetCode
+     * @param targetDate
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "指标计划表-列表", notes = "指标计划表-列表")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "companyCode", required = false) String companyCode,
+                      @RequestParam(value = "targetCode",required  = false) String targetCode,
+                      @RequestParam(value = "targetDate",required  = false) String targetDate,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProBasicTargetPlan> list = proBasicTargetPlanService.list( id,  companyCode,  targetCode,targetDate, pageNum,  pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proBasicTargetPlan
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "指标计划表-新增or修改", notes = "指标计划表-新增or修改")
+    public R addAll(@RequestBody ProBasicTargetPlan proBasicTargetPlan) {
+
+        boolean b = proBasicTargetPlanService.saveOrUpdate(proBasicTargetPlan);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "指标计划表-删除", notes = "指标计划表-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proBasicTargetPlanService.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/ProEconElectricaltestPointController.java

@@ -0,0 +1,98 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProEconElectricaltestPoint;
+import com.gyee.backconfig.service.auto.IProEconElectricaltestPointService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 电气测点 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@RestController
+@Api(value = "电气测点配置" ,tags =  "电气测点配置")
+@RequestMapping("//pro-econ-electricaltest-point")
+public class ProEconElectricaltestPointController {
+
+    @Autowired
+    private IProEconElectricaltestPointService proEconElectricaltestPointService;
+
+    /**
+     *
+     * @param id
+     * @param code
+     * @param name
+     * @param model
+     * @param electricalId
+     * @param uniformCode
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "电气测点-列表", notes = "电气测点-列表")
+    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 = "model", required = false) String model,
+                      @RequestParam(value = "electricalId",required  = false) String electricalId,
+                      @RequestParam(value = "uniformCode",required  = false) String uniformCode,
+                      @RequestParam(value = "windpowerstationId",required  = false) String windpowerstationId,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconElectricaltestPoint> list = proEconElectricaltestPointService.list( id, code, name,model,electricalId,uniformCode, windpowerstationId, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proEconElectricaltestPoint
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "电气测点-新增or修改", notes = "电气测点-新增or修改")
+    public R addAll(@RequestBody ProEconElectricaltestPoint proEconElectricaltestPoint) {
+
+        boolean b = proEconElectricaltestPointService.saveOrUpdate(proEconElectricaltestPoint);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "电气测点-删除", notes = "电气测点-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proEconElectricaltestPointService.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/ProEconStatusDictionariesController.java

@@ -0,0 +1,92 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProEconStatusDictionaries;
+import com.gyee.backconfig.service.auto.IProEconStatusDictionariesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 类型：1：7种简单状态；2：14种明细状态； 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@RestController
+@RequestMapping("//pro-econ-status-dictionaries")
+@Api(value = "设备状态配置" ,tags =  "设备状态配置")
+public class ProEconStatusDictionariesController {
+
+    @Autowired
+    private IProEconStatusDictionariesService proEconStatusDictionariesService;
+
+    /**
+     *
+     * @param id
+     * @param code
+     * @param name
+     * @param type
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "设备状态配置-列表", notes = "设备状态配置-列表")
+    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 = "type", required = false) String type,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconStatusDictionaries> list = proEconStatusDictionariesService.list( id, code, name,type, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proEconStatusDictionaries
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "设备状态配置-新增or修改", notes = "设备状态配置-新增or修改")
+    public R addAll(@RequestBody ProEconStatusDictionaries proEconStatusDictionaries) {
+
+        boolean b = proEconStatusDictionariesService.saveOrUpdate(proEconStatusDictionaries);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "设备状态配置-删除", notes = "设备状态配置-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proEconStatusDictionariesService.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/ProEconStopTypeController.java

@@ -0,0 +1,79 @@
+package com.gyee.backconfig.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProEconStopType;
+import com.gyee.backconfig.service.auto.IProEconStopTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 停机类型 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@RestController
+@Api(value = "停机类型配置" ,tags =  "停机类型配置")
+@RequestMapping("//pro-econ-stop-type")
+public class ProEconStopTypeController {
+
+    private IProEconStopTypeService proEconStopTypeService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "设备状态配置-列表", notes = "设备状态配置-列表")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "isPlan", required = false) String isPlan,
+                      @RequestParam(value = "name",required  = false) String name,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconStopType> list = proEconStopTypeService.list( id, isPlan, name, pageNum, pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proEconStopType
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "设备状态配置-新增or修改", notes = "设备状态配置-新增or修改")
+    public R addAll(@RequestBody ProEconStopType proEconStopType) {
+
+        boolean b = proEconStopTypeService.saveOrUpdate(proEconStopType);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "设备状态配置-删除", notes = "设备状态配置-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proEconStopTypeService.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/ProEconTestingPointController.java

@@ -1,17 +1,18 @@
 package com.gyee.backconfig.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gyee.backconfig.config.R;
+import com.gyee.backconfig.model.auto.ProEconTestingPoint;
 import com.gyee.backconfig.service.auto.IProEconTestingPointService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
 
 /**
  * <p>
@@ -26,9 +27,78 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//pro-econ-testing-point")
 public class ProEconTestingPointController {
 
+
+
     @Autowired
     private IProEconTestingPointService proEconTestingPointService;
 
+
+    /**
+     * 逻辑测点list
+     * @param id
+     * @param nemCode
+     * @param name
+     * @param model
+     * @param uniformCode
+     * @param isDisplay
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @ApiOperation(value = "逻辑测点配置-列表", notes = "逻辑测点配置-列表")
+    public R findList(@RequestParam(value = "id", required = false) String id,
+                      @RequestParam(value = "nemCode", required = false) String nemCode,
+                      @RequestParam(value = "name", required = false) String name,
+                      @RequestParam(value = "model", required = false) String model,
+                      @RequestParam(value = "uniformCode", required = false) String uniformCode,
+                      @RequestParam(value = "isDisplay", required = false) String isDisplay,
+                      @RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconTestingPoint> list = proEconTestingPointService.list( id,  nemCode,  name,  model,  uniformCode,  isDisplay,  pageNum,  pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+    /**
+     * 添加
+     * @param proEconTestingPoint
+     * @return
+     */
+    @PostMapping(value = "/add")
+    @ApiOperation(value = "逻辑测点配置-新增or修改", notes = "逻辑测点配置-新增or修改")
+    public R addAll(@RequestBody ProEconTestingPoint proEconTestingPoint) {
+
+        boolean b = proEconTestingPointService.saveOrUpdate(proEconTestingPoint);
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("保存失败！");
+        }
+    }
+
+
+    /**
+     * 删除
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/{ids}")
+    @ApiOperation(value = "逻辑测点配置-删除", notes = "逻辑测点配置-删除")
+    public R deleteAll(@PathVariable("ids") String ids) {
+        String[] strings = ids.split(",");
+        boolean b = proEconTestingPointService.removeByIds(Arrays.asList(strings));
+        if (b) {
+            return R.ok().data(b);
+        } else {
+            return R.error().data("删除失败！");
+        }
+    }
+
+
     @PostMapping(value = "/generatePoint")
     @ApiOperation(value = "设备or场站测点生成", notes = "设备or场站测点生成")
     @ApiImplicitParams({ @ApiImplicitParam(name = "points", value = "统一编码", required = true, dataType = "string[]", paramType = "query"),

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicModelPowerMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicModelPower;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface ProBasicModelPowerMapper extends BaseMapper<ProBasicModelPower> {
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProBasicTargetPlanMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProBasicTargetPlan;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 指标计划表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface ProBasicTargetPlanMapper extends BaseMapper<ProBasicTargetPlan> {
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProEconElectricaltestPointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProEconElectricaltestPoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电气测点 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface ProEconElectricaltestPointMapper extends BaseMapper<ProEconElectricaltestPoint> {
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProEconStatusDictionariesMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProEconStatusDictionaries;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 类型：1：7种简单状态；2：14种明细状态； Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface ProEconStatusDictionariesMapper extends BaseMapper<ProEconStatusDictionaries> {
+
+}

web/backmanagerconfig-xktj/src/main/java/com/gyee/backconfig/mapper/auto/ProEconStopTypeMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.backconfig.mapper.auto;
+
+import com.gyee.backconfig.model.auto.ProEconStopType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 停机类型 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface ProEconStopTypeMapper extends BaseMapper<ProEconStopType> {
+
+}

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

@@ -0,0 +1,53 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicModelPower extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 型号编号
+     */
+    private String modelId;
+
+    /**
+     * 风速/光照度
+     */
+    private BigDecimal speed;
+
+    /**
+     * 稳态功率（相当于理论）
+     */
+    private BigDecimal theoryPower;
+
+    /**
+     * 动态功率（保证功率）
+     */
+    private BigDecimal ensurePower;
+
+    /**
+     * 场站编号
+     */
+    private String windpowerstationId;
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 指标计划表
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicTargetPlan extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 组织机构编码
+     */
+    private String companyCode;
+
+    /**
+     * 指标编码
+     */
+    private String targetCode;
+
+    /**
+     * 时间
+     */
+    private String targetDate;
+
+    /**
+     * 值
+     */
+    private Double targetValue;
+
+    /**
+     * 周期
+     */
+    private String targetCycle;
+
+
+}

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

@@ -0,0 +1,128 @@
+package com.gyee.backconfig.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 电气测点
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconElectricaltestPoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 实时库名称
+     */
+    private String aname;
+
+    /**
+     * 型号
+     */
+    private String model;
+
+    /**
+     * 单位
+     */
+    private String valueUnit;
+
+    /**
+     * 英文名称
+     */
+    private String englishName;
+
+    /**
+     * 类型编号
+     */
+    private String typeId;
+
+    /**
+     * 所属型号
+     */
+    private String modelId;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maxval;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minval;
+
+    /**
+     * 合理最大值
+     */
+    private BigDecimal reasonableMaxval;
+
+    /**
+     * 合理最小值
+     */
+    private BigDecimal reasonableMinval;
+
+    /**
+     * 变电所编号
+     */
+    private String electricalId;
+
+    /**
+     * 统一编码
+     */
+    private String uniformCode;
+
+    /**
+     * 短ID
+     */
+    private String shortId;
+
+    /**
+     * 长ID
+     */
+    private String longId;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 实时配置编号
+     */
+    private String realTimeId;
+
+    /**
+     * 集团测点编号
+     */
+    private String groupPointId;
+
+    /**
+     * 具体名称
+     */
+    private String specificName;
+
+
+}

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

@@ -0,0 +1,42 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 类型：1：7种简单状态；2：14种明细状态；
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStatusDictionaries extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private Integer code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+
+}

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

@@ -0,0 +1,47 @@
+package com.gyee.backconfig.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 停机类型
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStopType extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 是否计划
+     */
+    private Integer isPlan;
+
+    /**
+     * 父ID
+     */
+    private String parentId;
+
+    /**
+     * 内外原因
+     */
+    private String nwys;
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicModelPower;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface IProBasicModelPowerService extends IService<ProBasicModelPower> {
+
+    IPage<ProBasicModelPower> list(String id, String modelId, String windpowerstationId ,String pageNum,String  pageSize);
+
+}

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

@@ -14,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);
+    IPage<ProBasicProjectPlan> List(String id,String projectId, String windpowerstationId, String  year, String month,String pageNum, String pageSize);
 }

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProBasicTargetPlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 指标计划表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface IProBasicTargetPlanService extends IService<ProBasicTargetPlan> {
+
+    IPage<ProBasicTargetPlan> list(String id, String companyCode, String targetCode , String targetDate,String pageNum, String  pageSize);
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProEconElectricaltestPoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 电气测点 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface IProEconElectricaltestPointService extends IService<ProEconElectricaltestPoint> {
+
+    IPage<ProEconElectricaltestPoint> list(String id, String code, String name,String model,String electricalId,String uniformCode, String windpowerstationId, String pageNum, String pageSize);
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProEconStatusDictionaries;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 类型：1：7种简单状态；2：14种明细状态； 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface IProEconStatusDictionariesService extends IService<ProEconStatusDictionaries> {
+
+
+    IPage<ProEconStatusDictionaries> list(String  id,String  code, String name,String type, String pageNum,String  pageSize);
+
+}

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

@@ -0,0 +1,19 @@
+package com.gyee.backconfig.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.backconfig.model.auto.ProEconStopType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 停机类型 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+public interface IProEconStopTypeService extends IService<ProEconStopType> {
+
+    IPage<ProEconStopType> list( String id, String isPlan,String  name,String  pageNum,String  pageSize);
+
+}

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

@@ -1,5 +1,6 @@
 package com.gyee.backconfig.service.auto;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gyee.backconfig.model.auto.ProEconTestingPoint;
 
@@ -17,5 +18,7 @@ public interface IProEconTestingPointService extends IService<ProEconTestingPoin
 
      void generateSubStationPoint(String station,String[] points);
 
+     IPage<ProEconTestingPoint> list (String id,String nemCode, String name,String model,String uniformCode, String isDisplay,String pageNum, String pageSize);
+
 
 }

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

@@ -27,22 +27,25 @@ public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, Pro
     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.eq("id", id);
+            qw.lambda().eq(ProBasicLine::getId, id);
         }
 
         if (StringUtils.isNotEmpty(projectId)) {
-            qw.eq("project_id", projectId);
+            qw.lambda().eq(ProBasicLine::getProjectId, projectId);
         }
 
         if (StringUtils.isNotEmpty(code)) {
-            qw.like("nem_code", code);
+            qw.lambda().like(ProBasicLine::getNemCode, code);
         }
+
         if (StringUtils.isNotEmpty(name)) {
-            qw.like("name", name);
+            qw.lambda().like(ProBasicLine::getName, name);
         }
+
         if (StringUtils.isNotEmpty(aname)) {
-            qw.like("aname", aname);
+            qw.lambda().like(ProBasicLine::getAname, aname);
         }
+
         Page<ProBasicLine> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<ProBasicLine> ProBasicLine = getBaseMapper().selectPage(page, qw);
         List<ProBasicLine> list = ProBasicLine.getRecords();
@@ -53,10 +56,10 @@ public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, Pro
     public List<ProBasicLine> getList(String projectId) {
         QueryWrapper<ProBasicLine> qw = new QueryWrapper<>();
 
-
         if (StringUtils.isNotEmpty(projectId)){
-            qw.eq("project_id",projectId);
+            qw.lambda().eq(ProBasicLine::getProjectId,projectId);
         }
+
         List<ProBasicLine> list = baseMapper.selectList(qw);
         return list;
     }

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

@@ -25,7 +25,7 @@ public class ProBasicMeterPointServiceImpl extends ServiceImpl<ProBasicMeterPoin
     public IPage<ProBasicMeterPoint> list(String id, String code, String windpowerstationId, String name, String pageNum, String pageSize) {
         QueryWrapper<ProBasicMeterPoint> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(code)) {
             qw.like("code", code);

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

@@ -0,0 +1,42 @@
+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.ProBasicModelPower;
+import com.gyee.backconfig.mapper.auto.ProBasicModelPowerMapper;
+import com.gyee.backconfig.service.auto.IProBasicModelPowerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Service
+public class ProBasicModelPowerServiceImpl extends ServiceImpl<ProBasicModelPowerMapper, ProBasicModelPower> implements IProBasicModelPowerService {
+
+    @Override
+    public IPage<ProBasicModelPower> list(String id, String modelId, String windpowerstationId, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicModelPower> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProBasicModelPower::getId, id);
+        }
+
+        if (StringUtils.isNotEmpty(modelId)) {
+            qw.lambda().like(ProBasicModelPower::getModelId, modelId);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProBasicModelPower::getWindpowerstationId, windpowerstationId);
+        }
+
+        Page<ProBasicModelPower> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicModelPower> modelPowers = getBaseMapper().selectPage(page, qw);
+        return modelPowers;
+    }
+}

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

@@ -28,7 +28,7 @@ public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPo
     public IPage<ProBasicPowerstationPoint> list(String id, String code, String name, String model, String uniformCode, String pageNum, String pageSize) {
         QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(code)) {
             qw.like(code, "code");

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

@@ -22,7 +22,7 @@ import org.springframework.stereotype.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) {
+    public IPage<ProBasicProjectPlan> List(String id, String projectId, String windpowerstationId, String  year, String month, String pageNum, String pageSize) {
         QueryWrapper<ProBasicProjectPlan> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotEmpty(id)){
@@ -37,6 +37,13 @@ public class ProBasicProjectPlanServiceImpl extends ServiceImpl<ProBasicProjectP
             qw.eq("windpowerstation_id",windpowerstationId);
         }
 
+        if (StringUtils.isNotEmpty(year)){
+            qw.eq("year",year);
+        }
+
+        if (StringUtils.isNotEmpty(month)){
+            qw.eq("month",month);
+        }
         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/ProBasicRealtimeDbconfigServiceImpl.java

@@ -25,16 +25,16 @@ public class ProBasicRealtimeDbconfigServiceImpl extends ServiceImpl<ProBasicRea
     public IPage<ProBasicRealtimeDbconfig> list(String id, String surName, String windpowerstationId, String pageNum, String pageSize) {
         QueryWrapper<ProBasicRealtimeDbconfig> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(surName)) {
             qw.like("sur_name", surName);
         }
         if (StringUtils.isNotEmpty(windpowerstationId)) {
-            qw.like("windpowerstation_id", windpowerstationId);
+            qw.eq("windpowerstation_id", windpowerstationId);
         }
         Page<ProBasicRealtimeDbconfig> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        IPage<ProBasicRealtimeDbconfig> ModelpowerPage =getBaseMapper().selectPage(page, qw);
-        return ModelpowerPage;
+        IPage<ProBasicRealtimeDbconfig> realtimeDbconfigs =getBaseMapper().selectPage(page, qw);
+        return realtimeDbconfigs;
     }
 }

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

@@ -0,0 +1,46 @@
+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.ProBasicTargetPlan;
+import com.gyee.backconfig.mapper.auto.ProBasicTargetPlanMapper;
+import com.gyee.backconfig.service.auto.IProBasicTargetPlanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 指标计划表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Service
+public class ProBasicTargetPlanServiceImpl extends ServiceImpl<ProBasicTargetPlanMapper, ProBasicTargetPlan> implements IProBasicTargetPlanService {
+
+    @Override
+    public IPage<ProBasicTargetPlan> list(String id, String companyCode, String targetCode, String targetDate, String pageNum, String pageSize) {
+        QueryWrapper<ProBasicTargetPlan> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProBasicTargetPlan::getId, id);
+        }
+
+        if (StringUtils.isNotEmpty(companyCode)) {
+            qw.lambda().like(ProBasicTargetPlan::getCompanyCode, companyCode);
+        }
+        if (StringUtils.isNotEmpty(targetCode)) {
+            qw.lambda().like(ProBasicTargetPlan::getTargetCode, targetCode);
+        }
+
+        if (StringUtils.isNotEmpty(targetDate)) {
+            qw.lambda().eq(ProBasicTargetPlan::getTargetDate, targetDate);
+        }
+
+        Page<ProBasicTargetPlan> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProBasicTargetPlan> targetPlans = getBaseMapper().selectPage(page, qw);
+        return targetPlans;
+    }
+}

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

@@ -0,0 +1,59 @@
+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.ProEconElectricaltestPoint;
+import com.gyee.backconfig.mapper.auto.ProEconElectricaltestPointMapper;
+import com.gyee.backconfig.service.auto.IProEconElectricaltestPointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 电气测点 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Service
+public class ProEconElectricaltestPointServiceImpl extends ServiceImpl<ProEconElectricaltestPointMapper, ProEconElectricaltestPoint> implements IProEconElectricaltestPointService {
+
+    @Override
+    public IPage<ProEconElectricaltestPoint> list(String id, String code, String name, String model, String electricalId, String uniformCode,String windpowerstationId, String pageNum, String pageSize) {
+        QueryWrapper<ProEconElectricaltestPoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProEconElectricaltestPoint::getId, id);
+        }
+
+        if (StringUtils.isNotEmpty(code)) {
+            qw.lambda().like(ProEconElectricaltestPoint::getCode, code);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.lambda().like(ProEconElectricaltestPoint::getName, name);
+        }
+        if (StringUtils.isNotEmpty(model)) {
+            qw.lambda().like(ProEconElectricaltestPoint::getModel, model);
+        }
+
+        if (StringUtils.isNotEmpty(electricalId)) {
+            qw.lambda().eq(ProEconElectricaltestPoint::getElectricalId, electricalId);
+        }
+
+        if (StringUtils.isNotEmpty(uniformCode)) {
+            qw.lambda().like(ProEconElectricaltestPoint::getUniformCode, uniformCode);
+        }
+
+
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconElectricaltestPoint::getWindpowerstationId, windpowerstationId);
+        }
+
+        Page<ProEconElectricaltestPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProEconElectricaltestPoint> electricaltestPoints = getBaseMapper().selectPage(page, qw);
+        return electricaltestPoints;
+    }
+
+}

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

@@ -25,7 +25,7 @@ public class ProEconEquipmentmodelServiceImpl extends ServiceImpl<ProEconEquipme
     public IPage<ProEconEquipmentmodel> list(String id, String code, String name, String pageNum, String pageSize) {
         QueryWrapper<ProEconEquipmentmodel> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(code)) {
             qw.like(code, "code");

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

@@ -26,10 +26,10 @@ public class ProEconManufacturerServiceImpl extends ServiceImpl<ProEconManufactu
     public IPage<ProEconManufacturer> list(String id, String name, String pageNum, String pageSize) {
         QueryWrapper<ProEconManufacturer> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(id)) {
-            qw.like("id", id);
+            qw.eq("id", id);
         }
         if (StringUtils.isNotEmpty(name)) {
-            qw.like(name, "name");
+            qw.like("name", name);
         }
         Page<ProEconManufacturer> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         IPage<ProEconManufacturer> companysPage = getBaseMapper().selectPage(page, qw);

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

@@ -0,0 +1,46 @@
+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.ProEconStatusDictionaries;
+import com.gyee.backconfig.mapper.auto.ProEconStatusDictionariesMapper;
+import com.gyee.backconfig.service.auto.IProEconStatusDictionariesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 类型：1：7种简单状态；2：14种明细状态； 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Service
+public class ProEconStatusDictionariesServiceImpl extends ServiceImpl<ProEconStatusDictionariesMapper, ProEconStatusDictionaries> implements IProEconStatusDictionariesService {
+
+    @Override
+    public IPage<ProEconStatusDictionaries> list(String id, String code, String name, String type, String pageNum, String pageSize) {
+        QueryWrapper<ProEconStatusDictionaries> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProEconStatusDictionaries::getId, id);
+        }
+
+        if (StringUtils.isNotEmpty(code)) {
+            qw.lambda().like(ProEconStatusDictionaries::getCode, code);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.lambda().like(ProEconStatusDictionaries::getName, name);
+        }
+
+        if (StringUtils.isNotEmpty(type)) {
+            qw.lambda().eq(ProEconStatusDictionaries::getType, type);
+        }
+
+        Page<ProEconStatusDictionaries> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProEconStatusDictionaries> statusDictionariess = getBaseMapper().selectPage(page, qw);
+        return statusDictionariess;
+    }
+}

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

@@ -0,0 +1,43 @@
+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.ProEconStopType;
+import com.gyee.backconfig.mapper.auto.ProEconStopTypeMapper;
+import com.gyee.backconfig.service.auto.IProEconStopTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.common.model.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 停机类型 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-17
+ */
+@Service
+public class ProEconStopTypeServiceImpl extends ServiceImpl<ProEconStopTypeMapper, ProEconStopType> implements IProEconStopTypeService {
+
+    @Override
+    public IPage<ProEconStopType> list(String id, String isPlan, String name, String pageNum, String pageSize) {
+        QueryWrapper<ProEconStopType> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProEconStopType::getId, id);
+        }
+
+        if (StringUtils.isNotEmpty(isPlan)) {
+            qw.lambda().eq(ProEconStopType::getIsPlan, isPlan);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.lambda().like(ProEconStopType::getName, name);
+        }
+
+
+        Page<ProEconStopType> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProEconStopType> stopTypes = getBaseMapper().selectPage(page, qw);
+        return stopTypes;
+    }
+}

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

@@ -1,5 +1,8 @@
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.backconfig.config.CacheContext;
 import com.gyee.backconfig.mapper.auto.ProEconTestingPointMapper;
@@ -57,15 +60,48 @@ public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPo
 
     @Override
     public void generateSubStationPoint(String Substation, String[] points) {
+
         List<ProBasicPowerstationPoint>  subStationPoint = initalSbs(Substation,points);
 
-//        subStationPoint.stream().forEach(i->{
-//            System.out.println(i.getId()+"="+i.getNemCode()+"="+i.getWindpowerstationId()+"="+i.getUniformCode());
-//        });
         proBasicPowerstationPointService.batchAddPowerstationPoints(subStationPoint);
 
     }
 
+    @Override
+    public IPage<ProEconTestingPoint> list(String id, String nemCode, String name, String model, String uniformCode, String isDisplay, String pageNum, String pageSize) {
+        QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(id)) {
+            qw.lambda().eq(ProEconTestingPoint::getId, id);
+        }
+
+        if (StringUtils.isNotEmpty(nemCode)) {
+            qw.lambda().like(ProEconTestingPoint::getName, nemCode);
+        }
+        if (StringUtils.isNotEmpty(name)) {
+            qw.lambda().like(ProEconTestingPoint::getName, name);
+        }
+
+        if (StringUtils.isNotEmpty(model)) {
+            qw.lambda().like(ProEconTestingPoint::getModel, model);
+        }
+        if (StringUtils.isNotEmpty(uniformCode)) {
+            qw.lambda().like(ProEconTestingPoint::getUniformCode, uniformCode);
+        }
+        if (StringUtils.isNotEmpty(isDisplay)) {
+            qw.lambda().eq(ProEconTestingPoint::getIsDisplay, isDisplay);
+        }
+        Page<ProEconTestingPoint> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProEconTestingPoint> testingPoints = getBaseMapper().selectPage(page, qw);
+        return testingPoints;
+    }
+
+
+    /**
+     *
+     * @param station
+     * @param setpoints
+     * @return
+     */
     public List<ProBasicPowerstationPoint> initalSbs(String station,String[] setpoints) {
         List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();