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

influxDb的EntData实体依赖版本更换

Browse Source
This commit is contained in:
guofeihu
2024-08-06 14:21:51 +08:00
parent 50489fc21f
commit 48ee232a0b
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
View File

@@ -270,14 +270,15 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
commonQueryParam.setTableName(getTableNameByClassId(epdPqd.getClassId())); commonQueryParam.setTableName(getTableNameByClassId(epdPqd.getClassId()));
commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency())); commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency()));
commonQueryParam.setPhasic(epdPqd.getPhase()); commonQueryParam.setPhasic(epdPqd.getPhase());
commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime()); //commonQueryParam.setStartTime(commonStatisticalQueryParam.getStartTime());
commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime()); //commonQueryParam.setEndTime(commonStatisticalQueryParam.getEndTime());
commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType()); commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType());
commonQueryParam.setProcess(data1.get(0).getProcess()+""); commonQueryParam.setProcess(data1.get(0).getProcess()+"");
commonQueryParam.setClDid(getClDidByLineId(temp.getLineId())); commonQueryParam.setClDid(getClDidByLineId(temp.getLineId()));
return commonQueryParam; return commonQueryParam;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams); //List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtData(commonQueryParams);
List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> { List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
ThdDataVO vo = new ThdDataVO(); ThdDataVO vo = new ThdDataVO();
vo.setLineId(temp.getLineId()); vo.setLineId(temp.getLineId());

19
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java
View File

@@ -258,34 +258,33 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
csEventPO.setProcess(data1.get(0).getProcess()); csEventPO.setProcess(data1.get(0).getProcess());
csEventPOS.add(csEventPO); csEventPOS.add(csEventPO);
EntData entData = new EntData(); EntData entData = new EntData();
entData.setLineId(uploadDataParam.getLineId());
entData.setTime(newTaglogbuffer.getStart().toInstant(ZoneOffset.UTC)); entData.setTime(newTaglogbuffer.getStart().toInstant(ZoneOffset.UTC));
for(NewBodyTaglogbuffer newBodyTaglogbuffer : newTaglogbuffer.getNewBodyTaglogbuffers()){ for(NewBodyTaglogbuffer newBodyTaglogbuffer : newTaglogbuffer.getNewBodyTaglogbuffers()){
if(newBodyTaglogbuffer.getParaCode() == 0) entData.setEvtVvadepth(newBodyTaglogbuffer.getParaValue()/65536D); if(newBodyTaglogbuffer.getParaCode() == 0) entData.setEvtParamVVaDepth(newBodyTaglogbuffer.getParaValue()/65536D);
if(newBodyTaglogbuffer.getParaCode() == 1) entData.setEvtVvatm(newBodyTaglogbuffer.getParaValue()/65536D); if(newBodyTaglogbuffer.getParaCode() == 1) entData.setEvtParamTm(newBodyTaglogbuffer.getParaValue()/65536D);
if(newBodyTaglogbuffer.getParaCode() == 5) { if(newBodyTaglogbuffer.getParaCode() == 5) {
int code = newBodyTaglogbuffer.getParaValue()/65536; int code = newBodyTaglogbuffer.getParaValue()/65536;
switch (code){ switch (code){
case 0: case 0:
entData.setEvtVvaphase("A"); entData.setEvtParamPhase("A");
break; break;
case 1: case 1:
entData.setEvtVvaphase("B"); entData.setEvtParamPhase("B");
break; break;
case 2: case 2:
entData.setEvtVvaphase("C"); entData.setEvtParamPhase("C");
break; break;
case 3: case 3:
entData.setEvtVvaphase("AB"); entData.setEvtParamPhase("AB");
break; break;
case 4: case 4:
entData.setEvtVvaphase("BC"); entData.setEvtParamPhase("BC");
break; break;
case 5: case 5:
entData.setEvtVvaphase("CA"); entData.setEvtParamPhase("CA");
break; break;
case 6: case 6:
entData.setEvtVvaphase("ABC"); entData.setEvtParamPhase("ABC");
break; break;
} }
} }