diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MessageTypeEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MessageTypeEnum.java new file mode 100644 index 0000000..3035410 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MessageTypeEnum.java @@ -0,0 +1,48 @@ +package com.bonus.common.biz.enums; + +import lombok.Getter; + +@Getter +public enum MessageTypeEnum { + + CHAT_MESSAGE(0, "点对点聊天"), + ORDER_MESSAGE(1, "订单状态消息"), + DEMAND_MESSAGE(2, "需求状态消息"), + QUALITY_CONTROL_MESSAGE(3,"质检到期消息"), + OTHER(99,"其他"); + + private final Integer type; + private final String name; + + MessageTypeEnum(Integer type, String name) { + this.type = type; + this.name = name; + } + + /** + * 根据code获取name + * @param type + * @return + */ + public static String getNameByCode(int type) { + MessageTypeEnum[] maStatusEnums = values(); + for (MessageTypeEnum maStatusEnum : maStatusEnums) { + if (maStatusEnum.getType() == type) { + return maStatusEnum.getName(); + } + } + return null; + } + + public static Integer getCodeByName(String msg) { + MessageTypeEnum[] maStatusEnums = values(); + for (MessageTypeEnum maStatusEnum : maStatusEnums) { + if (maStatusEnum.getName() == msg) { + return maStatusEnum.getType(); + } + } + return null; + } + + +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java index 45d4bf6..9ee8f49 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import com.alibaba.fastjson2.JSONArray; import com.bonus.common.biz.constant.MaterialConstants; +import com.bonus.common.biz.enums.MessageTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.SpringUtils; @@ -126,6 +127,7 @@ public class BmMessageServiceImpl implements IBmMessageService { bmMessage.setFromCompany(companyId); bmMessage.setFromUser(SecurityUtils.getLoginUser().getSysUser().getUserId()); bmMessage.setUuid(String.valueOf(UUID.randomUUID())); + bmMessage.setMessageType(String.valueOf(MessageTypeEnum.CHAT_MESSAGE.getType())); bmMessage.setIsRead(0); String msgKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE + companyId + ":" + bmMessage.getToCompany(); JSONArray arrayCache = SpringUtils.getBean(RedisService.class).getCacheObject(msgKey); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java index e276037..bfe6e54 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java @@ -8,6 +8,7 @@ import com.bonus.common.biz.constant.MaterialConstants; import com.bonus.common.biz.domain.BmFileInfo; import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.biz.enums.LeaseInfoEnum; +import com.bonus.common.biz.enums.MessageTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.SpringUtils; @@ -387,6 +388,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { BmMessage bmMessage = new BmMessage(); bmMessage.setCreateTime(DateUtils.getNowDate()); bmMessage.setMessageContent("您好,您的需求已被" + leaseInfo.getOrderCompanyName() + "接单,请及时查看"); + bmMessage.setMessageType(String.valueOf(MessageTypeEnum.DEMAND_MESSAGE.getType())); bmMessage.setUuid(String.valueOf(UUID.randomUUID())); bmMessage.setFromCompany(0L); bmMessage.setFromUser(0L); @@ -425,6 +427,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { BmMessage bmMessage = new BmMessage(); bmMessage.setCreateTime(DateUtils.getNowDate()); bmMessage.setMessageContent("您好,您的接单需求" + leaseInfo.getPublishCompanyName() + "已同意"); + bmMessage.setMessageType(String.valueOf(MessageTypeEnum.DEMAND_MESSAGE.getType())); bmMessage.setUuid(String.valueOf(UUID.randomUUID())); bmMessage.setFromCompany(0L); bmMessage.setFromUser(0L); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java index fdf695e..2d7be04 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java @@ -2,6 +2,7 @@ package com.bonus.material.task; import com.alibaba.fastjson2.JSONArray; import com.bonus.common.biz.constant.MaterialConstants; +import com.bonus.common.biz.enums.MessageTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.SpringUtils; @@ -47,6 +48,7 @@ public class NoticeTask { bmMessage.setCreateTime(DateUtils.getNowDate()); try { bmMessage.setMessageContent("您好,系统检测出" + maDevQc.getDeviceName() + "已过质检日期,请及时上传质检报告"); + bmMessage.setMessageType(String.valueOf(MessageTypeEnum.QUALITY_CONTROL_MESSAGE.getType())); bmMessage.setUuid(String.valueOf(UUID.randomUUID())); bmMessage.setFromCompany(0L); bmMessage.setFromUser(0L);