场景修改

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

@@ -131,4 +131,6 @@ public interface AlarmDetailMapper {
     List<DeviceAlarmInfoForOrder> getAlarmInfoForWorkOrderManage();
 
     Integer updateAlarmSendMessageState(List<DeviceAlarmInfoForOrder> list);
+
+    List<AlarmDetailsDto> selectBySceneId(@Param("sceneId") Integer sceneId);
 }

sms_water/src/main/java/com/huaxu/dto/scene/SceneDto.java

@@ -0,0 +1,14 @@
+package com.huaxu.dto.scene;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.huaxu.entity.SceneEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SceneDto extends SceneEntity {
+    /** 是否报警 */
+    @ApiModelProperty(value = "是否报警(0不报警1报警)")
+    @TableField(exist = false)
+    private Integer isAlarm;
+}

sms_water/src/main/java/com/huaxu/entity/SceneEntity.java

@@ -149,4 +149,9 @@ public class SceneEntity implements Serializable {
     @ApiModelProperty(value = "一级场景名称",hidden = true)
     @TableField(exist = false)
     private String parentSceneName;
+
+    /** 是否报警 */
+    @ApiModelProperty(value = "是否报警(0不报警1报警)")
+    @TableField(exist = false)
+    private Integer isAlarm;
 }

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

@@ -26,6 +26,11 @@ public interface AlarmDetailsService {
      * @return
      */
     List<AlarmDetailsDto> selectByDeviceId(Integer deviceId);
+    /**
+     * 按场景查询
+     * @return
+     */
+    List<AlarmDetailsDto> selectBySceneId(Integer sceneId);
     /**
      * 查询设备
      * @return

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

@@ -6,6 +6,7 @@ import com.huaxu.common.Reflections;
 import com.huaxu.common.StringUtils;
 import com.huaxu.dao.SceneImageMapper;
 import com.huaxu.dao.SceneMapper;
+import com.huaxu.dto.AlarmDetailsDto;
 import com.huaxu.dto.DeviceDto;
 import com.huaxu.entity.DeviceSceneEntity;
 import com.huaxu.entity.SceneEntity;
@@ -51,6 +52,8 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
     private OrgInfoUtil orgInfoUtil;
     @Autowired
     private DeviceSceneService deviceSceneService;
+    @Autowired
+    private  AlarmDetailsService alarmDetailsService;
 
     /**
      * 自定义分页查询，含关联实体对像
@@ -407,6 +410,12 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
             sceneImageEntity.setImageType(3L);
             List<SceneImageEntity> sceneImageEntities = sceneImageService.findList(sceneImageEntity);
             item.setSceneImages(sceneImageEntities);
+            //判断此场景是否有报警
+            List<AlarmDetailsDto> alarmList = alarmDetailsService.selectBySceneId(item.getId().intValue());
+            if (alarmList.size() > 0)
+                item.setIsAlarm(1);
+            else
+                item.setIsAlarm(0);
         }
 
         List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);

sms_water/src/main/java/com/huaxu/service/impl/AlarmDetailsServiceImpl.java

@@ -65,6 +65,11 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
         return alarmDetailMapper.selectByDeviceId(deviceId);
     }
 
+    @Override
+    public List<AlarmDetailsDto> selectBySceneId(Integer sceneId) {
+        return alarmDetailMapper.selectBySceneId(sceneId);
+    }
+
     @Override
     public List<AlarmDetailsRealTimeDto> selectRealTimeByIds(List<Integer> ids) {
         return alarmDetailMapper.selectRealTimeByIds(ids);

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

@@ -717,4 +717,13 @@
             #{item.alarmId}
         </foreach>
     </update>
+    <select id="selectBySceneId" resultType="com.huaxu.dto.AlarmDetailsDto">
+        select
+        <include refid="Base_Column_List"/>,concat(b.alarm_condition,cast(b.alarm_value as char)+0) alarmRange
+        from sms_alarm_details a
+        left join sms_alarm_setting b on a.alarm_setting_id=b.id and b.status = 1 and b.alarm_condition!='='
+        <include refid="alarmDetailJoins"/>
+        where a.`STATUS` = 1
+        and (a.parent_scene_id =#{sceneId} or scene_id=#{sceneId} )and a.state=1
+    </select>
 </mapper>

user_auth/src/main/resources/application-prd.properties

@@ -76,5 +76,9 @@ spring.rabbitmq.publisher-returns=true
 spring.rabbitmq.template.mandatory=true
 iot.url=http://39.108.175.9:8090
 
+#µ¥µãµÇ¼µÚÈý·½ÇëÇóurl
+sso.xieding.get.pwd.url=%s!getSingleLandUser.action?account=%s&orgCode=%s
+sso.xieding.bind.single.url=%s!bindingSingleLandUser.action?account=%s&password=%s&orgCode=%s
+sso.xieding.get.token.url=%s!createSingleLandToken.action?singleKey=%s&timestamp=%s&signatrue=%s&code=%s
 
 

user_auth/src/main/resources/application-sit.properties

@@ -77,4 +77,10 @@ spring.rabbitmq.template.mandatory=true
 iot.url=http://114.135.61.188:58080
 
 
+#µ¥µãµÇ¼µÚÈý·½ÇëÇóurl
+sso.xieding.get.pwd.url=%s!getSingleLandUser.action?account=%s&orgCode=%s
+sso.xieding.bind.single.url=%s!bindingSingleLandUser.action?account=%s&password=%s&orgCode=%s
+sso.xieding.get.token.url=%s!createSingleLandToken.action?singleKey=%s&timestamp=%s&signatrue=%s&code=%s
+
+