Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/dto/DeviceCheckAlarmDto.java

@@ -56,10 +56,10 @@ public class DeviceCheckAlarmDto {
       return  new StringBuilder().append(this.deviceName)
                 .append(this.attributeName)
                 .append(receivedValue)
-                .append(this.unit)
+                .append(StringUtils.isNotBlank(this.unit)?this.unit:"")
                 .append(this.alarmCondition)
                 .append(this.attributeName)
                 .append(this.alarmValue)
-                .append(this.unit).toString();
+                .append(StringUtils.isNotBlank(this.unit)?this.unit:"").toString();
     }
 }

sms_water/src/main/java/com/huaxu/rabbitmq/ReceiveData.java

@@ -147,18 +147,18 @@ public class ReceiveData {
                                insert.add(alarmDetailsEntity);
                            }
                        }
-                       //处理完成后，剩下的标记为历史数据
-                       for(AlarmDetailsDto alarmDetailsDto:alarmDetailsDtoMap.values()){
-                           alarmDetailsDto.setState(0);
-                           alarmDetailsDto.setAlarmEndTime(receiveDateTime);
-                           alarmDetailsDto.setDateUpdate(new Date());
-                           alarmDetailMapper.update(alarmDetailsDto);
-                       }
-                       //批量插入新增报警
-                       if(insert.size()>0){
-                        alarmDetailMapper.batchInsert(insert);
-                       }
                     }
+                   //处理完成后，剩下的标记为历史数据
+                   for(AlarmDetailsDto alarmDetailsDto:alarmDetailsDtoMap.values()){
+                       alarmDetailsDto.setState(0);
+                       alarmDetailsDto.setAlarmEndTime(receiveDateTime);
+                       alarmDetailsDto.setDateUpdate(new Date());
+                       alarmDetailMapper.update(alarmDetailsDto);
+                   }
+                   //批量插入新增报警
+                   if(insert.size()>0){
+                    alarmDetailMapper.batchInsert(insert);
+                   }
                }
            }
         }

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

@@ -78,7 +78,11 @@
             ,ast.id as "alarmSettingId"
             ,concat(ifnull(ast.ALARM_CONDITION,''),ifnull(ast.ALARM_VALUE,''),ifnull(att.unit,'')) as "alermRule"
             ,a.ALARM_END_TIME as "alarmEndTime"
-            ,concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now())),'分钟') as "duration"
+
+            ,concat(concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   div 3600,'时'),
+						concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   mod 3600 div 60,'分'),
+						concat(timestampdiff(MINUTE,a.ALARM_START_TIME,ifnull(a.ALARM_END_TIME,now()))   mod 60,'秒')) as "duration"
+
 
     </sql>
 

user_center/src/main/resources/mapper/OrgMapper.xml

@@ -278,8 +278,8 @@
     </select>
     <select id="findOrgType" resultType="com.huaxu.entity.Org">
         select a.ORG_TYPE ,  b.ORG_TYPE parentType,c.ORG_TYPE childType
-         from uims_org a left join uims_org b on a.PARENT_ORG_ID=b.ID
-        left join uims_org c on a.id=c.PARENT_ORG_ID
-        where a.id=#{id} limit 1
+         from uims_org a left join uims_org b  ON (a.PARENT_ORG_ID=b.ID and b.status=1)
+                         LEFT JOIN uims_org c ON (a.id=c.PARENT_ORG_ID and c.status=1)
+        where a.id=#{id}  limit 1
     </select>
 </mapper>

user_center/src/main/resources/mapper/UserGroupMapper.xml

@@ -157,7 +157,7 @@
                 and TENANT_ID = #{userGroup.tenantId}
             </if>
             <if test="userGroup.groupName != null and userGroup.groupName != ''">
-                and GROUP_NAME = #{userGroup.groupName}
+                and GROUP_NAME  like concat('%', #{userGroup.groupName}, '%')
             </if>
             <if test="userGroup.groupState != null">
                 and GROUP_STATE = #{userGroup.groupState}