Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

治理指标字典功能调整

Browse Source
This commit is contained in:
xuyang
2023-08-29 22:24:54 +08:00
parent c84468884a
commit 5d733e5e3f
2 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
View File

@@ -58,8 +58,13 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
} }
//日志实体 //日志实体
DeviceLogDTO logDto = new DeviceLogDTO(); DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserName(RequestUtil.getUserNickname()); try{
logDto.setLoginName(RequestUtil.getUsername()); logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
} catch (Exception e) {
logDto.setUserName("redis失效存储");
logDto.setLoginName(null);
}
logDto.setResult(1); logDto.setResult(1);
//判断失效的key是否为MQTT消费端存入的 //判断失效的key是否为MQTT消费端存入的
String expiredKey = message.toString(); String expiredKey = message.toString();

52
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -236,19 +236,28 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
EleEpdPqd po = epdFeignClient.add(eleEpdPqdParam).getData(); EleEpdPqd po = epdFeignClient.add(eleEpdPqdParam).getData();
if (CollectionUtil.isNotEmpty(evt.getParam())){ if (CollectionUtil.isNotEmpty(evt.getParam())){
evt.getParam().forEach(param->{ 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 eleEvtParam = new EleEvtParam();
eleEvtParam.setPid(po.getId()); eleEvtParam.setPid(po.getId());
eleEvtParam.setData(param.getData()); eleEvtParam.setData(param.getData());
eleEvtParam.setName(param.getName()); 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.setType(param.getType());
eleEvtParam.setUnit(param.getUnit()); eleEvtParam.setUnit(param.getUnit());
eleEvtFeignClient.add(eleEvtParam); eleEvtFeignClient.add(eleEvtParam);
@@ -440,6 +449,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
List<EpdPqdDto> pqdDto = templateDto.getPqdDto(); List<EpdPqdDto> pqdDto = templateDto.getPqdDto();
pqdDto.forEach(pqd->{ pqdDto.forEach(pqd->{
String id = dicDataFeignClient.getDicDataByCode(item).getData().getId(); String id = dicDataFeignClient.getDicDataByCode(item).getData().getId();
String classId = dicDataFeignClient.getDicDataByCode(DataModel.PQD_DATA).getData().getId(); String classId = dicDataFeignClient.getDicDataByCode(DataModel.PQD_DATA).getData().getId();
List<EleEpdPqd> list = epdFeignClient.judgeExist(pqd.getName(),id).getData(); List<EleEpdPqd> list = epdFeignClient.judgeExist(pqd.getName(),id).getData();
if (CollectionUtil.isEmpty(list)){ if (CollectionUtil.isEmpty(list)){
@@ -584,6 +594,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
List<WaveDto> waveDto = templateDto.getWaveDto(); List<WaveDto> waveDto = templateDto.getWaveDto();
waveDto.forEach(wave->{ waveDto.forEach(wave->{
String id = dicDataFeignClient.getDicDataByCode(item).getData().getId(); String id = dicDataFeignClient.getDicDataByCode(item).getData().getId();
String classId = dicDataFeignClient.getDicDataByCode(DataModel.INSET_DATA).getData().getId();
List<EleEpdPqd> list = epdFeignClient.judgeExist(wave.getName(),id).getData(); List<EleEpdPqd> list = epdFeignClient.judgeExist(wave.getName(),id).getData();
if (CollectionUtil.isEmpty(list)){ if (CollectionUtil.isEmpty(list)){
EleEpdPqdParam eleEpdPqdParam = new EleEpdPqdParam(); EleEpdPqdParam eleEpdPqdParam = new EleEpdPqdParam();
@@ -593,17 +604,10 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
eleEpdPqdParam.setSort(wave.getIdx()); eleEpdPqdParam.setSort(wave.getIdx());
eleEpdPqdParam.setDataType(id); eleEpdPqdParam.setDataType(id);
eleEpdPqdParam.setPhase("M"); eleEpdPqdParam.setPhase("M");
eleEpdPqdParam.setClassId(classId);
EleEpdPqd po = epdFeignClient.add(eleEpdPqdParam).getData(); EleEpdPqd po = epdFeignClient.add(eleEpdPqdParam).getData();
if (CollectionUtil.isNotEmpty(wave.getParam())){ if (CollectionUtil.isNotEmpty(wave.getParam())){
wave.getParam().forEach(param->{ 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 csWaveParam = new CsWaveParam();
csWaveParam.setPid(po.getId()); csWaveParam.setPid(po.getId());
@@ -613,6 +617,22 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
waveFeignClient.add(csWaveParam); 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; break;