Merge remote-tracking branch 'origin/prod-20240506' into prod-20240506

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/wrapper/HandleWrapper.java

@@ -18,7 +18,7 @@ public class HandleWrapper extends BaseEntityWrapper<AlarmHandleVo,AlarmHandleVo
 
 	@Override
 	public AlarmHandleVo entityVO(AlarmHandleVo entity) {
-		if (1==entity.getHandleWay()|| StringUtils.isNotEmpty(entity.getUserName())) {
+		if (1==entity.getHandleWay()|| StringUtils.isEmpty(entity.getUserName())) {
 			User createUser = UserCache.getUser(entity.getCreateUser());
 			if (ObjectUtil.isEmpty(createUser)) {
 				return entity;

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/MessageServiceImpl.java

@@ -207,7 +207,7 @@ public class MessageServiceImpl implements MessageService {
 //        map.put("thing5",Optional.ofNullable(entity.getDeviceCode()).orElse("未知设备"));
         map.put("thing11",getTruncateString(entity.getAlarmContext(), 20));
         map.put("time2",entity.getAlarmTime());
-        map.put("thing14", DictCache.getValue("alarm_source", entity.getAlarmSource()));
+        map.put("thing14", DictCache.getValue("alarm_type", entity.getAlarmType()));
         message.setMap(map);
         // 消息内容
         message.setContent(entity.getAlarmContext());