From 9fc3e126d9ac0e0c9df0f48d621a102098031e62 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 27 May 2026 18:11:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(device):=20=E6=B7=BB=E5=8A=A0=E8=B0=90?= =?UTF-8?q?=E6=B3=A2=E8=AE=A1=E5=88=92=E7=BA=BF=E8=B7=AF=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E5=B9=B6=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 引入 CsHarmonicPlanLineFeignClient 客户端依赖 - 在 CsDeviceServiceImpl 中注入谐波计划线路客户端实例 - 删除监测点稳态指标告警的默认指标配置功能 - 重构统计服务中的缓存键生成逻辑，移除统计方法参数 --- .../com/njcn/access/service/impl/CsDeviceServiceImpl.java | 6 ++++++ .../java/com/njcn/stat/service/impl/StatServiceImpl.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java index 5683ff1..0dc2c69 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java @@ -26,6 +26,7 @@ import com.njcn.csdevice.param.LineInfoParam; import com.njcn.csdevice.pojo.param.*; import com.njcn.csdevice.pojo.po.*; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; +import com.njcn.csharmonic.api.CsHarmonicPlanLineFeignClient; import com.njcn.redis.pojo.enums.AppRedisKey; import com.njcn.redis.utils.RedisUtil; import com.njcn.system.api.DicDataFeignClient; @@ -87,6 +88,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService { private final EngineeringFeignClient engineeringFeignClient; private final AppProjectFeignClient appProjectFeignClient; private final DeviceMessageFeignClient deviceMessageFeignClient; + private final CsHarmonicPlanLineFeignClient csHarmonicPlanLineFeignClient; @Override @Transactional(rollbackFor = {Exception.class}) @@ -288,7 +290,11 @@ public class CsDeviceServiceImpl implements ICsDeviceService { csLogsFeignClient.addUserLog(logDto); throw new BusinessException(AccessResponseEnum.LINE_POSITION_REPEAT); } + //删除监测点稳态指标告警的默认指标配置 + List lineIdList = csLinePoList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); + csHarmonicPlanLineFeignClient.deleteByLineIds(lineIdList); csLineService.saveBatch(csLinePoList); + redisUtil.saveByKeyWithExpire("accessLineInfo:" + devAccessParam.getNDid(),csLinePoList,30L); //缓存监测点信息 LineInfoParam param = new LineInfoParam(); diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java index 532004f..a8ea7b7 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java +++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java @@ -139,7 +139,8 @@ public class StatServiceImpl implements IStatService { } boolean flag = Objects.equals(DicDataEnum.DEV_CLD.getCode(), code) && Objects.equals(po.getDevAccessMethod(), "CLD"); int clDid = flag?1:appAutoDataMessage.getMsg().getClDid(); - String key = AppRedisKey.DEV_MODEL.concat(dataArrayParam.getId() + dataArrayParam.getDid() + clDid + dataArrayParam.getStatMethod() + dataArrayParam.getIdx()); +// String key = AppRedisKey.DEV_MODEL.concat(dataArrayParam.getId() + dataArrayParam.getDid() + clDid + dataArrayParam.getStatMethod() + dataArrayParam.getIdx()); + String key = AppRedisKey.DEV_MODEL.concat(dataArrayParam.getId() + dataArrayParam.getDid() + clDid + dataArrayParam.getIdx()); Object object = redisUtil.getObjectByKey(key); List dataArrayList; if (Objects.isNull(object)){