From 5d733e5e3f966238913337d6699977c2bea735f9 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 29 Aug 2023 22:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=A0=87=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/RedisKeyExpirationListener.java | 9 +++- .../service/impl/CsDevModelServiceImpl.java | 52 +++++++++++++------ 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java index 2830b29..4d0d0ca 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java @@ -58,8 +58,13 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene } //日志实体 DeviceLogDTO logDto = new DeviceLogDTO(); - logDto.setUserName(RequestUtil.getUserNickname()); - logDto.setLoginName(RequestUtil.getUsername()); + try{ + logDto.setUserName(RequestUtil.getUsername()); + logDto.setLoginName(RequestUtil.getLoginName()); + } catch (Exception e) { + logDto.setUserName("redis失效存储"); + logDto.setLoginName(null); + } logDto.setResult(1); //判断失效的key是否为MQTT消费端存入的 String expiredKey = message.toString(); diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java index 9483e2f..f85152d 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java @@ -236,19 +236,28 @@ public class CsDevModelServiceImpl implements ICsDevModelService { EleEpdPqd po = epdFeignClient.add(eleEpdPqdParam).getData(); if (CollectionUtil.isNotEmpty(evt.getParam())){ evt.getParam().forEach(param->{ - //录入字典表 - eleEpdPqdParam.setName(param.getName()); - eleEpdPqdParam.setOtherName(param.getName()); - eleEpdPqdParam.setShowName(param.getName()); - eleEpdPqdParam.setSort(evt.getIdx()); - eleEpdPqdParam.setDataType(id); - eleEpdPqdParam.setPhase("M"); - epdFeignClient.add(eleEpdPqdParam).getData(); //录入关系表 EleEvtParam eleEvtParam = new EleEvtParam(); eleEvtParam.setPid(po.getId()); eleEvtParam.setData(param.getData()); eleEvtParam.setName(param.getName()); + eleEvtParam.setShowName(param.getName()); + eleEvtParam.setType(param.getType()); + eleEvtParam.setUnit(param.getUnit()); + eleEvtFeignClient.add(eleEvtParam); + }); + } + } else { + //删除记录,重新录入 + String dictId = list.get(0).getId(); + eleEvtFeignClient.delete(dictId); + if (CollectionUtil.isNotEmpty(evt.getParam())){ + evt.getParam().forEach(param->{ + //录入关系表 + EleEvtParam eleEvtParam = new EleEvtParam(); + eleEvtParam.setPid(dictId); + eleEvtParam.setData(param.getData()); + eleEvtParam.setName(param.getName()); eleEvtParam.setType(param.getType()); eleEvtParam.setUnit(param.getUnit()); eleEvtFeignClient.add(eleEvtParam); @@ -440,6 +449,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService { List pqdDto = templateDto.getPqdDto(); pqdDto.forEach(pqd->{ String id = dicDataFeignClient.getDicDataByCode(item).getData().getId(); + String classId = dicDataFeignClient.getDicDataByCode(DataModel.PQD_DATA).getData().getId(); List list = epdFeignClient.judgeExist(pqd.getName(),id).getData(); if (CollectionUtil.isEmpty(list)){ @@ -584,6 +594,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService { List waveDto = templateDto.getWaveDto(); waveDto.forEach(wave->{ String id = dicDataFeignClient.getDicDataByCode(item).getData().getId(); + String classId = dicDataFeignClient.getDicDataByCode(DataModel.INSET_DATA).getData().getId(); List list = epdFeignClient.judgeExist(wave.getName(),id).getData(); if (CollectionUtil.isEmpty(list)){ EleEpdPqdParam eleEpdPqdParam = new EleEpdPqdParam(); @@ -593,17 +604,10 @@ public class CsDevModelServiceImpl implements ICsDevModelService { eleEpdPqdParam.setSort(wave.getIdx()); eleEpdPqdParam.setDataType(id); eleEpdPqdParam.setPhase("M"); + eleEpdPqdParam.setClassId(classId); EleEpdPqd po = epdFeignClient.add(eleEpdPqdParam).getData(); if (CollectionUtil.isNotEmpty(wave.getParam())){ wave.getParam().forEach(param->{ - //录入字典表 - eleEpdPqdParam.setName(param.getName()); - eleEpdPqdParam.setOtherName(param.getName()); - eleEpdPqdParam.setShowName(param.getName()); - eleEpdPqdParam.setSort(wave.getIdx()); - eleEpdPqdParam.setDataType(id); - eleEpdPqdParam.setPhase("M"); - epdFeignClient.add(eleEpdPqdParam); //录入关系表 CsWaveParam csWaveParam = new CsWaveParam(); csWaveParam.setPid(po.getId()); @@ -613,6 +617,22 @@ public class CsDevModelServiceImpl implements ICsDevModelService { waveFeignClient.add(csWaveParam); }); } + } else { + //删除记录,重新录入 + String dictId = list.get(0).getId(); + waveFeignClient.delete(dictId); + if (CollectionUtil.isNotEmpty(wave.getParam())){ + wave.getParam().forEach(param->{ + //录入关系表 + CsWaveParam csWaveParam = new CsWaveParam(); + csWaveParam.setPid(dictId); + csWaveParam.setName(param.getName()); + csWaveParam.setShowName(param.getName()); + csWaveParam.setType(param.getType()); + csWaveParam.setData(param.getData().toString()); + waveFeignClient.add(csWaveParam); + }); + } } }); break;