调整告警记录字段.

添加告警处理接口

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

@@ -8,6 +8,8 @@ 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.IotWarnconfig;
+import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnconfigAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnconfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -69,9 +71,9 @@ public class IotWarnconfigController extends BaseController{
     @PreAuthorize("@ss.hasPermi('iot:warn:config:add')")
     @Log(title = "告警配置", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@Valid @RequestBody IotWarnconfig iotWarnconfig){
-        iotWarnconfig.setTid(SecurityUtils.getTid());
-        return toAjax(iotWarnconfigService.insertIotWarnconfig(iotWarnconfig));
+    public AjaxResult add(@Valid @RequestBody IotWarnconfigAddReqVo iotWarnconfigAddReqVo){
+
+        return toAjax(iotWarnconfigService.add(iotWarnconfigAddReqVo));
     }
 
     /**

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

@@ -5,9 +5,11 @@ 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.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnlog;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnlogDealReqVo;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnlogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -58,9 +60,9 @@ public class IotWarnlogController extends BaseController{
      * 获取告警记录详细信息
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:record:query')")
-    @GetMapping(value = "/info/{wrBid}")
-    public AjaxResult getInfo(@PathVariable("wrBid") String wrBid){
-        return success(iotWarnlogService.selectIotWarnlogByWlBid(wrBid,SecurityUtils.getTid()));
+    @GetMapping(value = "/info/{wlBid}")
+    public AjaxResult getInfo(@PathVariable("wlBid") String wlBid){
+        return success(iotWarnlogService.selectIotWarnlogByWlBid(wlBid,SecurityUtils.getTid()));
     }
 
     /**
@@ -86,6 +88,23 @@ public class IotWarnlogController extends BaseController{
     }
 
     /**
+     * 修改告警记录
+     */
+    @PreAuthorize("@ss.hasPermi('iot:warn:record:edit')")
+    @Log(title = "告警记录", businessType = BusinessType.UPDATE)
+    @PutMapping("/deal")
+    public AjaxResult deal(@Valid @RequestBody IotWarnlogDealReqVo iotWarnlogDealReqVo){
+        IotWarnlog dealLog = new IotWarnlog();
+        dealLog.setTid(SecurityUtils.getTid());
+        dealLog.setWlBid(iotWarnlogDealReqVo.getWlBid());
+        dealLog.setWlDealresult(iotWarnlogDealReqVo.getWlDealresult());
+        dealLog.setWlDealtime(DateUtils.dateTimeNow());
+        dealLog.setWlDealuserid(SecurityUtils.getUserId());
+        return toAjax(iotWarnlogService.updateIotWarnlog(dealLog));
+    }
+
+
+    /**
      * 删除告警记录
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:record:remove')")

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

@@ -0,0 +1,18 @@
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
+
+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 IotWarnconfigAddReqVo extends IotWarnconfig {
+    /**告警对象*/
+    private List<IotWarnobject> iotWarnobjects;
+    /**告警指标（告警条件）*/
+    private List<IotWarnindicator> IotWarnindicator;
+    /**重复次数*/
+    private Integer wctCount;
+}

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

@@ -0,0 +1,13 @@
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+public class IotWarnlogDealReqVo {
+    @NotEmpty
+    private String wlBid;
+
+    private String wlDealresult;
+}

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

@@ -15,10 +15,10 @@ public interface IotWarnlogMapper {
     /**
      * 查询告警记录
      * 
-     * @param id 告警记录主键
+     * @param wlBid 告警记录主键
      * @return 告警记录
      */
-    public IotWarnlog selectIotWarnlogById(@Param("id") String id, @Param("tid") String tid);
+    public IotWarnlog selectIotWarnlogById(@Param("wlBid") String wlBid, @Param("tid") String tid);
 
     /**
      * 查询告警记录列表
@@ -47,16 +47,16 @@ public interface IotWarnlogMapper {
     /**
      * 删除告警记录
      * 
-     * @param id 告警记录主键
+     * @param wlBid 告警记录主键
      * @return 结果
      */
-    public int deleteIotWarnlogByWlBid(@Param("id") String id, @Param("tid") String tid);
+    public int deleteIotWarnlogByWlBid(@Param("wlBid") String wlBid, @Param("tid") String tid);
 
     /**
      * 批量删除告警记录
      * 
-     * @param ids 需要删除的数据主键集合
+     * @param wlBids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteIotWarnlogByWlBids(@Param("array") String[] ids, @Param("tid") String tid);
+    public int deleteIotWarnlogByWlBids(@Param("array") String[] wlBids, @Param("tid") String tid);
 }

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

@@ -1,7 +1,9 @@
 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 javax.validation.Valid;
 import java.util.List;
 
 
@@ -59,4 +61,6 @@ public interface IIotWarnconfigService {
      * @return 结果
      */
     public int deleteIotWarnconfigByWcBid(String wcBid, String tid);
+
+    int add(@Valid IotWarnconfigAddReqVo iotWarnconfigAddReqVo);
 }

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

@@ -59,4 +59,5 @@ public interface IIotWarnlogService {
      * @return 结果
      */
     public int deleteIotWarnlogByWlBids(String wlBid, String tid);
+
 }

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

@@ -1,11 +1,15 @@
 package com.yunfeiyun.agmp.iotm.web.service.impl;
 
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotWarnconfig;
+import com.yunfeiyun.agmp.iot.common.domain.IotWarnobject;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnconfigAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotWarnconfigMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnconfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -84,4 +88,13 @@ public class IotWarnconfigServiceImpl implements IIotWarnconfigService {
     public int deleteIotWarnconfigByWcBid(String wcBid, String tid){
         return iotWarnconfigMapper.deleteIotWarnconfigByWcBid(wcBid, tid);
     }
+
+    @Override
+    public int add(IotWarnconfigAddReqVo iotWarnconfigAddReqVo) {
+        // 获取告警对象
+        List<IotWarnobject> warnobjects = iotWarnconfigAddReqVo.getIotWarnobjects();
+        List<IotDevice> iotDeviceList = new ArrayList<>();
+
+        return 0;
+    }
 }

src/main/resources/mapper/IotWarnconfigMapper.xml

@@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where wcBid = #{wcBid}
     </update>
 
-    <delete id="deleteIotWarnconfigByWcBid" parameterType="Long">
+    <delete id="deleteIotWarnconfigByWcBid" parameterType="java.lang.String">
         delete from IotWarnconfig where wcBid = #{wcBid} and tid = #{tid}
     </delete>
 

src/main/resources/mapper/IotWarncountMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where wctBid = #{wctBid}
     </update>
 
-    <delete id="deleteIotWarncountByWctBid" parameterType="Long">
+    <delete id="deleteIotWarncountByWctBid" parameterType="java.lang.String">
         delete from IotWarncount where wctBid = #{wctBid} and tid = #{tid}
     </delete>
 

src/main/resources/mapper/IotWarndataitemMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where wdBid = #{wdBid}
     </update>
 
-    <delete id="deleteIotWarndataitemByWdBid" parameterType="Long">
+    <delete id="deleteIotWarndataitemByWdBid" parameterType="java.lang.String">
         delete from IotWarndataitem where wdBid = #{wdBid} and tid = #{tid}
     </delete>
 

src/main/resources/mapper/IotWarnindicatorMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where wiBid = #{wiBid}
     </update>
 
-    <delete id="deleteIotWarnindicatorByWiBid" parameterType="Long">
+    <delete id="deleteIotWarnindicatorByWiBid" parameterType="java.lang.String">
         delete from IotWarnindicator where wiBid = #{wiBid} and tid = #{tid}
     </delete>
 

src/main/resources/mapper/IotWarnlogMapper.xml

@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectIotWarnlogById" parameterType="Long" resultMap="IotWarnlogResult">
+    <select id="selectIotWarnlogById" resultMap="IotWarnlogResult">
         <include refid="selectIotWarnlogVo"/>
         where wlBid = #{wlBid} and tid = #{tid}
     </select>
@@ -112,8 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where wlBid = #{wlBid}
     </update>
 
-    <delete id="deleteIotWarnlogByWlBid" parameterType="Long">
-        delete from IotWarnlog where wlBid = #{wlBid} and tid = #{tid}
+    <delete id="deleteIotWarnlogByWlBid" >
+        delete from IotWarnlog where wlBid = #{wlBid,javaType=string} and tid = #{tid,javaType=string}
     </delete>
 
     <delete id="deleteIotWarnlogByWlBids" parameterType="String">

src/main/resources/mapper/IotWarnobjectMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where woBid = #{woBid}
     </update>
 
-    <delete id="deleteIotWarnobjectByWoBid" parameterType="Long">
+    <delete id="deleteIotWarnobjectByWoBid" parameterType="java.lang.String">
         delete from IotWarnobject where woBid = #{woBid} and tid = #{tid}
     </delete>
 

src/main/resources/mapper/IotWarnpolicyMapper.xml

@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where wpBid = #{wpBid}
     </update>
 
-    <delete id="deleteIotWarnpolicyByWpBid" parameterType="Long">
+    <delete id="deleteIotWarnpolicyByWpBid" parameterType="java.lang.String">
         delete from IotWarnpolicy where wpBid = #{wpBid} and tid = #{tid}
     </delete>
 

src/main/resources/mapper/IotWarnreceiverMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where wrBid = #{wrBid}
     </update>
 
-    <delete id="deleteIotWarnreceiverByWrBid" parameterType="Long">
+    <delete id="deleteIotWarnreceiverByWrBid" >
         delete from IotWarnreceiver where wrBid = #{wrBid} and tid = #{tid}
     </delete>