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

pmsBUG提交

Browse Source
This commit is contained in:
wurui
2023-03-17 17:19:44 +08:00
parent 8a03892513
commit fabd4a0180
18 changed files with 724 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
pqs-process/process-boot/src/main/java/com/njcn/process/controller/PmsTerminalDetectionController.java
View File

@@ -3,6 +3,7 @@ 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;
@@ -15,10 +16,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.core.io.InputStreamResource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
/**
@@ -40,56 +44,99 @@ public class PmsTerminalDetectionController extends BaseController {
@PostMapping("/getTerminalPage")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("终端检测监督管理分页查询")
public HttpResult<Page<TerminalVO>> getPage(@RequestBody TerminalParam.TerminalPageParam param) {
public HttpResult<Page<TerminalVO>> getTerminalPage(@RequestBody TerminalParam.TerminalPageParam param) {
String methodDescribe = getMethodDescribe("getTerminalPage");
Page<TerminalVO> page = pmsTerminalDetectionService.terminalPage(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
@ApiOperation(value = "导出终端入网检测录入模板")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/export")
public void export(HttpServletResponse response) {
pmsTerminalDetectionService.exportTemplate(response);
}
@PostMapping(value = "/importTerminal")
@ApiOperation("excel批量导入终端入网检测录入")
@ResponseBody
public HttpResult<String> importTerminalBase(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("importTerminal");
pmsTerminalDetectionService.batchTerminal(file, response);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@ResponseBody
@ApiOperation("批量导入检测报告")
@PostMapping(value = "/importReport")
public HttpResult<String> importReport(@ApiParam(value = "文件", required = true) @RequestPart("files") MultipartFile[] files, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("importReport");
pmsTerminalDetectionService.importReport(files, response);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@PostMapping("/getStatistics")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("终端入网检测台账统计")
public HttpResult<List<TerminalVO.TerminalStatistics>> getStatistics(@RequestBody TerminalParam param) {
public HttpResult<TerminalVO.TerminalStatistics> getStatistics(@RequestBody TerminalParam param) {
String methodDescribe = getMethodDescribe("getStatistics");
List<TerminalVO.TerminalStatistics> list = pmsTerminalDetectionService.getStatistics(param);
TerminalVO.TerminalStatistics list = pmsTerminalDetectionService.getStatistics(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@PostMapping("/getCycleStatistics")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("周期检测统计")
public HttpResult<List<TerminalVO.TerminalStatistics>> getCycleStatistics(@RequestBody TerminalParam.TerminalCycleParam param) {
public HttpResult<TerminalVO.TerminalStatistics> getCycleStatistics(@RequestBody TerminalParam param) {
String methodDescribe = getMethodDescribe("getCycleStatistics");
List<TerminalVO.TerminalStatistics> list = pmsTerminalDetectionService.getCycleStatistics(param);
TerminalVO.TerminalStatistics list = pmsTerminalDetectionService.getCycleStatistics(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@PostMapping("/insertTerminal")
@ApiOperation(value = "终端检测监督单条新增")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> insertTerminal(@RequestBody TerminalParam.TerminalInsertParam param) {
String methodDescribe = getMethodDescribe("insertTerminal");
Boolean flag = pmsTerminalDetectionService.insertTerminal(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@PostMapping(value = "/batchTerminal")
@ApiOperation("批量导入终端入网检测录入")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<String> batchTerminal(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("batchTerminal");
pmsTerminalDetectionService.batchTerminal(file, response);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@PostMapping("/updateTerminal")
@ApiOperation(value = "终端检测监督修改")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
public HttpResult<Boolean> updateTerminal(@RequestBody @Validated TerminalParam.TerminalUpdateParam param) {
String methodDescribe = getMethodDescribe("updateTerminal");
Boolean flag = pmsTerminalDetectionService.updateTerminal(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@PostMapping("/delTerminal")
@ApiOperation(value = "终端检测监督删除")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
public HttpResult<Boolean> delTerminal(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delTerminal");
Boolean flag = pmsTerminalDetectionService.delTerminal(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@ApiOperation(value = "导出终端入网检测录入模板")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/export")
public InputStreamResource export() throws IOException {
return pmsTerminalDetectionService.exportTemplate();
}
@ApiOperation("批量导入检测报告")
@PostMapping(value = "/importReport")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<String> importReport(@ApiParam(value = "文件", required = true)
@RequestPart("files") MultipartFile[] files,
@RequestParam("type") Integer type, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("importReport");
pmsTerminalDetectionService.importReport(files,type, response);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@ApiOperation("检测报告下载")
@PostMapping(value = "/reportDownload")
public InputStreamResource reportDownload(@RequestBody TerminalParam.DownloadParam param) throws IOException {
InputStreamResource minIoUploadResDTO = pmsTerminalDetectionService.reportDownload(param);
return minIoUploadResDTO;
}
@ApiOperation("文件上传")
@PostMapping(value = "/upload")
public HttpResult<String> upload(MultipartFile file) {
String methodDescribe = getMethodDescribe("upload");
String url = pmsTerminalDetectionService.url(file);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, url, methodDescribe);
}
}

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

@@ -3,11 +3,13 @@ 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.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;
@@ -18,13 +20,12 @@ import org.apache.ibatis.annotations.Param;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 前端控制器
* 前端控制器
* </p>
*
* @author wr
@@ -32,15 +33,15 @@ import java.util.List;
*/
@RestController
@RequestMapping("/process/thsWarnStrategy")
@Api(tags = "(预警单-告警单)策略")
@Api(tags = "预警单策略|告警单策略")
@RequiredArgsConstructor
public class ThsWarnStrategyController extends BaseController {
private final ThsWarnStrategyService thsWarnStrategyService;
@PostMapping("/getStrategyPage")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("预警单/告警单策略分页查询")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<Page<ThsWarnStrategy>> getStrategyPage(@RequestBody @Validated StrategyParam.StrategyPageParam param) {
String methodDescribe = getMethodDescribe("getStrategyPage");
Page<ThsWarnStrategy> page = thsWarnStrategyService.strategyPage(param);
@@ -49,8 +50,8 @@ public class ThsWarnStrategyController extends BaseController {
@PostMapping("/insertStrategy")
@ApiOperation(value = "预警单/告警单单条新增")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<Boolean> insertStrategy(@RequestBody @Validated StrategyParam.StrategyInsertParam param) {
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> insertStrategy(@RequestBody @Validated StrategyParam.StrategyInsertParam param) {
String methodDescribe = getMethodDescribe("insertStrategy");
Boolean flag = thsWarnStrategyService.insertStrategy(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
@@ -58,8 +59,8 @@ public class ThsWarnStrategyController extends BaseController {
@PostMapping("/bindStrategy")
@ApiOperation(value = "预警单/告警单信息绑定")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<Boolean> bindStrategy(@RequestBody @Validated StrategyParam.BindParam param) {
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> bindStrategy(@RequestBody @Validated StrategyParam.BindParam param) {
String methodDescribe = getMethodDescribe("bindStrategy");
Boolean flag = thsWarnStrategyService.bindStrategy(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
@@ -68,7 +69,7 @@ public class ThsWarnStrategyController extends BaseController {
@PostMapping("/getUpdateStrategy")
@ApiOperation(value = "预警单/告警单修改详细查询")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<StrategyParam.StrategyUpdateParam> getUpdateStrategy(@RequestParam("id") String id) {
public HttpResult<StrategyParam.StrategyUpdateParam> getUpdateStrategy(@RequestParam("id") String id) {
String methodDescribe = getMethodDescribe("getUpdateStrategy");
StrategyParam.StrategyUpdateParam updateStrategy = thsWarnStrategyService.getUpdateStrategy(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, updateStrategy, methodDescribe);
@@ -76,8 +77,8 @@ public class ThsWarnStrategyController extends BaseController {
@PostMapping("/updateStrategy")
@ApiOperation(value = "预警单/告警单修改")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<Boolean> updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpdateParam param) {
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
public HttpResult<Boolean> updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpdateParam param) {
String methodDescribe = getMethodDescribe("updateStrategy");
Boolean flag = thsWarnStrategyService.updateStrategy(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
@@ -85,8 +86,8 @@ public class ThsWarnStrategyController extends BaseController {
@PostMapping("/updateStrategyState")
@ApiOperation(value = "预警单/告警单修改状态")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<Boolean> updateStrategyState(@RequestBody @Validated StrategyParam.StrategyStateParam param) {
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
public HttpResult<Boolean> updateStrategyState(@RequestBody @Validated StrategyParam.StrategyStateParam param) {
String methodDescribe = getMethodDescribe("updateStrategyState");
Boolean flag = thsWarnStrategyService.updateStrategyState(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
@@ -95,12 +96,29 @@ public class ThsWarnStrategyController extends BaseController {
@PostMapping("/getMonitor")
@ApiOperation(value = "监测点查询接口")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
public HttpResult<List<StrategyParam.MonitorTree>> getMonitor(@Param("monitorTag") String monitorTag,@Param("orgId") String orgId) {
public HttpResult<List<StrategyParam.MonitorTree>> getMonitor(@Param("monitorTag") String monitorTag, @Param("orgId") String orgId) {
String methodDescribe = getMethodDescribe("getMonitor");
List<StrategyParam.MonitorTree> monitor = thsWarnStrategyService.getMonitor(monitorTag, orgId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
@PostMapping("/bindMonitor")
@ApiOperation(value = "预警单/告警单监测点绑定")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> bindMonitor(@RequestBody List<ThsDeptAlarm> param) {
String methodDescribe = getMethodDescribe("bindMonitor");
Boolean flag = thsWarnStrategyService.bindMonitor(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
@PostMapping("/delStrategy")
@ApiOperation(value = "预警单/告警单信息删除")
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
public HttpResult<Boolean> bindStrategy(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("delStrategy");
Boolean flag = thsWarnStrategyService.delStrategy(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
}