From 9ff0f40349739bfa44ed1cbe36de25ede7afbc92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= Date: Wed, 3 Dec 2025 13:48:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(cs-device):=20=E6=96=B0=E5=A2=9E=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E5=8F=82=E6=95=B0=E4=B8=8E=E5=AE=B9=E9=87=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 CsLineParam 中新增 monitorObj、govern 和 monitorUser 字段 - 在 CsLinePO 中新增 shortCircuitCapacity、devCapacity、basicCapacity 和 protocolCapacity 字段 - 更新 CsLinePOServiceImpl 中的更新逻辑以支持新字段写入 --- .../njcn/csdevice/pojo/param/CsLineParam.java | 22 +++++++++++++---- .../com/njcn/csdevice/pojo/po/CsLinePO.java | 24 +++++++++++++++++++ .../service/impl/CsLinePOServiceImpl.java | 17 +++++++++---- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java index e578b68..7d71942 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java @@ -109,22 +109,36 @@ public class CsLineParam extends BaseEntity { /** * 短路容量 */ - private Integer shortCircuitCapacity; + private Double shortCircuitCapacity; /** * 设备容量 */ - private Integer devCapacity; + private Double devCapacity; /** * 基准容量 */ - private Integer basicCapacity; + private Double basicCapacity; /** * 协议容量 */ - private Integer protocolCapacity; + private Double protocolCapacity; + + /** + * 监测对象类型 + */ + private String monitorObj; + /** + * 是否治理(0:未治理 1:已治理) + */ + private Integer govern; + + /** + * 敏感用户ID + */ + private String monitorUser; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java index caf58cd..38baae7 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java @@ -136,6 +136,30 @@ public class CsLinePO extends BaseEntity { @TableField(value = "monitor_user") private String monitorUser; + /** + * 短路容量 + */ + @TableField(value = "short_circuit_capacity") + private Double shortCircuitCapacity; + + /** + * 设备容量 + */ + @TableField(value = "dev_capacity") + private Double devCapacity; + + /** + * 基准容量 + */ + @TableField(value = "basic_capacity") + private Double basicCapacity; + + /** + * 协议容量 + */ + @TableField(value = "protocol_capacity") + private Double protocolCapacity; + /** * 治理报告文件路径 */ diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index 022bfd5..b711c1d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -13,17 +13,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.access.api.CsLineLatestDataFeignClient; import com.njcn.access.pojo.po.CsLineLatestData; import com.njcn.common.pojo.enums.common.DataStateEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.mapper.*; import com.njcn.csdevice.pojo.param.CsLineParam; import com.njcn.csdevice.pojo.po.*; import com.njcn.csdevice.pojo.vo.PqSensitiveUserLineVO; -import com.njcn.csdevice.service.*; +import com.njcn.csdevice.service.CsDevModelService; +import com.njcn.csdevice.service.CsLinePOService; +import com.njcn.csdevice.service.ICsDataSetService; import com.njcn.csharmonic.api.PqSensitiveUserFeignClient; import com.njcn.csharmonic.pojo.po.PqSensitiveUser; -import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.system.api.DicDataFeignClient; @@ -194,7 +193,15 @@ public class CsLinePOServiceImpl extends ServiceImpl i .set(CsLinePO::getCtRatio,param.getCtRatio()) .set(CsLinePO::getCt2Ratio,param.getCt2Ratio()) .set(CsLinePO::getVolGrade,param.getVolGrade()) - .set(CsLinePO::getRunStatus,param.getRunStatus()); + .set(CsLinePO::getRunStatus,param.getRunStatus()) + .set(CsLinePO::getBasicCapacity,param.getBasicCapacity()) + .set(CsLinePO::getDevCapacity,param.getDevCapacity()) + .set(CsLinePO::getProtocolCapacity,param.getProtocolCapacity()) + .set(CsLinePO::getShortCircuitCapacity,param.getShortCircuitCapacity()) + .set(CsLinePO::getMonitorObj,param.getMonitorObj()) + .set(CsLinePO::getMonitorObj,param.getMonitorObj()) + .set(CsLinePO::getGovern,param.getGovern()) + .set(CsLinePO::getMonitorUser,param.getMonitorUser()); this.update(lambdaUpdateWrapper); //修改台账树中监测点的名称