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

优化

Browse Source
This commit is contained in:
xy
2024-10-15 18:30:27 +08:00
parent 3059f5ac75
commit eb7a1d9beb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
List<CsDataSet> list = this.lambdaQuery() List<CsDataSet> list = this.lambdaQuery()
.eq(CsDataSet::getPid,modelId) .eq(CsDataSet::getPid,modelId)
.eq(CsDataSet::getClDev,clDev) .eq(CsDataSet::getClDev,clDev)
.eq(CsDataSet::getDataType,"Rt") .and(i->i.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType))
.list(); .list();
return list.stream().min(Comparator.comparingInt(CsDataSet::getIdx)).get(); return list.stream().min(Comparator.comparingInt(CsDataSet::getIdx)).get();
} }
@@ -73,7 +73,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
LambdaQueryWrapper<CsDataSet> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CsDataSet> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CsDataSet::getPid,modelId) wrapper.eq(CsDataSet::getPid,modelId)
.eq(CsDataSet::getClDev,clDev) .eq(CsDataSet::getClDev,clDev)
.eq(CsDataSet::getDataType,"Rt"); .and(i->i.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType));
//谐波电压含有率 //谐波电压含有率
if (target == 0) { if (target == 0) {
wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$01"); wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$01");

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

@@ -363,7 +363,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
//趋势数据tab //趋势数据tab
DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO(); DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO();
dataSetVo3.setId(item.getId()); dataSetVo3.setId(item.getId());
dataSetVo3.setName("历史趋势数据"); dataSetVo3.setName("历史趋势");
dataSetVo3.setType("trenddata"); dataSetVo3.setType("trenddata");
dataSetList.add(dataSetVo3); dataSetList.add(dataSetVo3);
//实时数据tab //实时数据tab