新增告警规则复制接口，状态编辑接口，编辑详情查询接口

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotWarnconfigController.java

@@ -1,15 +1,18 @@
 package com.yunfeiyun.agmp.iotm.web.controller;
 
 import com.yunfeiyun.agmp.common.annotation.Log;
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
+import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnconfig;
-import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnconfigEditReqVo;
 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;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnconfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +46,21 @@ public class IotWarnconfigController extends BaseController{
         List<IotWarnconfigResVo> list = iotWarnconfigService.selectIotWarnconfigResVoList(iotWarnconfig);
         return getDataTable(list);
     }
+    @PreAuthorize("@ss.hasPermi('iot:warn:config:list')")
+    @GetMapping("/dev/info/{devBids}")
+    public AjaxResult devConfigInfo(@PathVariable String[] devBids){
+        return AjaxResult.success(iotWarnconfigService.devConfigInfo(devBids));
+    }
 
+    @PreAuthorize("@ss.hasPermi('iot:warn:config:add')")
+    @PostMapping("/copy")
+    @Log(title = "告警配置复制", businessType = BusinessType.INSERT)
+    public AjaxResult copy(@RequestBody IotWarnconfig iotWarnconfig){
+        if(StringUtils.isEmpty(iotWarnconfig.getWcBid())){
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(),"告警规则标识不能为空");
+        }
+        return AjaxResult.success(iotWarnconfigService.copy(iotWarnconfig.getWcBid()));
+    }
     /**
      * 导出告警配置列表
      */
@@ -86,6 +103,20 @@ public class IotWarnconfigController extends BaseController{
         iotWarnconfigEditReqVo.setTid(SecurityUtils.getTid());
         return toAjax(iotWarnconfigService.edit(iotWarnconfigEditReqVo));
     }
+    /**
+     * 修改告警配置
+     */
+    @PreAuthorize("@ss.hasPermi('iot:warn:config:edit')")
+    @Log(title = "告警配置", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit/status")
+    public AjaxResult edit(@RequestBody IotWarnconfig iotWarnconfig){
+        IotWarnconfig updateObject = new IotWarnconfig();
+        updateObject.setWcBid(iotWarnconfig.getWcBid());
+        updateObject.setWcStatus(iotWarnconfig.getWcStatus());
+        updateObject.setTid(SecurityUtils.getTid());
+        return toAjax(iotWarnconfigService.editStatus(updateObject));
+    }
+
 
     /**
      * 删除告警配置

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotWarnobjectController.java

@@ -8,6 +8,7 @@ import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnobjectResVo;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnobjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,10 +38,9 @@ public class IotWarnobjectController extends BaseController{
     public TableDataInfo list(IotWarnobject iotWarnobject){
         iotWarnobject.setTid(SecurityUtils.getTid());
         startPage();
-        List<IotWarnobject> list = iotWarnobjectService.selectIotWarnobjectList(iotWarnobject);
+        List<IotWarnobjectResVo> list = iotWarnobjectService.selectIotWarnobjectResVoList(iotWarnobject);
         return getDataTable(list);
     }
-
     /**
      * 导出告警对象列表
      */

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/reqvo/IotWarnconfigAddReqVo.java

@@ -10,8 +10,8 @@ import java.util.List;
 @Data
 public class IotWarnconfigAddReqVo extends IotWarnconfig {
     /**告警对象*/
-    private List<IotWarnobject> iotWarnobjects;
+    private List<IotWarnobject> iotWarnobjectList;
     /**告警指标（告警条件）*/
-    private List<IotWarnindicator> IotWarnindicator;
+    private List<IotWarnindicator> iotWarnindicatorList;
 
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/domain/resvo/IotWarnobjectResVo.java

@@ -0,0 +1,9 @@
+package com.yunfeiyun.agmp.iotm.web.domain.resvo;
+
+import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import lombok.Data;
+
+@Data
+public class IotWarnobjectResVo extends IotWarnobject {
+    private String devName;
+}

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/IotDeviceMapper.java

@@ -5,6 +5,7 @@ import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotHomeDeviceStatResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotHomeTypeStatResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -66,4 +67,6 @@ public interface IotDeviceMapper
     public List<IotHomeTypeStatResVo> selectHomeDeviceTypeStat(IotDevice iotDevice);
 
     public IotHomeDeviceStatResVo selectHomeDeviceStatusStat(IotDevice iotDevice);
+
+    List<IotDevice> selectIotDeviceByDevBids(@Param("list") List<String> devBids,@Param("tid") String tid);
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/mapper/IotWarnobjectMapper.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.iotm.web.mapper;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnobjectResVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -60,4 +61,6 @@ public interface IotWarnobjectMapper {
      * @return 结果
      */
     public int deleteIotWarnobjectByWoBids(@Param("array") String[] ids, @Param("tid") String tid);
+
+    List<IotWarnobjectResVo> selectIotWarnobjectResVoList(IotWarnobject iotWarnobject);
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotWarnconfigService.java

@@ -1,5 +1,6 @@
 package com.yunfeiyun.agmp.iotm.web.service;
 
+import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnconfig;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnconfigAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnconfigEditReqVo;
@@ -72,4 +73,10 @@ public interface IIotWarnconfigService {
     int edit(@Valid IotWarnconfigEditReqVo iotWarnconfigEditReqVo);
 
     IotWarnconfigInfoResVo info(String wcBid, String tid);
+
+    IotDeviceconfig devConfigInfo(String[] devBids);
+
+    IotWarnconfig copy(String wcBid);
+
+    int editStatus(IotWarnconfig updateObject);
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotWarnobjectService.java

@@ -1,6 +1,7 @@
 package com.yunfeiyun.agmp.iotm.web.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnobjectResVo;
 
 import java.util.List;
 
@@ -22,13 +23,21 @@ public interface IIotWarnobjectService {
 
     /**
      * 查询告警对象列表
-     * 
+     *
      * @param iotWarnobject 告警对象
      * @return 告警对象集合
      */
     public List<IotWarnobject> selectIotWarnobjectList(IotWarnobject iotWarnobject);
 
     /**
+     * 查询告警对象列表
+     *
+     * @param iotWarnobject 告警对象
+     * @return 告警对象集合
+     */
+    public List<IotWarnobjectResVo> selectIotWarnobjectResVoList(IotWarnobject iotWarnobject);
+
+    /**
      * 新增告警对象
      * 
      * @param iotWarnobject 告警对象

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotWarnconfigServiceImpl.java

@@ -1,23 +1,22 @@
 package com.yunfeiyun.agmp.iotm.web.service.impl;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
+import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 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.domain.*;
 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.IotWarnconfigInfoResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnconfigResVo;
-import com.yunfeiyun.agmp.iotm.web.mapper.IotWarnconfigMapper;
-import com.yunfeiyun.agmp.iotm.web.mapper.IotWarnindicatorMapper;
-import com.yunfeiyun.agmp.iotm.web.mapper.IotWarnobjectMapper;
+import com.yunfeiyun.agmp.iotm.web.mapper.*;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnconfigService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -26,6 +25,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -43,6 +44,11 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
     private IotWarnobjectMapper iotWarnobjectMapper;
     @Resource
     private IotWarnindicatorMapper iotWarnindicatorMapper;
+    @Resource
+    private IotDeviceMapper iotDeviceMapper;
+    @Resource
+    private IotDeviceconfigMapper iotDeviceconfigMapper;
+
     /**
      * 查询告警配置
      * 
@@ -132,7 +138,7 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
         iotWarnconfigAddReqVo.setWcCreator(SecurityUtils.getUserId());
 
         // 获取告警对象
-        List<IotWarnobject> warnobjects = iotWarnconfigAddReqVo.getIotWarnobjects();
+        List<IotWarnobject> warnobjects = iotWarnconfigAddReqVo.getIotWarnobjectList();
         for(IotWarnobject iotWarnobject : warnobjects){
             iotWarnobject.setWoBid(iotWarnobject.getUUId());
             iotWarnobject.setWcBid(iotWarnconfigAddReqVo.getWcBid());
@@ -141,7 +147,7 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
         }
 
         // 获取告警规则
-        List<IotWarnindicator> iotWarnindicatorList = iotWarnconfigAddReqVo.getIotWarnindicator();
+        List<IotWarnindicator> iotWarnindicatorList = iotWarnconfigAddReqVo.getIotWarnindicatorList();
         for(IotWarnindicator iotWarnindicator : iotWarnindicatorList){
             iotWarnindicator.setWiBid(iotWarnindicator.getUUId());
             iotWarnindicator.setWcBid(iotWarnconfigAddReqVo.getWcBid());
@@ -171,7 +177,9 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
         // 老数据中存在，新数据中不存在，代表被删除的数据
         Collection<IotWarnobject> deleteData = CollectionUtils.subtract(oldWarnObjectList,differ);
         String[] woBids = deleteData.stream().map(IotWarnobject::getWoBid).toArray(String[]::new);
-        iotWarnobjectMapper.deleteIotWarnobjectByWoBids(woBids, SecurityUtils.getTid());
+        if(woBids.length>0){
+            iotWarnobjectMapper.deleteIotWarnobjectByWoBids(woBids, SecurityUtils.getTid());
+        }
         // 老数据中不存在，新数据中存在，代表新增的数据
         Collection<IotWarnobject> addData = CollectionUtils.subtract(iotWarnconfigEditReqVo.getIotWarnobjectList(),differ);
         for(IotWarnobject addWarnObject : addData){
@@ -206,4 +214,96 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
         iotWarnconfigInfoResVo.setIotWarnobjectList(iotWarnobjectList);
         return iotWarnconfigInfoResVo;
     }
+
+    @Override
+    public IotDeviceconfig devConfigInfo(String[] devBids) {
+        List<String> devBidList = Arrays.asList(devBids);
+        List<IotDevice> iotDeviceList = iotDeviceMapper.selectIotDeviceByDevBids(devBidList,SecurityUtils.getTid());
+        if(iotDeviceList.isEmpty()){
+           return null;
+        }
+        IotDevice first = iotDeviceList.get(0);
+        if(IotDeviceDictConst.TYPE_YF_QXZ.equals(first.getDevtypeBid())) {
+           return getDevConfigByMaxAttr(devBidList,"interval",Integer.class);
+        }
+        return null;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public IotWarnconfig copy(String wcBid) {
+        // 查询告警规则
+        IotWarnconfig iotWarnconfig = iotWarnconfigMapper.selectIotWarnconfigByWcBid(wcBid,SecurityUtils.getTid());
+        if(null == iotWarnconfig){
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(),"告警规则不存在");
+        }
+        // 查询告警对象
+        IotWarnobject iotWarnobjectQuery = new IotWarnobject();
+        iotWarnobjectQuery.setTid(SecurityUtils.getTid());
+        iotWarnobjectQuery.setWcBid(wcBid);
+        List<IotWarnobject> iotWarnobjectList = iotWarnobjectMapper.selectIotWarnobjectList(iotWarnobjectQuery);
+        // 查询告警策略
+        IotWarnindicator iotWarnindicatorQuery = new IotWarnindicator();
+        iotWarnindicatorQuery.setTid(SecurityUtils.getTid());
+        iotWarnindicatorQuery.setWcBid(wcBid);
+        List<IotWarnindicator> iotWarnindicatorList = iotWarnindicatorMapper.selectIotWarnindicatorList(iotWarnindicatorQuery);
+        // 重新赋值
+        iotWarnconfig.setWcBid(iotWarnconfig.getUUId());
+        iotWarnconfig.setWcCreateddate(DateUtils.dateTimeNow());
+        iotWarnconfig.setWcCreator(SecurityUtils.getUserId());
+        iotWarnconfig.setWcModifieddate(null);
+        iotWarnconfig.setWcModifier(null);
+        for(IotWarnobject iotWarnobject : iotWarnobjectList){
+            iotWarnobject.setWcBid(iotWarnconfig.getWcBid());
+            iotWarnobject.setWoBid(iotWarnobject.getUUId());
+            iotWarnobjectMapper.insertIotWarnobject(iotWarnobject);
+        }
+        for(IotWarnindicator iotWarnindicator : iotWarnindicatorList){
+            iotWarnindicator.setWcBid(iotWarnconfig.getWcBid());
+            iotWarnindicator.setWdBid(iotWarnindicator.getUUId());
+            iotWarnindicator.setWiCreateddate(DateUtils.dateTimeNow());
+            iotWarnindicator.setWiCreator(SecurityUtils.getUserId());
+            iotWarnindicator.setWiModifieddate(null);
+            iotWarnindicator.setWiModifier(null);
+            iotWarnindicatorMapper.insertIotWarnindicator(iotWarnindicator);
+        }
+        iotWarnconfigMapper.insertIotWarnconfig(iotWarnconfig);
+        return iotWarnconfig;
+    }
+
+    @Override
+    public int editStatus(IotWarnconfig updateObject) {
+        return iotWarnconfigMapper.updateIotWarnconfig(updateObject);
+    }
+
+    // 根据最大值获取配置
+    private IotDeviceconfig getDevConfigByMaxAttr(List<String> devBidList,String attr,Class attrType){
+        List<IotDeviceconfig> iotDeviceconfigs = iotDeviceconfigMapper.selectIotDeviceConfigByDevBidList(devBidList);
+        if(iotDeviceconfigs.isEmpty()){
+            return null;
+        }
+        IotDeviceconfig result = null;
+        JSONObject resultConfig = new JSONObject();
+        for(IotDeviceconfig iotDeviceconfig : iotDeviceconfigs){
+            String configContext = iotDeviceconfig.getDevcfgContext();
+            if(JSON.isValidObject(configContext)){
+                JSONObject config = JSONObject.parseObject(configContext);
+                Object value = config.get(attr);
+                Object resultConfigValue = resultConfig.get(attr);
+                if(null != resultConfigValue&&null != value){
+                    // 数字类型的比较
+                    if(attrType.equals(Integer.class)){
+                        if(new BigDecimal(String.valueOf(value)).compareTo(new BigDecimal(String.valueOf(resultConfigValue))) >= 1){
+                            resultConfig = config;
+                            result = iotDeviceconfig;
+                        }
+                    }
+                } else if (value != null ){
+                    resultConfig = config;
+                    result = iotDeviceconfig;
+                }
+            }
+        }
+        return result;
+    }
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotWarnobjectServiceImpl.java

@@ -1,12 +1,20 @@
 package com.yunfeiyun.agmp.iotm.web.service.impl;
 
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnobjectResVo;
+import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotWarnobjectMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnobjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 告警对象Service业务层处理
@@ -18,7 +26,8 @@ import java.util.List;
 public class IotWarnobjectServiceImpl implements IIotWarnobjectService {
     @Autowired
     private IotWarnobjectMapper iotWarnobjectMapper;
-
+    @Resource
+    private IotDeviceMapper iotDeviceMapper;
     /**
      * 查询告警对象
      * 
@@ -32,7 +41,7 @@ public class IotWarnobjectServiceImpl implements IIotWarnobjectService {
 
     /**
      * 查询告警对象列表
-     * 
+     *
      * @param iotWarnobject 告警对象
      * @return 告警对象
      */
@@ -40,6 +49,30 @@ public class IotWarnobjectServiceImpl implements IIotWarnobjectService {
     public List<IotWarnobject> selectIotWarnobjectList(IotWarnobject iotWarnobject){
         return iotWarnobjectMapper.selectIotWarnobjectList(iotWarnobject);
     }
+    /**
+     * 查询告警对象列表
+     *
+     * @param iotWarnobject 告警对象
+     * @return 告警对象
+     */
+    @Override
+    public List<IotWarnobjectResVo> selectIotWarnobjectResVoList(IotWarnobject iotWarnobject){
+        List<IotWarnobjectResVo> warnobjectList = iotWarnobjectMapper.selectIotWarnobjectResVoList(iotWarnobject);
+        Map<String,IotWarnobjectResVo> iotWarnobjectResVoMap = new HashMap<>();
+        List<String> devBids = new ArrayList<>();
+        for(IotWarnobjectResVo iotWarnobjectResVo : warnobjectList){
+            iotWarnobjectResVoMap.put(iotWarnobjectResVo.getDevBid(),iotWarnobjectResVo);
+            devBids.add(iotWarnobjectResVo.getDevBid());
+        }
+        List<IotDevice> iotDeviceList = iotDeviceMapper.selectIotDeviceByDevBids(devBids, SecurityUtils.getTid());
+        for(IotDevice iotDevice : iotDeviceList){
+            IotWarnobjectResVo iotWarnobjectResVo = iotWarnobjectResVoMap.get(iotDevice.getDevBid());
+            if(null != iotWarnobjectResVo){
+                iotWarnobjectResVo.setDevName(iotDevice.getDevName());
+            }
+        }
+        return warnobjectList;
+    }
 
     /**
      * 新增告警对象

src/main/resources/mapper/IotDeviceMapper.xml

@@ -315,5 +315,16 @@
             )
     </select>
 
+    <select id="selectIotDeviceByDevBids" resultType="com.yunfeiyun.agmp.iot.common.domain.IotDevice">
+        select * from IotDevice
+        <where>
+            devBid in
+            <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            and tid = #{tid}
+        </where>
+    </select>
+
 
 </mapper>

src/main/resources/mapper/IotWarnindicatorMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wiCode"    column="wiCode"    />
         <result property="wiName"    column="wiName"    />
         <result property="wiUnit"    column="wiUnit"    />
+        <result property="wiStatus"    column="wiStatus"    />
 
         <result property="wiExpression"    column="wiExpression"    />
         <result property="wiValue"    column="wiValue"    />
@@ -25,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectIotWarnindicatorVo">
-        select id, wiBid, wcBid, wdBid, wiAddress, wiCode, wiName, wiUnit,wiExpression, wiValue, wiCreator, wiCreateddate, wiModifieddate, wiModifier, tid from IotWarnindicator
+        select id, wiBid, wcBid, wdBid, wiAddress, wiCode, wiName, wiUnit,wiStatus,wiExpression, wiValue, wiCreator, wiCreateddate, wiModifieddate, wiModifier, tid from IotWarnindicator
     </sql>
 
     <select id="selectIotWarnindicatorList" parameterType="IotWarnindicator" resultMap="IotWarnindicatorResult">
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiCode != null  and wiCode != ''"> and wiCode = #{wiCode}</if>
             <if test="wiName != null  and wiName != ''"> and wiName = #{wiName}</if>
             <if test="wiUnit != null  and wiUnit != ''"> and wiUnit = #{wiUnit}</if>
+            <if test="wiStatus != null  and wiStatus != ''"> and wiStatus = #{wiStatus}</if>
             <if test="wiExpression != null  and wiExpression != ''"> and wiExpression = #{wiExpression}</if>
             <if test="wiValue != null  and wiValue != ''"> and wiValue = #{wiValue}</if>
             <if test="wiCreator != null  and wiCreator != ''"> and wiCreator = #{wiCreator}</if>
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiCode != null">wiCode,</if>
             <if test="wiName != null">wiName,</if>
             <if test="wiUnit != null">wiUnit,</if>
+            <if test="wiStatus != null">wiStatus,</if>
             <if test="wiExpression != null">wiExpression,</if>
             <if test="wiValue != null">wiValue,</if>
             <if test="wiCreator != null">wiCreator,</if>
@@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiCode != null">#{wiCode},</if>
             <if test="wiName != null">#{wiName},</if>
             <if test="wiUnit != null">#{wiUnit},</if>
+            <if test="wiStatus != null">#{wiStatus},</if>
             <if test="wiExpression != null">#{wiExpression},</if>
             <if test="wiValue != null">#{wiValue},</if>
             <if test="wiCreator != null">#{wiCreator},</if>
@@ -99,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiCode != null">wiCode = #{wiCode},</if>
             <if test="wiName != null">wiName = #{wiName},</if>
             <if test="wiUnit != null">wiUnit = #{wiUnit},</if>
+            <if test="wiStatus != null">wiStatus = #{wiStatus},</if>
             <if test="wiExpression != null">wiExpression = #{wiExpression},</if>
             <if test="wiValue != null">wiValue = #{wiValue},</if>
             <if test="wiCreator != null">wiCreator = #{wiCreator},</if>

src/main/resources/mapper/IotWarnobjectMapper.xml

@@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="woBid"    column="woBid"    />
         <result property="wcBid"    column="wcBid"    />
-        
         <result property="devBid"    column="devBid"    />
         <result property="tid"    column="tid"    />
     </resultMap>
@@ -69,4 +68,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{woBid}
         </foreach>
     </delete>
+
+    <select id="selectIotWarnobjectResVoList"
+            resultType="com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnobjectResVo">
+        <include refid="selectIotWarnobjectVo"/>
+        <where>
+            <if test="woBid != null  and woBid != ''"> and woBid = #{woBid}</if>
+            <if test="wcBid != null  and wcBid != ''"> and wcBid = #{wcBid}</if>
+            <if test="devBid != null  and devBid != ''"> and devBid = #{devBid}</if>
+            <if test="tid != null  and tid != ''"> and tid = #{tid}</if>
+        </where>
+    </select>
 </mapper>