需求变更-查找场景设备的报警属性

sms_water/src/main/java/com/huaxu/controller/AlarmSettingController.java

@@ -147,11 +147,13 @@ public class AlarmSettingController {
      */
     @RequestMapping(value = "selectAttributes", method = RequestMethod.GET)
     @ApiOperation(value = "根据设备id查询属性信息")
-    public AjaxMessage<List<AlarmSettingDto>> selectAttributes(@RequestParam Integer deviceId) {
-        if(deviceId==null) {
+    public AjaxMessage<List<AlarmSettingDto>> selectAttributes(
+            @ApiParam(value = "场景id", required = true)@RequestParam Integer sceneId,
+            @ApiParam(value = "设备id", required = true)@RequestParam Integer deviceId) {
+        if(deviceId==null||sceneId==null) {
             return new AjaxMessage<>(ResultStatus.PARAM_ERROR);
         }
-        List<AlarmSettingDto> result = alarmSettingService.selectAttributes(deviceId);
+        List<AlarmSettingDto> result = alarmSettingService.selectAttributes(deviceId,sceneId);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
 }

sms_water/src/main/java/com/huaxu/dao/AlarmSettingMapper.java

@@ -32,5 +32,5 @@ public interface AlarmSettingMapper extends BaseMapper<AlarmSetting> {
      * @param deviceId
      * @return
      */
-    List<AlarmSettingDto> selectAttributes(@Param("deviceId")Integer deviceId);
+    List<AlarmSettingDto> selectAttributes(@Param("deviceId")Integer deviceId,@Param("sceneId")Integer sceneId);
 }

sms_water/src/main/java/com/huaxu/service/AlarmSettingService.java

@@ -74,7 +74,7 @@ public class AlarmSettingService extends ServiceImpl<AlarmSettingMapper, AlarmSe
      * @param deviceId
      * @return
      */
-    public List<AlarmSettingDto> selectAttributes(Integer deviceId){
-        return alarmSettingMapper.selectAttributes(deviceId);
+    public List<AlarmSettingDto> selectAttributes(Integer deviceId,Integer sceneId){
+        return alarmSettingMapper.selectAttributes(deviceId,sceneId);
     }
 }

sms_water/src/main/resources/mapper/AlarmSettingMapper.xml

@@ -99,8 +99,8 @@
         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 t1.id=#{deviceId} and t1.status=1 and t3.is_alarm=1
-        order by t2.name
+        where t3.device_id=#{deviceId} and t3.scene_id=#{sceneId} and t1.status=1 and t3.is_alarm=1
+        order by t3.seq
     </select>
 
 </mapper>

sms_water/src/main/resources/mapper/OnlineMonitorMapper.xml

@@ -40,7 +40,7 @@
         inner join sms_scene_type t3 on t3.id = t1.scene_type_id and t3. status = 1
         left join sms_device_scene t2 on t2.parent_scene_id=t1.id and t2. status = 1
         left join sms_device t4 on t2.device_id=t4.id and t4. status = 1 and t4. enable_state = 1
-        left join sms_device_parm t5 on t5.scene_id = t2.scene_id and t5.device_id=t2.device_id and  t5. status = 1
+        left join sms_device_parm t5 on t5.scene_id = t2.scene_id and t5.device_id=t2.device_id and t5. status = 1
         <if test="type == 3 ">
             and t5.is_suspension = 1
         </if>
@@ -48,7 +48,8 @@
             and t5.is_map = 1
         </if>
         left join sms_device_attribute t9 on t5.attribute_id=t9.id and t9.status = 1
-        left join sms_alarm_details t6 on t6.scene_id=t2.scene_id and t6.device_id=t2.device_id and t6.attribute_id=t5.attribute_id and t6.status = 1
+        left join sms_alarm_details t6 on t6.scene_id=t2.scene_id and t6.device_id=t2.device_id
+                  and t6.attribute_id=t5.attribute_id and t6.status = 1 and t6.state=1
     </sql>
 
     <sql id="sceneAlarmJoins">