补充告警指标属性

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

@@ -81,7 +81,7 @@ public class IotWarnconfigController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:config:edit')")
     @Log(title = "告警配置", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarnconfig iotWarnconfig){
         iotWarnconfig.setTid(SecurityUtils.getTid());
         return toAjax(iotWarnconfigService.updateIotWarnconfig(iotWarnconfig));

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

@@ -79,7 +79,7 @@ public class IotWarncountController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:count:edit')")
     @Log(title = "告警触发次数", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarncount iotWarncount){
         iotWarncount.setTid(SecurityUtils.getTid());
         return toAjax(iotWarncountService.updateIotWarncount(iotWarncount));

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

@@ -77,7 +77,7 @@ public class IotWarndataitemController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:data:item:edit')")
     @Log(title = "告警要素", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarndataitem iotWarndataitem){
         return toAjax(iotWarndataitemService.updateIotWarndataitem(iotWarndataitem));
     }

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

@@ -79,7 +79,7 @@ public class IotWarnindicatorController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:indicator:edit')")
     @Log(title = "告警指标，存储所有与告警相关的指标信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarnindicator iotWarnindicator){
         iotWarnindicator.setTid(SecurityUtils.getTid());
         return toAjax(iotWarnindicatorService.updateIotWarnindicator(iotWarnindicator));

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

@@ -81,7 +81,7 @@ public class IotWarnlogController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:record:edit')")
     @Log(title = "告警记录", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarnlog iotWarnlog){
         iotWarnlog.setTid(SecurityUtils.getTid());
         return toAjax(iotWarnlogService.updateIotWarnlog(iotWarnlog));
@@ -92,7 +92,7 @@ public class IotWarnlogController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:record:edit')")
     @Log(title = "告警记录", businessType = BusinessType.UPDATE)
-    @PutMapping("/deal")
+    @PostMapping("/deal")
     public AjaxResult deal(@Valid @RequestBody IotWarnlogDealReqVo iotWarnlogDealReqVo){
         IotWarnlog dealLog = new IotWarnlog();
         dealLog.setTid(SecurityUtils.getTid());
@@ -100,6 +100,7 @@ public class IotWarnlogController extends BaseController{
         dealLog.setWlDealresult(iotWarnlogDealReqVo.getWlDealresult());
         dealLog.setWlDealtime(DateUtils.dateTimeNow());
         dealLog.setWlDealuserid(SecurityUtils.getUserId());
+        dealLog.setStatus("1");
         return toAjax(iotWarnlogService.updateIotWarnlog(dealLog));
     }
 

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

@@ -79,7 +79,7 @@ public class IotWarnobjectController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:object:edit')")
     @Log(title = "告警对象", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarnobject iotWarnobject){
         iotWarnobject.setTid(SecurityUtils.getTid());
         return toAjax(iotWarnobjectService.updateIotWarnobject(iotWarnobject));

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

@@ -79,7 +79,7 @@ public class IotWarnpolicyController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:policy:edit')")
     @Log(title = "告警通知策略，存储所有与告警相关的通知策略信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarnpolicy iotWarnpolicy){
         iotWarnpolicy.setTid(SecurityUtils.getTid());
         return toAjax(iotWarnpolicyService.updateIotWarnpolicy(iotWarnpolicy));

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

@@ -79,7 +79,7 @@ public class IotWarnreceiverController extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('iot:warn:receiver:edit')")
     @Log(title = "告警接收者", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody IotWarnreceiver iotWarnreceiver){
         iotWarnreceiver.setTid(SecurityUtils.getTid());
         return toAjax(iotWarnreceiverService.updateIotWarnreceiver(iotWarnreceiver));

src/main/resources/mapper/IotWarnindicatorMapper.xml

@@ -9,6 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wiBid"    column="wiBid"    />
         <result property="wcBid"    column="wcBid"    />
         <result property="wdBid"    column="wdBid"    />
+
+        <result property="wiAddress"    column="wiAddress"    />
+        <result property="wiCode"    column="wiCode"    />
+        <result property="wiName"    column="wiName"    />
+        <result property="wiUnit"    column="wiUnit"    />
+
         <result property="wiExpression"    column="wiExpression"    />
         <result property="wiValue"    column="wiValue"    />
         <result property="wiCreator"    column="wiCreator"    />
@@ -19,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectIotWarnindicatorVo">
-        select id, wiBid, wcBid, wdBid, wiExpression, wiValue, wiCreator, wiCreateddate, wiModifieddate, wiModifier, tid from IotWarnindicator
+        select id, wiBid, wcBid, wdBid, wiAddress, wiCode, wiName, wiUnit,wiExpression, wiValue, wiCreator, wiCreateddate, wiModifieddate, wiModifier, tid from IotWarnindicator
     </sql>
 
     <select id="selectIotWarnindicatorList" parameterType="IotWarnindicator" resultMap="IotWarnindicatorResult">
@@ -28,6 +34,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiBid != null  and wiBid != ''"> and wiBid = #{wiBid}</if>
             <if test="wcBid != null  and wcBid != ''"> and wcBid = #{wcBid}</if>
             <if test="wdBid != null  and wdBid != ''"> and wdBid = #{wdBid}</if>
+            <if test="wiAddress != null  and wiAddress != ''"> and wiAddress = #{wiAddress}</if>
+            <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="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>
@@ -49,6 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiBid != null">wiBid,</if>
             <if test="wcBid != null">wcBid,</if>
             <if test="wdBid != null">wdBid,</if>
+            <if test="wiAddress != null">wiAddress,</if>
+            <if test="wiCode != null">wiCode,</if>
+            <if test="wiName != null">wiName,</if>
+            <if test="wiUnit != null">wiUnit,</if>
             <if test="wiExpression != null">wiExpression,</if>
             <if test="wiValue != null">wiValue,</if>
             <if test="wiCreator != null">wiCreator,</if>
@@ -61,6 +75,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiBid != null">#{wiBid},</if>
             <if test="wcBid != null">#{wcBid},</if>
             <if test="wdBid != null">#{wdBid},</if>
+            <if test="wiAddress != null">#{wiAddress},</if>
+            <if test="wiCode != null">#{wiCode},</if>
+            <if test="wiName != null">#{wiName},</if>
+            <if test="wiUnit != null">#{wiUnit},</if>
             <if test="wiExpression != null">#{wiExpression},</if>
             <if test="wiValue != null">#{wiValue},</if>
             <if test="wiCreator != null">#{wiCreator},</if>
@@ -77,6 +95,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wiBid != null">wiBid = #{wiBid},</if>
             <if test="wcBid != null">wcBid = #{wcBid},</if>
             <if test="wdBid != null">wdBid = #{wdBid},</if>
+            <if test="wiAddress != null">wiAddress = #{wiAddress},</if>
+            <if test="wiCode != null">wiCode = #{wiCode},</if>
+            <if test="wiName != null">wiName = #{wiName},</if>
+            <if test="wiUnit != null">wiUnit = #{wiUnit},</if>
             <if test="wiExpression != null">wiExpression = #{wiExpression},</if>
             <if test="wiValue != null">wiValue = #{wiValue},</if>
             <if test="wiCreator != null">wiCreator = #{wiCreator},</if>