1.技术监督历史计划

2.技术监督预告警单和反馈数据 3.技术监督国网上送，计划历史记录、告警单和反馈数据 4.技术监督bug修改
2023-09-06 11:06:43 +08:00
parent 0a60de9677
commit 650de7c883
45 changed files with 3440 additions and 141 deletions
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java
@@ -0,0 +1,82 @@
+package com.njcn.process.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.process.pojo.param.SupvAlarmBackParam;
+import com.njcn.process.pojo.po.SupvAlarmBack;
+import com.njcn.process.service.ISupvAlarmBackService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 技术监督预告警单反馈数据表 前端控制器
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@RestController
+@Api(tags ="预告警单反馈")
+@RequestMapping("/supvAlarmBack")
+@RequiredArgsConstructor
+public class SupvAlarmBackController extends BaseController {
+
+    private final ISupvAlarmBackService supvAlarmBackService;
+
+    @PostMapping("addAlarmBack")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("新增预告警单反馈")
+    public HttpResult<Boolean> addAlarmBack(@RequestBody @Validated SupvAlarmBackParam.AlarmBackInsert insert){
+        String methodDescribe = getMethodDescribe("addAlarmBack");
+        Boolean b = supvAlarmBackService.addAlarmBack(insert);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("updateAlarmBack")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("修改预告警单反馈")
+    public HttpResult<Boolean> updateAlarmBack(@RequestBody @Validated SupvAlarmBackParam.AlarmBackUpdate update){
+        String methodDescribe = getMethodDescribe("updateAlarmBack");
+        Boolean b = supvAlarmBackService.updateAlarmBack(update);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("delAlarmBack")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("删除预告警单反馈")
+    @ApiImplicitParam(name = "planIds",value = "监督计划索引集合",required = true)
+    public HttpResult<Boolean> delAlarmBack(@RequestBody List<String> planIds){
+        String methodDescribe = getMethodDescribe("delAlarmBack");
+        Boolean b = supvAlarmBackService.delAlarmBack(planIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("pageAlarmBack")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("分页查询预告警单反馈")
+    @ApiImplicitParam(name = "param",value = "请求体",required = true)
+    public HttpResult<Page<SupvAlarmBack>> pageAlarmBack(@RequestBody SupvAlarmBackParam param){
+        String methodDescribe = getMethodDescribe("pagePlanHis");
+        Page<SupvAlarmBack> supvPlanHisPage = supvAlarmBackService.pageAlarmBack(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supvPlanHisPage, methodDescribe);
+    }
+}
+
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmController.java
@@ -0,0 +1,83 @@
+package com.njcn.process.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.process.pojo.param.SupvAlarmParam;
+import com.njcn.process.pojo.po.SupvAlarm;
+import com.njcn.process.service.ISupvAlarmService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@RestController
+@Api(tags ="预告警单")
+@RequestMapping("/supvAlarm")
+@RequiredArgsConstructor
+public class SupvAlarmController extends BaseController {
+
+    private final ISupvAlarmService supvAlarmService;
+
+    @PostMapping("addAlarm")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("新增预告警单")
+    public HttpResult<Boolean> addAlarm(@RequestBody @Validated SupvAlarmParam.AlarmInsert insert){
+        String methodDescribe = getMethodDescribe("addAlarm");
+        Boolean b = supvAlarmService.addAlarm(insert);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("updateAlarm")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("修改预告警单")
+    public HttpResult<Boolean> updateAlarm(@RequestBody @Validated SupvAlarmParam.AlarmUpdate update){
+        String methodDescribe = getMethodDescribe("updateAlarm");
+        Boolean b = supvAlarmService.updateAlarm(update);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("delAlarm")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("删除预告警单")
+    @ApiImplicitParam(name = "planIds",value = "监督计划索引集合",required = true)
+    public HttpResult<Boolean> delAlarm(@RequestBody List<String> planIds){
+        String methodDescribe = getMethodDescribe("delAlarm");
+        Boolean b = supvAlarmService.delAlarm(planIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("pageAlarm")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("分页查询预告警单")
+    @ApiImplicitParam(name = "param",value = "请求体",required = true)
+    public HttpResult<Page<SupvAlarm>> pageAlarm(@RequestBody SupvAlarmParam param){
+        String methodDescribe = getMethodDescribe("pageAlarm");
+        Page<SupvAlarm> supvPlanHisPage = supvAlarmService.pageAlarm(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supvPlanHisPage, methodDescribe);
+    }
+
+}
+
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPlanHisController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPlanHisController.java
@@ -0,0 +1,82 @@
+package com.njcn.process.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.process.pojo.param.SupvPlanHisParam;
+import com.njcn.process.pojo.po.SupvPlanHis;
+import com.njcn.process.service.ISupvPlanHisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.njcn.web.controller.BaseController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 监督工作计划变更历史数据表 前端控制器
+ * </p>
+ *
+ * @author wr
+ * @since 2023-09-01
+ */
+@RestController
+@RequestMapping("/supvPlanHis")
+@Api(tags ="计划历史记录")
+@RequiredArgsConstructor
+public class SupvPlanHisController extends BaseController {
+
+    private final ISupvPlanHisService supvPlanHisService;
+
+    @PostMapping("addPlanHis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("新增技术监督计划历史记录")
+    public HttpResult<Boolean> addPlanHis(@RequestBody @Validated SupvPlanHisParam.insert insert){
+        String methodDescribe = getMethodDescribe("addPlanHis");
+        Boolean b = supvPlanHisService.addPlanHis(insert);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("updatePlanHis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("修改技术监督计划历史记录")
+    public HttpResult<Boolean> updatePlanHis(@RequestBody @Validated SupvPlanHisParam.update update){
+        String methodDescribe = getMethodDescribe("updatePlanHis");
+        Boolean b = supvPlanHisService.updatePlanHis(update);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("delPlanHis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @ApiOperation("删除监督计划历史记录")
+    @ApiImplicitParam(name = "planIds",value = "监督计划索引集合",required = true)
+    public HttpResult<Boolean> delPlanHis(@RequestBody List<String> planIds){
+        String methodDescribe = getMethodDescribe("delPlanHis");
+        Boolean b = supvPlanHisService.delPlanHis(planIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @PostMapping("pagePlanHis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("分页查询监督计划历史记录")
+    @ApiImplicitParam(name = "param",value = "请求体",required = true)
+    public HttpResult<Page<SupvPlanHis>> pagePlanHis(@RequestBody SupvPlanHisParam param){
+        String methodDescribe = getMethodDescribe("pagePlanHis");
+        Page<SupvPlanHis> supvPlanHisPage = supvPlanHisService.pagePlanHis(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supvPlanHisPage, methodDescribe);
+    }
+}
+
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvProblemController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvProblemController.java
@@ -2,7 +2,6 @@ package com.njcn.process.controller;


 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -12,12 +11,9 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.process.pojo.param.SupvProblemParam;
-import com.njcn.process.pojo.po.SupvFile;
 import com.njcn.process.pojo.po.SupvProblem;
+import com.njcn.process.pojo.vo.SupvProblemVO;
 import com.njcn.process.service.ISupvProblemService;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -31,10 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.njcn.web.controller.BaseController;

 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;

 /**
 * <p>
@@ -53,10 +45,6 @@ public class SupvProblemController extends BaseController {
    private final ISupvProblemService iSupvProblemService;


-
-
-
-
    @PostMapping("addProblem")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
    @ApiOperation("新增技术监督问题")
@@ -99,5 +87,13 @@ public class SupvProblemController extends BaseController {
        Page<SupvProblem> page = iSupvProblemService.pageProblem(supvProblemParam);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
    }
+
+    @PostMapping("problemList")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("所有监督问题")
+    @ApiImplicitParam(name = "supvProblemParam",value = "请求体",required = true)
+    public void problemList(@RequestBody SupvProblemParam supvProblemParam){
+         iSupvProblemService.problemList(supvProblemParam);
+    }
 }

--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPushGwController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvPushGwController.java
@@ -125,4 +125,33 @@ public class SupvPushGwController extends BaseController {
        String s = supvPushGwService.deletePlan(planIds);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
    }
+
+
+    @PostMapping("pushPlanHis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("推送工作计划变更历史数据接口")
+    public HttpResult<String> pushPlanHis(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("pushPlanHis");
+        String s = supvPushGwService.pushPlanHis(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+    }
+
+    @PostMapping("pushAlarm")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("推送电能质量技术监督预告警单数据接口")
+    public HttpResult<String> pushAlarm(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("pushAlarm");
+        String s = supvPushGwService.pushAlarm(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+    }
+
+    @PostMapping("pushAlarmHis")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("推送电能质量技术监督预告警单反馈数据接口")
+    public HttpResult<String> pushAlarmHis(@RequestBody List<String> ids){
+        String methodDescribe = getMethodDescribe("pushAlarmHis");
+        String s = supvPushGwService.pushAlarmHis(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe);
+    }
+
 }