规则添加

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/alarm/AlarmRuleDto.java

@@ -40,8 +40,13 @@ public class AlarmRuleDto {
      * measuingId
      */
     @ApiModelProperty(value = "measuingId")
-    @JsonIgnore
     private String measuringCode;
+    /**
+     * measuingId
+     */
+    @ApiModelProperty(value = "测点")
+
+    private String measuringName;
     /**
      * expression
      */
@@ -104,12 +109,12 @@ public class AlarmRuleDto {
      * measuingDataType
      */
     @ApiModelProperty(value = "measuingDataType")
-    @JsonIgnore
+
     private Integer measuringDataType;
     /**
      * specification
      */
-    @ApiModelProperty(value = "specification")
+    @ApiModelProperty(value = "规格")
     private String specification;
     @ApiModelProperty(value = "产品类型")
     private String categoryName;

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceAlarmRuleMapper.xml

@@ -48,9 +48,12 @@ a.update_date,a. update_by,a. rule_desc, a.value1,a. value2,a. measuring_data_ty
     <!--通过实体作为筛选条件查询-->
     <select id="selectList" resultType="com.zcxk.rmcp.api.dto.alarm.AlarmRuleDto">
         select
-        <include refid="Base_Column_List"/>,b.product_name,c.name categoryName
+        <include refid="Base_Column_List"/>,CONCAT_ws("/",e.name,b.product_model,b.product_name) product_name,c.name categoryName,d.measuring_name measuringName
         from rmcp_device_alarm_rule a join rmcp_product b on a.device_type=b.id
+                                      join rmcp_manufacturer e on b.manufacturer_id=e.id
                                       join rmcp_product_category c on a.product_categroy_id=c.id
+                                      join rmcp_product_measuring_point d on (a.measuring_code=d.measuring_code
+            and b.id=d.product_id)
         <where>
             a.status=1
 
@@ -202,7 +205,7 @@ a.update_date,a. update_by,a. rule_desc, a.value1,a. value2,a. measuring_data_ty
         <if test="id != null"> and id != #{id} </if>
     </select>
     <select id="findById" resultType="com.zcxk.rmcp.core.entity.DeviceAlarmRule">
-        select <include refid="Base_Column_List"/> from rmcp_device_alarm_rule where status = 1 and id = #{id}
+        select <include refid="Base_Column_List"/> from rmcp_device_alarm_rule a where status = 1 and id = #{id}
 
     </select>
     <select id="findTplMeasuringDataDef" resultType="com.zcxk.rmcp.core.entity.TplMeasuringDataDef">

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/AlarmRuleController.java

@@ -49,7 +49,7 @@ public class AlarmRuleController {
         return AjaxMessage.success();
     }
 
-    @PutMapping("edit")
+    @PostMapping("edit")
     @ApiOperation(value = "编辑规则")
     public AjaxMessage <Void> edit(
             @ApiParam(value = "规则", required = true) @RequestBody AlarmRuleDto deviceAlarmRule
@@ -58,7 +58,7 @@ public class AlarmRuleController {
         return AjaxMessage.success();
     }
 
-    @DeleteMapping("delete")
+    @PostMapping("delete")
     @ApiOperation(value = "删除规则")
     public AjaxMessage  <Void>delete(
             @ApiParam(value = "规则id", required = true) @RequestBody List<Integer>ids
@@ -67,7 +67,7 @@ public class AlarmRuleController {
         return AjaxMessage.success();
     }
 
-    @DeleteMapping("deleteAll")
+    @PostMapping("deleteAll")
     @ApiOperation(value = "删除规则")
     public AjaxMessage <Void> deleteAll(@RequestParam Integer alarmTypeId) {
         deviceAlarmRuleService.deleteAll(alarmTypeId);

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/AlarmTypeController.java

@@ -49,7 +49,7 @@ public class AlarmTypeController {
         return AjaxMessage.success();
     }
 
-    @PutMapping("edit")
+    @PostMapping("edit")
     @ApiOperation(value = "编辑异常类型")
     public AjaxMessage <Void> edit(
             @ApiParam(value = "异常类型", required = true) @RequestBody AlarmTypeDto alarmType
@@ -58,7 +58,7 @@ public class AlarmTypeController {
         return AjaxMessage.success();
     }
 
-    @DeleteMapping("delete")
+    @PostMapping("delete")
     @ApiOperation(value = "删除")
     public AjaxMessage <Void> delete(
             @ApiParam(value = "异常类型id", required = true) @RequestBody List<Integer>ids
@@ -70,7 +70,7 @@ public class AlarmTypeController {
         }
         return AjaxMessage.success();
     }
-    @DeleteMapping("deleteAll")
+    @PostMapping("deleteAll")
     @ApiOperation(value = "删除全部")
     public AjaxMessage <Void> deleteAll()
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/AlarmRuleServiceImpl.java

@@ -72,8 +72,7 @@ public class AlarmRuleServiceImpl implements AlarmRuleService {
         String specification = "";
         if (deviceAlarmRule.getMeasuringDataType() == 1) {
             expression = "#value == \"" + deviceAlarmRule.getValue1() + "\"";
-            DeviceAlarmRule deviceAlarmRuleTemp = deviceAlarmRuleMapper.findById(deviceAlarmRule.getId());
-            TplMeasuringDataDef tplMeasuringDataDef = deviceAlarmRuleMapper.findTplMeasuringDataDef(deviceAlarmRuleTemp.getDeviceType(),deviceAlarmRule.getMeasuringCode(),deviceAlarmRule.getValue1());
+            TplMeasuringDataDef tplMeasuringDataDef = deviceAlarmRuleMapper.findTplMeasuringDataDef(deviceAlarmRule.getDeviceType(),deviceAlarmRule.getMeasuringCode(),deviceAlarmRule.getValue1());
             if (tplMeasuringDataDef != null) {
                 specification = tplMeasuringDataDef.getDataName();
             }