liuyaowen пре 9 месеци
родитељ
комит
48718a8d95

+ 2 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/domain/resvo/IotWarnconfigResVo.java

@@ -7,4 +7,6 @@ import lombok.Data;
 public class IotWarnconfigResVo extends IotWarnconfig {
     private String devtypeName;
     private String wpChannel;
+    private String wcTouchtypeName;
+    private String wcLevelName;
 }

+ 4 - 0
src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotWarnconfigServiceImpl.java

@@ -9,6 +9,8 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictEnum;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnconfig;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnindicator;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import com.yunfeiyun.agmp.iot.common.enums.warn.IotWarnTouchTypeEnum;
+import com.yunfeiyun.agmp.iot.common.enums.warn.IotWarnlevelEnum;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnconfigAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnconfigEditReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnconfigResVo;
@@ -66,6 +68,8 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
         List<IotWarnconfigResVo> iotWarnconfigResVoList = iotWarnconfigMapper.selectIotWarnconfigResVoList(iotWarnconfig);
         for(IotWarnconfigResVo iotWarnconfigResVo : iotWarnconfigResVoList){
             iotWarnconfigResVo.setDevtypeName(IotDeviceDictEnum.getNameByCode(iotWarnconfigResVo.getDevtypeBid()));
+            iotWarnconfigResVo.setWcTouchtypeName(IotWarnTouchTypeEnum.findByCode(iotWarnconfigResVo.getWcTouchtype()).getContent());
+            iotWarnconfigResVo.setWcLevelName(IotWarnlevelEnum.findByCode(iotWarnconfigResVo.getWcLevel()).getContent());
         }
         return iotWarnconfigResVoList;
     }