Merge remote-tracking branch 'origin/master'

hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/entity/WorkTaskEntity.java

@@ -36,6 +36,9 @@ public class WorkTaskEntity extends TenantEntity {
 	@ApiModelProperty(value = "班组ID")
 	private Long groupId;
 
+	@ApiModelProperty(value = "班组名称")
+	private String groupName;
+
 	@ApiModelProperty(value = "班组成员ID : 按 “，”分割")
 	private String member;
 

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java

@@ -186,11 +186,11 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, AlarmEntity>
         // 站点查询
         List<StationEntity> stations = this.stations();
         if(CollectionUtil.isEmpty(stations)){
-            return null;
+            return new TextMessage(new ArrayList().toString());
         }
         List<String> effectives = stations.stream().filter(station->depts.contains(station.getRefDept())).map(StationEntity::getCode).collect(Collectors.toList());
         if(CollectionUtil.isEmpty(effectives)){
-            return null;
+            return new TextMessage(new ArrayList().toString());
         }
         // 条件过滤
         QueryWrapper<AlarmEntity> queryWrapper = new QueryWrapper<>();
@@ -205,7 +205,7 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, AlarmEntity>
         }
         List<AlarmEntity> alarms = this.list(queryWrapper);
         if(CollectionUtil.isEmpty(alarms)){
-            return null;
+            return new TextMessage(new ArrayList().toString());
         }
         return new TextMessage(JSONObject.toJSONString(alarms.stream().sorted(Comparator.comparing(AlarmEntity::getAlarmTime).reversed()).collect(Collectors.toList())));
     }

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/ws/alart/AlarmHandler.java

@@ -62,9 +62,6 @@ public class AlarmHandler extends TextWebSocketHandler {
 			return;
 		}
 		TextMessage sendMessage = alarmService.majorAlarm(depts);
-		if(ObjectUtil.isEmpty(sendMessage)){
-			return;
-		}
 		session.sendMessage(sendMessage);
 	}
 }