|
|
@@ -17,6 +17,7 @@ import com.yunfeiyun.agmp.iot.common.domain.*;
|
|
|
import com.yunfeiyun.agmp.iot.common.enums.warn.IotWarnTouchTypeEnum;
|
|
|
import com.yunfeiyun.agmp.iot.common.enums.warn.IotWarnlevelEnum;
|
|
|
import com.yunfeiyun.agmp.iot.common.util.dev.DevTypeUtil;
|
|
|
+import com.yunfeiyun.agmp.iot.common.util.dev.QxElementTypeUtil;
|
|
|
import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseFunReqVo;
|
|
|
import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
|
|
|
import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceCommonService;
|
|
|
@@ -323,7 +324,10 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
|
|
|
}
|
|
|
|
|
|
for (IotWarnindicator iotWarnindicator : iotWarnindicatorList) {
|
|
|
- if (wiCodeSet.contains(iotWarnindicator.getWiCode())) {
|
|
|
+ String wiCode = iotWarnindicator.getWiCode();
|
|
|
+ if (wiCodeSet.contains(wiCode)) {
|
|
|
+ String typeName = QxElementTypeUtil.getTypeName(wiCode);
|
|
|
+ iotWarnindicator.setTypeName(typeName);
|
|
|
resultIotWarnIndicatorList.add(iotWarnindicator);
|
|
|
}
|
|
|
}
|