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

1.调整污染值监测点逻辑

Browse Source 
2.解决devices模块Swagger页面无法展示问题
This commit is contained in:
wr
2026-07-16 17:19:49 +08:00
parent e313894417
commit 16c95aa2f6
6 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalAlarmController.java
View File

@@ -97,9 +97,9 @@ public class TerminalAlarmController extends BaseController {
@PostMapping("/terminalCheckPage")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("终端检测告警")
@ApiImplicitParam(name = "alarmParam", value = "告警类型")
@ApiImplicitParam(name = "terminalCheckParam", value = "告警类型")
public HttpResult<Page<TerminalCheckVO>> terminalCheckPage(@RequestBody @Validated TerminalCheckParam terminalCheckParam){
String methodDescribe = getMethodDescribe("alarmInfoList");
String methodDescribe = getMethodDescribe("terminalCheckPage");
Page<TerminalCheckVO> res = terminalAlarmService.terminalCheckPage(terminalCheckParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
}

15
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml
View File

@@ -19,7 +19,8 @@
<select id="getRunManageCommList" resultType="com.njcn.device.pq.pojo.vo.RunManageVO">
SELECT
linedetail.Num AS id,
linedetail.id AS id,
linedetail.Num AS runNo,
line.NAME AS lineName,
area.NAME AS areaName,
gd.NAME AS gdName,
@@ -144,7 +145,8 @@
<select id="getRunManageList" resultType="com.njcn.device.pq.pojo.vo.RunManageVO">
SELECT
linedetail.Num AS id,
linedetail.id AS id,
linedetail.Num AS runNo,
line.NAME AS lineName,
area.NAME AS areaName,
gd.NAME AS gdName,
@@ -514,7 +516,14 @@
pv.scale lineVoltage,
pqsub.scale subVoltage,
lineDetail.monitor_id monitorId,
lineDetail.Actual_Area actualArea
lineDetail.Actual_Area actualArea,
CASE lineDetail.Run_Flag
WHEN 0 THEN'投运'
WHEN 1 THEN'检修'
WHEN 2 THEN'停运'
WHEN 3 THEN'调试'
WHEN 4 THEN'退运'
END AS runFlag
FROM
pq_line line,
pq_line_detail lineDetail,

4
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java
View File

@@ -152,9 +152,9 @@ public class UserLedgerController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
@PostMapping("/userCheckUpload")
@ApiOperation("周期检测")
@ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
@ApiImplicitParam(name = "terminalCheckParam", value = "实体参数", required = true)
public HttpResult<Boolean> userCheckUpload(@RequestBody @Validated TerminalCheckParam terminalCheckParam) {
String methodDescribe = getMethodDescribe("addUserReport");
String methodDescribe = getMethodDescribe("userCheckUpload");
Boolean f = userReportPOService.userCheckUpload(terminalCheckParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, f, methodDescribe);
}