添加告警参数属性

zoniot-water/zoniot-water-api/src/main/java/com/bz/zoneiot/water/api/vo/AttributesVo.java

@@ -0,0 +1,23 @@
+package com.bz.zoneiot.water.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author  andy
+ */
+@Data
+@ApiModel("属性")
+public class AttributesVo {
+
+    @ApiModelProperty(value = "属性ID")
+    private Integer attributeId;
+
+    @ApiModelProperty(value = "租户标识")
+    private String attributeName;
+
+    @ApiModelProperty(value = "一级场景")
+    private String identifier;
+
+}

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/dao/DeviceAttributeMapper.java

@@ -3,6 +3,7 @@ package com.bz.zoneiot.water.core.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bz.zoneiot.water.api.vo.AttributesVo;
 import com.bz.zoneiot.water.core.entity.DeviceAttributeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -64,4 +65,13 @@ public interface DeviceAttributeMapper extends BaseMapper<DeviceAttributeEntity>
      * @return java.util.List<DeviceAttributeEntity>
      **/
      List<DeviceAttributeEntity> findList(DeviceAttributeEntity deviceAttributeEntity);
+
+     /**
+     * 查找设备下的属性
+     * @author Andy
+     * @date 10:17 2021/10/28
+     * @param deviceId:
+     * @return java.util.List<com.bz.zoneiot.water.api.vo.AttributesVo>
+     **/
+	 List<AttributesVo> selectAttributes(Integer deviceId);
 }

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/AlarmSettingMapper.xml

@@ -98,20 +98,14 @@
     </select>
 
     <select id="selectAttributes" resultMap="alarmSettingMap">
-        select t2.id attribute_id,t2.name attribute_name, t2.identifier
+        select t2.id attribute_id,t2.name attribute_name,t2.identifier
         from  sms_device t1
         inner join sms_device_attribute t2 on t1.device_type_id=t2.device_type_id and t2.status =1
         inner join sms_device_parm t3 on t3.device_id=t1.id and t3.attribute_id=t2.id and t3.status=1
-        where t3.device_id=#{deviceId}
-        <if test="sceneId != null and sceneId != ''">
-            and t3.scene_id=#{sceneId}
-        </if>
-         and t1.status=1 and t3.is_alarm=1
+        where t3.device_id=#{deviceId} and t3.scene_id=#{sceneId} and t1.status=1 and t3.is_alarm=1
         order by t3.seq
     </select>
 
-
-
     <!-- 修改实时报警数据 -->
     <update id="updateRealtimeAlarm">
         update  sms_alarm_details

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/mapper/DeviceAttributeMapper.xml

@@ -70,4 +70,11 @@
             </if>
         </where>
     </select>
+
+    <select id="selectAttributes" resultType="com.bz.zoneiot.water.api.vo.AttributesVo">
+        select t2.id attribute_id, t2.name attribute_name,t2.identifier
+        from  sms_device t1
+        inner join sms_device_attribute t2 on t1.device_type_id=t2.device_type_id and t2.status =1
+        where t1.id = #{deviceId}  and t1.status = 1
+    </select>
 </mapper>

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/AlarmSettingController.java

@@ -34,7 +34,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/alarmSetting")
 @Api(tags = "报警管理")
-
 public class AlarmSettingController {
 
     @Autowired
@@ -120,7 +119,7 @@ public class AlarmSettingController {
 
     @RequestMapping(value = "selectAttributes", method = RequestMethod.GET)
     @ApiOperation(value = "根据设备id查询属性信息")
-    public AjaxMessage selectAttributes(@RequestParam(required = false, defaultValue = "") Integer sceneId, @ApiParam(value = "设备id", required = true)@RequestParam Integer deviceId) {
+    public AjaxMessage selectAttributes(@RequestParam(required = true) Integer sceneId, @ApiParam(value = "设备id", required = true)@RequestParam Integer deviceId) {
         if (deviceId == null) {
             return AjaxMessage.fail(WaterErrorEnum.PARAM_ERROR);
         }

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/controller/AttributesController.java

@@ -0,0 +1,37 @@
+package com.bz.zoneiot.water.web.controller;
+
+import com.bz.zoneiot.core.common.pojo.AjaxMessage;
+import com.bz.zoneiot.water.api.enums.WaterErrorEnum;
+import com.bz.zoneiot.water.web.service.impl.DeviceAttributeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Andy
+ * @version V1.0
+ * @description: TODO
+ * @date 2021/10/28
+ **/
+@RestController
+@RequestMapping("/attributes")
+@Api(tags = "属性管理")
+public class AttributesController {
+
+    @Autowired
+    private DeviceAttributeService deviceAttributeService;
+
+    @RequestMapping(value = "selectAttributes", method = RequestMethod.GET)
+    @ApiOperation(value = "根据设备id查询属性信息")
+    public AjaxMessage selectAttributes(@ApiParam(value = "设备id", required = true)@RequestParam Integer deviceId) {
+        if (deviceId == null) {
+            return AjaxMessage.fail(WaterErrorEnum.PARAM_ERROR);
+        }
+        return AjaxMessage.success(deviceAttributeService.selectAttributes(deviceId));
+    }
+}

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/service/impl/DeviceAttributeService.java

@@ -2,6 +2,8 @@ package com.bz.zoneiot.water.web.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bz.zoneiot.water.api.vo.AlarmSettingVo;
+import com.bz.zoneiot.water.api.vo.AttributesVo;
 import com.bz.zoneiot.water.core.dao.DeviceAttributeMapper;
 import com.bz.zoneiot.water.core.entity.DeviceAttributeEntity;
 import org.springframework.stereotype.Service;
@@ -71,4 +73,8 @@ public class DeviceAttributeService extends ServiceImpl<DeviceAttributeMapper, D
     public DeviceAttributeEntity findDeviceAttributeById(Long id) {
         return deviceAttributeMapper.findDeviceAttributeById(id);
     }
+
+    public List<AttributesVo> selectAttributes(Integer deviceId){
+        return deviceAttributeMapper.selectAttributes(deviceId);
+    }
 }