通知：列表增加通知策略

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

@@ -3,6 +3,7 @@ package com.yunfeiyun.agmp.iotm.web.domain.resvo;
 import com.yunfeiyun.agmp.common.core.domain.entity.SysUser;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnconfig;
+import com.yunfeiyun.agmp.iot.common.domain.IotWarnpolicy;
 import lombok.Data;
 
 import java.util.List;
@@ -13,7 +14,7 @@ public class IotWarnconfigResVo extends IotWarnconfig {
     private String wpChannel;
     private String wcTouchtypeName;
     private String wcLevelName;
-
+    private String warnpolicy;
     private List<IotDevice> iotDeviceList;
     private List<SysUser> sysUserList;
 }

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

@@ -62,4 +62,6 @@ public interface IotWarnpolicyMapper {
     public int deleteIotWarnpolicyByWpBids(@Param("array") String[] ids, @Param("tid") String tid);
 
     IotWarnpolicy findIotWarnpolicyByWcBid(String wcBid);
+
+    List<IotWarnpolicy> selectIotWarnpolicyListByWcBids(List<String> wcBids);
 }

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

@@ -61,4 +61,6 @@ public interface IIotWarnpolicyService {
     public int deleteIotWarnpolicyByWpBid(String wpBid, String tid);
 
     IotWarnpolicy findIotWarnpolicyByWcBid(String wcBid);
+
+    List<IotWarnpolicy> selectIotWarnpolicyListByWcBids(List<String> wcBids);
 }

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

@@ -139,11 +139,17 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
                 }
             }
             // 填充通知人信息，暂不实现
-            //List<IotWarnpolicy> iotWarnobjectList = iotWarnpolicyService.s(wcBids, SecurityUtils.getTid());
-
+            List<IotWarnpolicy> iotWarnobjects = iotWarnpolicyService.selectIotWarnpolicyListByWcBids(wcBids);
+            if (iotWarnobjects != null) {
+                Map<String, IotWarnpolicy> iotWarnpolicyMap = iotWarnobjects.stream().collect(Collectors.toMap(IotWarnpolicy::getWcBid, i -> i));
+                for (IotWarnconfigResVo iotWarnconfigResVo : iotWarnconfigResVoList) {
+                    IotWarnpolicy iotWarnpolicy = iotWarnpolicyMap.get(iotWarnconfigResVo.getWcBid());
+                    if (null != iotWarnpolicy) {
+                        iotWarnconfigResVo.setWarnpolicy(iotWarnpolicy.getWpChannel());
+                    }
+                }
+            }
         }
-
-
         return iotWarnconfigResVoList;
     }
 
@@ -339,7 +345,7 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
                 iotWarnpolicyEdit.setWpModifier(SecurityUtils.getUserId());
                 iotWarnpolicyService.updateIotWarnpolicy(iotWarnpolicyEdit);
             } else {
-                iotWarnpolicy=new IotWarnpolicy();
+                iotWarnpolicy = new IotWarnpolicy();
                 iotWarnpolicy.setWpBid(iotWarnpolicy.getUUId());
                 iotWarnpolicy.setWcBid(iotWarnconfigEditReqVo.getWcBid());
                 iotWarnpolicy.setTid(SecurityUtils.getTid());

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

@@ -6,6 +6,7 @@ import com.yunfeiyun.agmp.iotm.web.service.IIotWarnpolicyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 
@@ -90,4 +91,9 @@ public class IotWarnpolicyServiceImpl implements IIotWarnpolicyService {
     public IotWarnpolicy findIotWarnpolicyByWcBid(String wcBid) {
         return iotWarnpolicyMapper.findIotWarnpolicyByWcBid(wcBid);
     }
+
+    @Override
+    public List<IotWarnpolicy> selectIotWarnpolicyListByWcBids(List<String> wcBids) {
+        return iotWarnpolicyMapper.selectIotWarnpolicyListByWcBids(wcBids);
+    }
 }

src/main/resources/mapper/IotWarnpolicyMapper.xml

@@ -47,6 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findIotWarnpolicyByWcBid" resultType="com.yunfeiyun.agmp.iot.common.domain.IotWarnpolicy">
         select * from IotWarnpolicy where wcBid = #{wcBid}
     </select>
+    <select id="selectIotWarnpolicyListByWcBids"
+            resultType="com.yunfeiyun.agmp.iot.common.domain.IotWarnpolicy" parameterType="list">
+        select * from IotWarnpolicy where wcBid in
+        <foreach item="wcBid" collection="list" open="(" separator="," close=")">#{wcBid}</foreach>
+    </select>
 
     <insert id="insertIotWarnpolicy" parameterType="IotWarnpolicy" useGeneratedKeys="true" keyProperty="id">
         insert into IotWarnpolicy