From 90cd11a1ded576e03b9d922b06ecb87a5534c3f4 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 12 Sep 2023 13:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E6=9D=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CsEquipmentDeliveryServiceImpl.java | 9 ++++----- .../csdevice/service/impl/CsGroupServiceImpl.java | 8 ++++---- .../csdevice/service/impl/CsLedgerServiceImpl.java | 2 +- .../java/com/njcn/csharmonic/pojo/po/CsEventPO.java | 7 +++++++ .../service/impl/LineTargetServiceImpl.java | 12 ++++++------ 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index df13796..0275732 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -31,7 +31,6 @@ import com.njcn.csdevice.utils.ExcelStyleUtil; import com.njcn.db.constant.DbConstant; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; -import com.njcn.poi.util.PoiUtil; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; import com.njcn.system.enums.DicDataEnum; @@ -277,13 +276,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl impl String areaCode = dicDataFeignClient.getDicDataById(position).getData().getCode(); if (Objects.equals(areaCode, DicDataEnum.OUTPUT_SIDE.getCode())){ clDid = "0"; - } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){ - clDid = "1"; } else if (Objects.equals(areaCode, DicDataEnum.GRID_SIDE.getCode())){ + clDid = "1"; + } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){ clDid = "2"; } //获取当前组的所有指标项 @@ -153,9 +153,9 @@ public class CsGroupServiceImpl extends ServiceImpl impl String areaCode = dicDataFeignClient.getDicDataById(position).getData().getCode(); if (Objects.equals(areaCode, DicDataEnum.OUTPUT_SIDE.getCode())){ clDid = "0"; - } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){ - clDid = "1"; } else if (Objects.equals(areaCode, DicDataEnum.GRID_SIDE.getCode())){ + clDid = "1"; + } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){ clDid = "2"; } //获取当前组的所有指标项 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 141ec91..4018957 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -160,7 +160,7 @@ public class CsLedgerServiceImpl extends ServiceImpl i @Override public CsLedger findDataById(String id) { - return this.lambdaQuery().eq(CsLedger::getId,id).one(); + return this.lambdaQuery().eq(CsLedger::getId,id).eq(CsLedger::getState,1).one(); } @Override diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java index 8aa5b24..3fd3324 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java @@ -64,4 +64,11 @@ public class CsEventPO extends BaseEntity { */ @TableField(value = "type") private Integer type; + + /** + * 逻辑子设备id + * 电能质量设备是监测点、治理设备是各个模块 + */ + @TableField(value = "cl_did") + private Integer clDid; } \ No newline at end of file diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java index 19a40a3..7935d58 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java @@ -86,13 +86,13 @@ public class LineTargetServiceImpl implements ILineTargetService { modelId = devModelRelationFeignClient.getModelByType(devId,0).getData(); dataSetList = dataSetFeignClient.getDataSet(modelId,0).getData(); } - //负载侧监测点 - else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){ + //电网侧监测点 + else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){ modelId = devModelRelationFeignClient.getModelByType(devId,1).getData(); dataSetList = dataSetFeignClient.getDataSet(modelId,1).getData(); } - //电网侧监测点 - else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){ + //负载侧监测点 + else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){ modelId = devModelRelationFeignClient.getModelByType(devId,1).getData(); dataSetList = dataSetFeignClient.getDataSet(modelId,2).getData(); } @@ -149,9 +149,9 @@ public class LineTargetServiceImpl implements ILineTargetService { String areaCode = dicDataFeignClient.getDicDataById(position).getData().getCode(); if (Objects.equals(areaCode, DicDataEnum.OUTPUT_SIDE.getCode())){ clDid = "0"; - } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){ - clDid = "1"; } else if (Objects.equals(areaCode, DicDataEnum.GRID_SIDE.getCode())){ + clDid = "1"; + } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){ clDid = "2"; } return clDid;