添加消息

message/src/main/resources/application-dev.properties

@@ -38,7 +38,7 @@ spring.redis.lettuce.shutdown-timeout=100
 security.oauth2.client.client-id=smart-city-v2
 security.oauth2.client.client-secret=smart-city-v2-123
 security.oauth2.resource.id=smartcity-deivice-service
-security.oauth2.resource.user-info-uri=http://localhost:8321/user/principal
+security.oauth2.resource.user-info-uri=http://10.0.0.62:8321/user/principal
 
 security.oauth2.resource.prefer-token-info=false
 

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

@@ -83,5 +83,5 @@ public interface AlarmTypeDetailMapper {
     * @param alarmId:
     * @return int
     **/
-    long selectLastAlarmId(int alarmId);
+    Long selectLastAlarmId(int alarmId);
 }

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/entity/AlarmDetailsEntity.java

@@ -107,4 +107,7 @@ public class AlarmDetailsEntity implements Serializable {
     @ApiModelProperty(value = "更新人")
     private String updateBy;
 
+    @ApiModelProperty(value = "更新人 : 是否推送消息（0否1是）")
+    private Integer isSendMessage;
+
 }

zoniot-water/zoniot-water-core/src/main/java/com/bz/zoneiot/water/core/entity/AlarmType.java

@@ -38,7 +38,7 @@ public class AlarmType {
     @ApiModelProperty(value="产品id")
     private Integer productId;
 
-    @ApiModelProperty(value="条件值")
+    @ApiModelProperty(value="场景")
     private Integer sceneType;
 
     @ApiModelProperty(value="告警名称")

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

@@ -36,7 +36,7 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, tenant_id, company_org_id,device_id, dept_org_id, product_id, `name`, attribute_id, `desc`, alarm_category, enabled,
-    alarm_rule_num, days, times,`status`, create_date, create_by, update_date, update_by, iot_alarm_id
+    alarm_rule_num, days, times,`status`, create_date, create_by, update_date, update_by, iot_alarm_id,scene_type
   </sql>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bz.zoneiot.water.core.entity.AlarmType" useGeneratedKeys="true">
     <!--@mbg.generated-->

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

@@ -217,13 +217,7 @@
     <select id="selectMapSuspension" resultMap="monitorDataMap">
         select
         <include refid="Base_Column_List"/>
-        <if test="flag == null or flag ==0">
-            ,if (t7.alarm_count>0, 1, 0) scene_state,
-        </if>
-        <if test="flag == 1">
-            ,case when t7.offline_alarm_count=t10.setting_device_count then 2
-            when t7.alarm_count>0 or t7.offline_alarm_count>0 then 1 else 0 end scene_state,
-        </if>
+        ,t4.ENABLE_STATE scene_state,
         t1.company_org_id as "companyOrgId"
         from sms_scene t1
         <include refid="sceneDeviceJoins"/>

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/config/FeignConfig.java

@@ -20,6 +20,9 @@ public class FeignConfig implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate requestTemplate) {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (requestTemplate.url().indexOf("/user/findUserIdsByPermissonOrg") != -1 ){
+            return;
+        }
         if(attributes != null){
             HttpServletRequest request = attributes.getRequest();
             if(request != null){

zoniot-water/zoniot-water-web/src/main/java/com/bz/zoneiot/water/web/config/MessageConfig.java

@@ -52,6 +52,9 @@ public class MessageConfig {
      * @return
      */
     public String getAlarmSkipUrl(SceneTypeEnum sceneTypeEnum){
+        if (sceneTypeEnum == null) {
+            return null;
+        }
         switch (sceneTypeEnum){
             case WATER_SOURCE:
             case WATER_WORKS:

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

@@ -161,7 +161,7 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
             return null;
         }
         sceneType = alarmType.getSceneType();
-        long alarmId = alarmTypeDetailMapper.selectLastAlarmId(alarmType.getId());
+        Long alarmId = alarmTypeDetailMapper.selectLastAlarmId(alarmType.getId());
         List<AlarmDetailsEntity> result = new ArrayList<>();
         // 离线告警
         if (alarmType.getAlarmCategory() == 2 || alarmType.getAttributeId() == null) {
@@ -178,7 +178,7 @@ public class AlarmTypeDetailsServiceImpl implements AlarmTypeDetailsService {
         List<DeviceSceneVo> sceneVos = deviceSceneMapper.findSceneByDeviceId(alarmType.getDeviceId());
         for (DeviceSceneVo sceneVo : sceneVos) {
             AlarmDetailsEntity alarmDetailsEntity = new AlarmDetailsEntity();
-            if (alarmId != 0) {
+            if (alarmId != null) {
                 alarmDetailsEntity.setId(alarmId);
             }
             alarmDetailsEntity.setAlarmStartTime(dto.getAlarmTime());