调整告警规则编辑接口

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

@@ -63,7 +63,7 @@ public class IotWarnconfigController extends BaseController{
     @PreAuthorize("@ss.hasPermi('iot:warn:config:query')")
     @GetMapping(value = "/info/{wcBid}")
     public AjaxResult getInfo(@PathVariable("wcBid") String wcBid){
-        return success(iotWarnconfigService.selectIotWarnconfigByWcBid(wcBid,SecurityUtils.getTid()));
+        return success(iotWarnconfigService.info(wcBid,SecurityUtils.getTid()));
     }
 
     /**

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

@@ -0,0 +1,14 @@
+package com.yunfeiyun.agmp.iotm.web.domain.resvo;
+
+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 lombok.Data;
+
+import java.util.List;
+
+@Data
+public class IotWarnconfigInfoResVo extends IotWarnconfig {
+    private List<IotWarnobject> iotWarnobjectList;
+    private List<IotWarnindicator> iotWarnindicatorList;
+}

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

@@ -3,6 +3,7 @@ package com.yunfeiyun.agmp.iotm.web.service;
 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;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnconfigInfoResVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotWarnconfigResVo;
 
 import javax.validation.Valid;
@@ -69,4 +70,6 @@ public interface IIotWarnconfigService {
     int add(@Valid IotWarnconfigAddReqVo iotWarnconfigAddReqVo);
 
     int edit(@Valid IotWarnconfigEditReqVo iotWarnconfigEditReqVo);
+
+    IotWarnconfigInfoResVo info(String wcBid, String tid);
 }

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

@@ -13,12 +13,14 @@ 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.service.IIotWarnconfigService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 告警配置Service业务层处理
@@ -50,6 +51,7 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
      */
     @Override
     public IotWarnconfig selectIotWarnconfigByWcBid(String wcBid, String tid){
+
         return iotWarnconfigMapper.selectIotWarnconfigByWcBid(wcBid, tid);
     }
     /**
@@ -168,8 +170,8 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
         Collection<IotWarnobject> differ = CollectionUtils.disjunction(oldWarnObjectList,iotWarnconfigEditReqVo.getIotWarnobjectList());
         // 老数据中存在，新数据中不存在，代表被删除的数据
         Collection<IotWarnobject> deleteData = CollectionUtils.subtract(oldWarnObjectList,differ);
-        List<String> deleteWarnObjectBids = deleteData.stream().map(IotWarnobject::getWoBid).collect(Collectors.toList());
-        iotWarnobjectMapper.deleteIotWarnobjectByWoBids(deleteWarnObjectBids.toArray(new String[0]), SecurityUtils.getTid());
+        String[] woBids = deleteData.stream().map(IotWarnobject::getWoBid).toArray(String[]::new);
+        iotWarnobjectMapper.deleteIotWarnobjectByWoBids(woBids, SecurityUtils.getTid());
         // 老数据中不存在，新数据中存在，代表新增的数据
         Collection<IotWarnobject> addData = CollectionUtils.subtract(iotWarnconfigEditReqVo.getIotWarnobjectList(),differ);
         for(IotWarnobject addWarnObject : addData){
@@ -183,4 +185,25 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
         }
         return iotWarnconfigMapper.updateIotWarnconfig(iotWarnconfigEditReqVo);
     }
+
+    @Override
+    public IotWarnconfigInfoResVo info(String wcBid, String tid) {
+        IotWarnconfig iotWarnconfig = iotWarnconfigMapper.selectIotWarnconfigByWcBid(wcBid,SecurityUtils.getTid());
+        if(null == iotWarnconfig){
+            return null;
+        }
+        IotWarnobject iotWarnobjectQuery = new IotWarnobject();
+        iotWarnobjectQuery.setWcBid(wcBid);
+        iotWarnobjectQuery.setTid(SecurityUtils.getTid());
+        List<IotWarnobject> iotWarnobjectList = iotWarnobjectMapper.selectIotWarnobjectList(iotWarnobjectQuery);
+        IotWarnindicator iotWarnindicatorQuery = new IotWarnindicator();
+        iotWarnindicatorQuery.setWcBid(wcBid);
+        iotWarnindicatorQuery.setTid(SecurityUtils.getTid());
+        List<IotWarnindicator> iotWarnindicatorList = iotWarnindicatorMapper.selectIotWarnindicatorList(iotWarnindicatorQuery);
+        IotWarnconfigInfoResVo iotWarnconfigInfoResVo = new IotWarnconfigInfoResVo();
+        BeanUtils.copyProperties(iotWarnconfig,iotWarnconfigInfoResVo);
+        iotWarnconfigInfoResVo.setIotWarnindicatorList(iotWarnindicatorList);
+        iotWarnconfigInfoResVo.setIotWarnobjectList(iotWarnobjectList);
+        return iotWarnconfigInfoResVo;
+    }
 }

src/main/resources/mapper/IotWarnconfigMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectIotWarnconfigByWcBid" parameterType="Long" resultMap="IotWarnconfigResult">
+    <select id="selectIotWarnconfigByWcBid"  resultMap="IotWarnconfigResult">
         <include refid="selectIotWarnconfigVo"/>
         where wcBid = #{wcBid} and tid = #{tid}
     </select>