From 16c95aa2f6554d31835d9fe921e62acc6b004d70 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 16 Jul 2026 17:19:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=B1=A1=E6=9F=93=E5=80=BC?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E9=80=BB=E8=BE=91=202.=E8=A7=A3?= =?UTF-8?q?=E5=86=B3devices=E6=A8=A1=E5=9D=97Swagger=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/pojo/dto/PollutionLineInfoDTO.java | 5 ++ .../controller/TerminalAlarmController.java | 4 +- .../device/mapper/mapping/DeviceMapper.xml | 15 +++- .../controller/UserLedgerController.java | 4 +- .../pojo/excel/pollution/LinePollution.java | 75 ++++++++++--------- .../impl/PollutionSubstationServiceImpl.java | 1 - 6 files changed, 61 insertions(+), 43 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineInfoDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineInfoDTO.java index 209e7c175..d2d079eb4 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineInfoDTO.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineInfoDTO.java @@ -104,4 +104,9 @@ public class PollutionLineInfoDTO { * 实际安装位置 */ private String actualArea; + + /** + * 监测点运行状态 + */ + private String runFlag; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalAlarmController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalAlarmController.java index af9183e13..8afabb838 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalAlarmController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalAlarmController.java @@ -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> terminalCheckPage(@RequestBody @Validated TerminalCheckParam terminalCheckParam){ - String methodDescribe = getMethodDescribe("alarmInfoList"); + String methodDescribe = getMethodDescribe("terminalCheckPage"); Page res = terminalAlarmService.terminalCheckPage(terminalCheckParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml index 898843de6..305a8707c 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/device/mapper/mapping/DeviceMapper.xml @@ -19,7 +19,8 @@ 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, diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java index f0f80a431..b443bc10e 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java @@ -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 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); } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/LinePollution.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/LinePollution.java index b2338ac50..847a285c4 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/LinePollution.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/excel/pollution/LinePollution.java @@ -70,8 +70,8 @@ public class LinePollution implements Serializable { /** * 位置，电网侧&非电网侧 */ - @Excel(name = "监测位置", width = 30) - @ApiModelProperty("监测位置") + @Excel(name = "用户性质", width = 30) + @ApiModelProperty("用户性质") private String powerFlag; /** @@ -84,7 +84,7 @@ public class LinePollution implements Serializable { /** * 新增 - * 监测点电压等级 + * 变电站电压等级 */ @Excel(name = "变电站电压等级", width = 30) @ApiModelProperty("变电站电压等级") @@ -112,7 +112,7 @@ public class LinePollution implements Serializable { private Integer interval; /** - * 新增 + * * 在线率 */ @Excel(name = "在线率(%)",type = 10, width = 30) @@ -120,7 +120,7 @@ public class LinePollution implements Serializable { private Float onlineRate; /** - * 新增 + * * 完整性 */ @Excel(name = "完整率(%)",type = 10, width = 30) @@ -134,42 +134,47 @@ public class LinePollution implements Serializable { @ApiModelProperty("谐波污染值") private Double HarmonicValue; - /** - * 暂升次数 1.1~1.8 - * 10ms ~ 1min - */ - @Excel(name = "暂升次数（次）",type = 10, width = 20) - @ApiModelProperty("暂升次数（次）") - private Integer upCounts; +// /** +// * 暂升次数 1.1~1.8 +// * 10ms ~ 1min +// */ +// @Excel(name = "暂升次数（次）",type = 10, width = 20) +// @ApiModelProperty("暂升次数（次）") +// private Integer upCounts; +// +// /** +// * 暂降次数 0.1~0.9 +// * 10ms ~ 1min +// */ +// @Excel(name = "电压暂降（次）",type = 10, width = 20) +// @ApiModelProperty("电压暂降（次）") +// private Integer downCounts; +// +// /** +// * 短时中断 0~0.1 +// * 10ms ~ 1min +// */ +// @Excel(name = "短时中断（次）",type = 10, width = 20) +// @ApiModelProperty("短时中断（次") +// private Integer breakCounts; - /** - * 暂降次数 0.1~0.9 - * 10ms ~ 1min - */ - @Excel(name = "电压暂降（次）",type = 10, width = 20) - @ApiModelProperty("电压暂降（次）") - private Integer downCounts; - - /** - * 短时中断 0~0.1 - * 10ms ~ 1min - */ - @Excel(name = "短时中断（次）",type = 10, width = 20) - @ApiModelProperty("短时中断（次") - private Integer breakCounts; - - @Excel(name = "是否关联敏感用户", width = 30, replace = "/_null") - @ApiModelProperty("是否关联敏感用户") - private String isMg; - - @Excel(name = "敏感及重要用户", width = 30,replace = "/_null") - @ApiModelProperty("敏感及重要用户") - private String importUser; +// @Excel(name = "是否关联敏感用户", width = 30, replace = "/_null") +// @ApiModelProperty("是否关联敏感用户") +// private String isMg; +// +// @Excel(name = "敏感及重要用户", width = 30,replace = "/_null") +// @ApiModelProperty("敏感及重要用户") +// private String importUser; @Excel(name = "一类监测点", width = 30,replace = "/_null") @ApiModelProperty("一类监测点") private String monitorId; + + @Excel(name = "监测点运行状态", width = 30,replace = "/_null") + @ApiModelProperty("监测点运行状态") + private String runFlag; + // /** // * 备注 // */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index 035ca5f3b..72914b03d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -1011,7 +1011,6 @@ public class PollutionSubstationServiceImpl extends ServiceImpl downPollutionLineCalc(StatSubstationBizBaseParam param) { DeviceInfoParam deviceInfoParam=new DeviceInfoParam(); - deviceInfoParam.setLineRunFlag(0); deviceInfoParam.setDeptIndex(param.getId()); deviceInfoParam.setStatisticalType(new SimpleDTO()); List data1 = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();