Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.pmsbug修改，配网统计报表报告

Browse Source 
2.技术监督策略，代码提交
This commit is contained in:
wurui
2023-03-22 18:22:04 +08:00
parent 4bb8482bfa
commit 41566d6acc
8 changed files with 168 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java
View File

@@ -8,8 +8,8 @@ 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.MonitorParam;
import com.njcn.process.pojo.param.StrategyParam;
import com.njcn.process.pojo.po.ThsDeptAlarm;
import com.njcn.process.pojo.po.ThsWarnStrategy;
import com.njcn.process.service.ThsWarnStrategyService;
import com.njcn.web.controller.BaseController;
@@ -40,7 +40,7 @@ public class ThsWarnStrategyController extends BaseController {
private final ThsWarnStrategyService thsWarnStrategyService;
@PostMapping("/getStrategyPage")
@ApiOperation("预警单/告警单策略分页查询")
@ApiOperation("分页查询")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<Page<ThsWarnStrategy>> getStrategyPage(@RequestBody @Validated StrategyParam.StrategyPageParam param) {
String methodDescribe = getMethodDescribe("getStrategyPage");
@@ -49,7 +49,7 @@ public class ThsWarnStrategyController extends BaseController {
}
@PostMapping("/insertStrategy")
@ApiOperation(value = "预警单/告警单单条新增")
@ApiOperation(value = "数据添加")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> insertStrategy(@RequestBody @Validated StrategyParam.StrategyInsertParam param) {
String methodDescribe = getMethodDescribe("insertStrategy");
@@ -58,7 +58,7 @@ public class ThsWarnStrategyController extends BaseController {
}
@PostMapping("/bindStrategy")
@ApiOperation(value = "预警单/告警单信息绑定")
@ApiOperation(value = "信息绑定")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> bindStrategy(@RequestBody @Validated StrategyParam.BindParam param) {
String methodDescribe = getMethodDescribe("bindStrategy");
@@ -67,7 +67,7 @@ public class ThsWarnStrategyController extends BaseController {
}
@PostMapping("/getUpdateStrategy")
@ApiOperation(value = "预警单/告警单修改详细查询")
@ApiOperation(value = "详细查询")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<StrategyParam.StrategyUpdateParam> getUpdateStrategy(@RequestParam("id") String id) {
String methodDescribe = getMethodDescribe("getUpdateStrategy");
@@ -76,7 +76,7 @@ public class ThsWarnStrategyController extends BaseController {
}
@PostMapping("/updateStrategy")
@ApiOperation(value = "预警单/告警单修改")
@ApiOperation(value = "信息修改")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
public HttpResult<Boolean> updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpParam param) {
String methodDescribe = getMethodDescribe("updateStrategy");
@@ -85,7 +85,7 @@ public class ThsWarnStrategyController extends BaseController {
}
@PostMapping("/updateStrategyState")
@ApiOperation(value = "预警单/告警单修改状态")
@ApiOperation(value = "修改状态")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
public HttpResult<Boolean> updateStrategyState(@RequestBody @Validated StrategyParam.StrategyStateParam param) {
String methodDescribe = getMethodDescribe("updateStrategyState");
@@ -93,26 +93,34 @@ public class ThsWarnStrategyController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@PostMapping("/getMonitor")
@GetMapping("/getMonitor")
@ApiOperation(value = "监测点查询接口")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<List<StrategyParam.MonitorTree>> getMonitor(@Param("monitorTag") List<String> monitorTag, @Param("orgId") String orgId) {
public HttpResult<List<StrategyParam.MonitorTree>> getMonitor(@Param("orgId") String orgId) {
String methodDescribe = getMethodDescribe("getMonitor");
List<StrategyParam.MonitorTree> monitor = thsWarnStrategyService.getMonitor(monitorTag, orgId);
List<StrategyParam.MonitorTree> monitor = thsWarnStrategyService.getMonitor( orgId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
@PostMapping("/bindMonitor")
@ApiOperation(value = "预警单/告警单监测点绑定")
@ApiOperation(value = "监测点绑定")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> bindMonitor(@RequestBody List<ThsDeptAlarm> param) {
public HttpResult<Boolean> bindMonitor(@RequestBody MonitorParam param) {
String methodDescribe = getMethodDescribe("bindMonitor");
Boolean flag = thsWarnStrategyService.bindMonitor(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@GetMapping("/echoMonitor")
@ApiOperation(value = "监测点回显")
public HttpResult<List<String>> echoMonitor(@Param("deptId") String deptId,@Param("type") Integer type) {
String methodDescribe = getMethodDescribe("echoMonitor");
List<String> strings = thsWarnStrategyService.echoMonitor(deptId, type);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, strings, methodDescribe);
}
@PostMapping("/delStrategy")
@ApiOperation(value = "预警单/告警单信息删除")
@ApiOperation(value = "信息删除")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> delStrategy(String ids) {
String methodDescribe = getMethodDescribe("delStrategy");