From 4601316438d6cce2c8bbd6bd4a20de2378da6b21 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期三, 04 六月 2025 18:06:21 +0800
Subject: [PATCH] 我的消息添加状态筛选
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml | 16 ++++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java | 4 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java | 6 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/EquipmentWarrantyEndDateAlertJob.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java | 16 ++++++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/vo/OptionsVo.java | 16 ++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyStatusAlart.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java | 41 ++++++++++++++++++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java | 3 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java | 5 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java | 2 +
14 files changed, 105 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/EquipmentWarrantyEndDateAlertJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/EquipmentWarrantyEndDateAlertJob.java
index 53f23bf..2d504db 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/EquipmentWarrantyEndDateAlertJob.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/EquipmentWarrantyEndDateAlertJob.java
@@ -44,7 +44,7 @@
messageDTO.setTitle(title);
messageDTO.setContent(msg);
messageDTO.setMessageType(MessageSplitTypeEnum.untilMaintenancePeriod.getType());
- messageDTO.setCategory("绯荤粺娑堟伅");
+ messageDTO.setCategory(MessageSplitTypeEnum.untilMaintenancePeriod.getNote());
messageDTO.setFromUser("鍒版湡鎻愰啋灏忓姪鎵�-灏忛啋");
messageDTO.setToUser("admin");
if(equipmentList.size()!=0){
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyStatusAlart.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyStatusAlart.java
index 51cf992..8942fc5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyStatusAlart.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/TechnologyStatusAlart.java
@@ -65,7 +65,7 @@
messageDTO.setTitle(title);
messageDTO.setMessageType(MessageSplitTypeEnum.untilMaintenancePeriod.getType());
messageDTO.setContent(msg);
- messageDTO.setCategory("鎶�鏈姸鎬侀壌瀹氭秷鎭�");
+ messageDTO.setCategory(MessageSplitTypeEnum.untilMaintenancePeriod.getNote());
messageDTO.setFromUser("admin");
messageDTO.setToUser(sysUser.getUsername());
if(needAlerts.size()!=0){
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java
index 6841726..92bec85 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java
@@ -69,7 +69,7 @@
messageDTO.setTitle(title);
messageDTO.setMessageType(MessageSplitTypeEnum.untilMaintenancePeriod.getType());
messageDTO.setContent(msg);
- messageDTO.setCategory("涓変繚娑堟伅");
+ messageDTO.setCategory(MessageSplitTypeEnum.untilMaintenancePeriod.getNote());
messageDTO.setFromUser("admin");
messageDTO.setToUser(sysUser.getUsername());
if(needAlerts.size()!=0){
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
index 17090b6..f6f10c9 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcMessageApprovalController.java
@@ -181,7 +181,7 @@
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�侀暱鏃堕棿鏈彉鍖栧師鍥犱笂鎶ョ‘璁わ紒");
messageDTO.setMessageType(MessageSplitTypeEnum.statusPermanentlyNoChange.getType());
- messageDTO.setCategory("娑堟伅");
+ messageDTO.setCategory(MessageSplitTypeEnum.statusPermanentlyNoChange.getNote());
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
messageDTO.setFromUser(user.getUsername());
LoginUser userById = sysBaseApi.getUserById(approverId);
@@ -205,7 +205,7 @@
//涓婃姤鍘熷洜鍙戦�佹秷鎭粰纭浜�
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("璁惧鐘舵�佹秷鎭紒");
- messageDTO.setCategory("娑堟伅");
+ messageDTO.setCategory(MessageSplitTypeEnum.statusPermanentlyNoChange.getNote());
messageDTO.setFromUser("admin");
messageDTO.setMessageType(MessageSplitTypeEnum.statusPermanentlyNoChange.getType());
messageDTO.setToUser(mdcMessageApproval.getUpdateBy());
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
index fc04271..b3b180a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
@@ -135,7 +135,7 @@
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊硷紒");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
@@ -176,7 +176,7 @@
for (SysUser sysUser : adminList) {
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser(sysUser.getUsername());
@@ -186,7 +186,7 @@
} else {
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java
index 8c6a9fc..b3551dd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java
@@ -92,7 +92,7 @@
if (mdcEquipmentDto != null && StringUtils.isNotBlank(mdcEquipmentDto.getSpindlespeed()) && StringUtils.isNotBlank(mdcEquipmentDto.getActualspindlespeed())) {
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧 [" + mdcEquipment.getEquipmentId() + "] 杩愯杞�燂紒");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 91b6923..3f982d8 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -798,7 +798,7 @@
Integer min = mdcEquipmentThreshold.getMinThreshold();
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "鎶ヨ锛�");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
index 5074614..8cd02b7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
@@ -8,8 +8,11 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.constant.WebsocketConst;
@@ -20,6 +23,7 @@
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.AnnouncementSendModel;
import org.jeecg.modules.system.service.*;
+import org.jeecg.modules.system.vo.OptionsVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -244,6 +248,18 @@
}
/**
+ * @鍔熻兘锛氳幏鍙栨秷鎭被鍨嬩笅鎷�
+ * @return
+ */
+ @AutoLog(value = "鑾峰彇娑堟伅绫诲瀷涓嬫媺")
+ @ApiOperation(value = "鑾峰彇娑堟伅绫诲瀷涓嬫媺", notes = "鑾峰彇娑堟伅绫诲瀷涓嬫媺")
+ @GetMapping(value = "/getMessageType")
+ public Result<List<OptionsVo>> getMessageType() {
+ List<OptionsVo> result = sysAnnouncementSendService.getMessageType();
+ return Result.OK(result);
+ }
+
+ /**
* @鍔熻兘锛氫竴閿凡璇�
* @return
*/
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java
index 2ad2698..ccaa081 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java
@@ -53,4 +53,7 @@
* 鏍规嵁娑堟伅鍐呭鏌ヨ娑堟伅閫氱煡
*/
SysAnnouncement findLastMessage(@Param("messageContent") String messageContent);
+
+ List<String> getMessageType();
+
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index df2baa5..da34614 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -60,9 +60,13 @@
<if test="announcementSendModel.bizSource !=null and announcementSendModel.bizSource =='isNoBpm'">
and (sa.bus_type != 'bpm' or sa.bus_type is null)
</if>
- <if test="announcementSendModel.msgCategory !=null and announcementSendModel.msgCategory != ''">
- and sa.msg_category = #{announcementSendModel.msgCategory}
- </if>
+ <if test="announcementSendModel.msgCategoryList.size != 0">
+ and sa.msg_category in (
+ <foreach item="msgCategory" collection="announcementSendModel.msgCategoryList" separator=",">
+ #{msgCategory}
+ </foreach>
+ )
+ </if>
order by sas.read_flag,sa.send_time desc
</select>
@@ -128,5 +132,11 @@
<select id="findLastMessage" resultType="org.jeecg.modules.system.entity.SysAnnouncement">
SELECT TOP 1 * FROM sys_announcement WHERE msg_content = #{messageContent} ORDER BY create_time DESC;
</select>
+ <select id="getMessageType" resultType="java.lang.String">
+ SELECT DISTINCT
+ msg_category
+ FROM
+ sys_announcement
+ </select>
</mapper>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
index 5437ec3..aaff6e8 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java
@@ -7,6 +7,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.List;
/**
* @Description: 鐢ㄦ埛閫氬憡闃呰鏍囪琛�
@@ -47,6 +48,10 @@
* 娑堟伅绫诲瀷1:閫氱煡鍏憡2:绯荤粺娑堟伅
*/
private java.lang.String msgCategory;
+ /**
+ * 娑堟伅绫诲瀷1:閫氱煡鍏憡2:绯荤粺娑堟伅
+ */
+ private List<String> msgCategoryList;
/**
* 涓氬姟id
*/
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
index 1e4e10a..eacab16 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.vo.OptionsVo;
/**
* @Description: 鐢ㄦ埛閫氬憡闃呰鏍囪琛�
@@ -41,4 +42,5 @@
List<SysAnnouncementSend> getPrimaryInfo(String userId,List<String> msgCategoryList);
+ List<OptionsVo> getMessageType();
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java
index 941b114..683394e 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java
@@ -1,13 +1,18 @@
package org.jeecg.modules.system.service.impl;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.system.entity.SysAnnouncementSend;
import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
import org.jeecg.modules.system.model.AnnouncementSendModel;
import org.jeecg.modules.system.service.ISysAnnouncementSendService;
+import org.jeecg.modules.system.vo.OptionsVo;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,6 +38,16 @@
@Override
public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,
AnnouncementSendModel announcementSendModel) {
+
+ List<String> msgCategory = Lists.newArrayList();
+ if ("绯荤粺娑堟伅".equals(announcementSendModel.getMsgCategory())) {
+ msgCategory.addAll(Arrays.asList("绯荤粺娑堟伅", "2"));
+ }else if ("閫氱煡鍏憡".equals(announcementSendModel.getMsgCategory())) {
+ msgCategory.addAll(Arrays.asList("閫氱煡鍏憡", "1"));
+ }else if (StringUtils.isNotBlank(announcementSendModel.getMsgCategory())){
+ msgCategory.addAll(Arrays.asList(announcementSendModel.getMsgCategory()));
+ }
+ announcementSendModel.setMsgCategoryList(msgCategory);
return page.setRecords(sysAnnouncementSendMapper.getMyAnnouncementSendList(page, announcementSendModel));
}
@@ -46,4 +61,28 @@
return baseMapper.getPrimaryInfo(userId,msgCategoryList);
}
+ @Override
+ public List<OptionsVo> getMessageType() {
+ Set<OptionsVo> result = new HashSet<>();
+ List<String> messageTypeList = this.baseMapper.getMessageType();
+ if (messageTypeList != null && !messageTypeList.isEmpty()) {
+ for (String messageType : messageTypeList) {
+ OptionsVo optionsVo = new OptionsVo();
+ String label = messageType;
+ String value = messageType;
+ if (CommonConstant.MSG_CATEGORY_2.equals(messageType)) {
+ label = "绯荤粺娑堟伅";
+ value = "绯荤粺娑堟伅";
+ } else if (CommonConstant.MSG_CATEGORY_1.equals(messageType)) {
+ label = "閫氱煡鍏憡";
+ value = "閫氱煡鍏憡";
+ }
+ optionsVo.setLabel(label);
+ optionsVo.setValue(value);
+ result.add(optionsVo);
+ }
+ }
+ return new ArrayList<>(result);
+ }
+
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/vo/OptionsVo.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/vo/OptionsVo.java
new file mode 100644
index 0000000..e588bf1
--- /dev/null
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/vo/OptionsVo.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.system.vo;
+
+import lombok.Data;
+
+/**
+ * @author: LiuS
+ * @create: 2023-09-18 10:35
+ */
+@Data
+public class OptionsVo {
+
+ private String value;
+
+ private String label;
+
+}
--
Gitblit v1.9.3