diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java index f16c189..f1a8be0 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java @@ -77,11 +77,11 @@ public class CsDataSetServiceImpl extends ServiceImpli.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType)); //谐波电压含有率 if (target == 0) { - wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$01"); + wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$0".concat(clDev.toString())); } else if (target == 1) { - wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmI$01"); + wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmI$0".concat(clDev.toString())); } else if (target == 2) { - wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$InHarmV$01"); + wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$InHarmV$0".concat(clDev.toString())); } return this.baseMapper.selectOne(wrapper); }