消息类型更新

hyingbo

2025-06-06 a3cb768d958e64625786857e0db69335875f5d8e

消息类型更新

 lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageSplitTypeEnum.java

@@ -18,7 +18,7 @@
    /** 设备运行异常 */
    deviceRunError("deviceRunError", "设备运行异常",  "device_run_error"),
    /** 钉状态长期无变化 */
    statusPermanentlyNoChange("statusPermanentlyNoChange", "钉状态长期无变化", "status_permanently_no_change"),
    statusPermanentlyNoChange("statusPermanentlyNoChange", "状态长期无变化", "status_permanently_no_change"),
    /** 网络故障 */
    networkFault("networkFault", "网络故障", "network_fault");


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -1190,7 +1190,7 @@
                     MessageDTO messageDTO = new MessageDTO();
                     messageDTO.setTitle(headInfo);
                     messageDTO.setFromUser("数据导入小助手-小导");
                     messageDTO.setCategory("导入操作附加信息");
                     messageDTO.setCategory("导入信息");
                     messageDTO.setContent(exceptionInfo);
                     messageDTO.setToUser(user.getUsername());
                     sysBaseApi.sendSysAnnouncement(messageDTO);

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java

@@ -296,7 +296,7 @@
         MessageDTO messageDTO = new MessageDTO();
         messageDTO.setTitle("有新的保养工单");
         messageDTO.setContent(msg);
         messageDTO.setCategory("系统消息");
         messageDTO.setCategory("保养工单");
         messageDTO.setFromUser(user.getUsername());
         messageDTO.setToUser("admin");
         if(equipmentMaintenancePlanDetails.size()!=0){

 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java

@@ -172,7 +172,7 @@
            messageTitle = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件库存量不足，请及时处理!";
            messageContent = "系统消息：备件编码：" + sparePart.getNum()  + " 的备件库存量已低于安全库存!" + "\n" + "消息时间:" + sysTime + "\n";
            for (SysUser sysUser : sysUsers) {
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "备件库存量不足");
            }
        }else if(quantity > sparePart.getInventoryUpperLimit()){
            String messageTitle;
@@ -181,7 +181,7 @@
            messageTitle = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件出现积压情况，请及时处理!";
            messageContent = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件库存量已高于库存上限值，出现积压情况!" + "\n" + "消息时间:" + sysTime + "\n";
            for (SysUser sysUser : sysUsers) {
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "备件积压");
            }
        }
        return true;

 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java

@@ -162,7 +162,7 @@
            messageTitle = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件库存量不足，请及时处理!";
            messageContent = "系统消息：备件编码：" + sparePart.getNum()  + " 的备件库存量已低于安全库存!" + "\n" + "消息时间:" + sysTime + "\n";
            for (SysUser sysUser : sysUsers) {
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "备件库存量不足");
            }
        }else if(quantity > sparePart.getInventoryUpperLimit()){
            String messageTitle;
@@ -171,7 +171,7 @@
            messageTitle = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件出现积压情况，请及时处理!";
            messageContent = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件库存量已高于库存上限值，出现积压情况!" + "\n" + "消息时间:" + sysTime + "\n";
            for (SysUser sysUser : sysUsers) {
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "备件积压");
            }
        }
        return true;

 lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java

@@ -166,7 +166,7 @@
            messageTitle = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件库存量不足，请及时处理!";
            messageContent = "系统消息：备件编码：" + sparePart.getNum()  + " 的备件库存量已低于安全库存!" + "\n" + "消息时间:" + sysTime + "\n";
            for (SysUser sysUser : sysUsers) {
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "备件库存量不足");
            }
        }else if(quantity > sparePart.getInventoryUpperLimit()){
            String messageTitle;
@@ -175,7 +175,7 @@
            messageTitle = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件出现积压情况，请及时处理!";
            messageContent = "系统消息：备件编码为 " + sparePart.getNum() + " 的备件库存量已高于库存上限值，出现积压情况!" + "\n" + "消息时间:" + sysTime + "\n";
            for (SysUser sysUser : sysUsers) {
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
                sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "备件积压");
            }
        }
        return true;

 lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -448,5 +448,5 @@
     * @param title  消息主题
     * @param msgContent  消息内容
     */
    public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent);
    public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent, String category);
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -1483,7 +1483,7 @@
    }

    @Override
    public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent) {
    public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent, String category) {
        SysAnnouncement announcement = new SysAnnouncement();
        announcement.setTitile(title);
        announcement.setMsgContent(msgContent);
@@ -1492,7 +1492,7 @@
        announcement.setMsgType(CommonConstant.MSG_TYPE_UESR);
        announcement.setSendStatus(CommonConstant.HAS_SEND);
        announcement.setSendTime(new Date());
        announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2);
        announcement.setMsgCategory(org.apache.commons.lang3.StringUtils.isNotBlank(category) ? category : CommonConstant.MSG_CATEGORY_2);
        announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
        sysAnnouncementMapper.insert(announcement);
        // 2.插入用户通告阅读标记表记录