添加消息发送系统

portal-manager/src/main/java/com/mortals/xhx/common/code/AppSourceEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 消息类型(等待超时预警，办理超时预警，差评预警)枚举类
+*
+* @author zxfei
+*/
+public enum AppSourceEnum {
+    等待超时预警("等待超时预警", "排号系统"),
+    办理超时预警("办理超时预警", "排号系统"),
+    差评预警("差评预警", "评价系统");
+    private String value;
+    private String desc;
+
+    AppSourceEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static AppSourceEnum getByValue(String value) {
+        for (AppSourceEnum messageTypeEnum : AppSourceEnum.values()) {
+            if (messageTypeEnum.getValue() == value) {
+                return messageTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (AppSourceEnum item : AppSourceEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/daemon/task/SyncAppointWaitAndFinTaskImpl.java

@@ -239,7 +239,7 @@ public class SyncAppointWaitAndFinTaskImpl implements ITaskExcuteService {
                             //业务:XX,流水号:XX,窗口:XX,工作人员:XX,已办理超时
                             String alarmContent = String.format("业务:%s,流水号:%s,窗口:%s,工作人员:%s,办理时间为%.1f分钟，超过了平均办理时长%.1f分钟!",
                                     item.getBussinessName(), item.getQueueNo(),
-                                    item.getWindowName(), item.getWorkman(),
+                                    item.getWindowNum(), item.getWorkman(),
                                     doTime, upTime);
                             MessageTaskEntity messageTaskEntity = new MessageTaskEntity();
                             messageTaskEntity.initAttrValue();

portal-manager/src/main/java/com/mortals/xhx/module/message/service/impl/MessageConfigServiceImpl.java

 package com.mortals.xhx.module.message.service.impl;
 import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.common.code.AppSourceEnum;
+import com.mortals.xhx.common.code.MessageTypeEnum;
 import org.springframework.beans.BeanUtils;
 import java.util.function.Function;
 import org.springframework.stereotype.Service;
@@ -10,6 +12,8 @@ import com.mortals.xhx.module.message.dao.MessageConfigDao;
 import com.mortals.xhx.module.message.model.MessageConfigEntity;
 import com.mortals.xhx.module.message.service.MessageConfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+
 /**
 * MessageConfigService
 * 消息发送配置 service实现
@@ -20,5 +24,25 @@ import lombok.extern.slf4j.Slf4j;
 @Service("messageConfigService")
 @Slf4j
 public class MessageConfigServiceImpl extends AbstractCRUDServiceImpl<MessageConfigDao, MessageConfigEntity, Long> implements MessageConfigService {
-    
+
+
+    @Override
+    protected void saveBefore(MessageConfigEntity entity, Context context) throws AppException {
+        updateAppName(entity);
+        super.saveBefore(entity, context);
+    }
+
+    @Override
+    protected void updateBefore(MessageConfigEntity entity, Context context) throws AppException {
+        updateAppName(entity);
+    }
+
+    private  void updateAppName(MessageConfigEntity entity) {
+        AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(entity.getMessageType());
+        if(!ObjectUtils.isEmpty(appSourceEnum)){
+            entity.setAppName(appSourceEnum.getDesc());
+        }
+    }
+
+
 }
\ No newline at end of file