From 699295ce3e0e1116d1fc20f0fae89b66613bbacf Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 28 八月 2025 17:40:51 +0800
Subject: [PATCH] 企业微信消息推送增加try catch 只记录错误日志,不抛出异常

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index 4bc6c16..4c885b6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -153,7 +153,11 @@
                 //鏇存柊璁惧淇濆吇鐘舵��
                 eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
                 //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
-                sendQywxTemplateCardMessage(order, null);
+                try {
+                    sendQywxTemplateCardMessage(order, null);
+                } catch (Exception e) {
+                    log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+                }
                 return result.isSuccess();
             }
         }
@@ -345,7 +349,11 @@
             //鏇存柊璁惧淇濆吇鐘舵��
             eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
             //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
-            sendQywxTemplateCardMessage(entity, null);
+            try {
+                sendQywxTemplateCardMessage(entity, null);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
             return result.isSuccess();
         }
         return true;
@@ -432,8 +440,12 @@
                 //鏂板鐨勫伐鍗曪紙鎸囧畾浜嗕繚鍏讳汉锛夈�佹柊棰嗗彇鐨勫伐鍗�
                 TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
                 content.setKeyname("鍙戣捣浜�");
-                SysUser sysUser = sysUserService.getUserByName(order.getCreateBy());
-                content.setValue(sysUser.getRealname());
+                if (order.getCreateBy() == null) {
+                    content.setValue("瀹氭椂浠诲姟鐢熸垚");
+                } else {
+                    SysUser  sysUser = sysUserService.getUserByName(order.getCreateBy());
+                    content.setValue(sysUser.getRealname());
+                }
                 horizontalContentList.add(content);
             } else {
                 //琚┏鍥炵殑宸ュ崟
@@ -455,42 +467,23 @@
             SysUser sysUser = sysUserService.getUserByName(order.getOperator());
             content.setValue(sysUser.getRealname());
             horizontalContentList.add(content);
-            //TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
-            //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
-            //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
-            //content.setKeyname("纭浜�");
-            //content.setValue(realNameStr);
-            //horizontalContentList.add(content);
         }
         if (WeekMaintenanceStatusEnum.WAIT_INITIAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
             TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
-            //TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
             String confirmAssignee = request.getAssignee();
             SysUser confirmUser = sysUserService.getUserByName(confirmAssignee);
             content3.setKeyname("纭浜�");
             content3.setValue(confirmUser.getRealname());
             horizontalContentList.add(content3);
-            //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
-            //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
-            //content4.setKeyname("鍒濋獙浜�");
-            //content4.setValue(realNameStr);
-            //horizontalContentList.add(content4);
         }
         if (WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
             TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
-            //TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
             String initialAssignee = request.getAssignee();
             SysUser initialUser = sysUserService.getUserByName(initialAssignee);
             content3.setKeyname("鍒濋獙浜�");
             content3.setValue(initialUser.getRealname());
             horizontalContentList.add(content3);
-            //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
-            //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
-            //content4.setKeyname("缁堥獙浜�");
-            //content4.setValue(realNameStr);
-            //horizontalContentList.add(content4);
         }
-
         templateCardEntity.setHorizontal_content_list(horizontalContentList);
 
         TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
@@ -673,7 +666,11 @@
         eamWeekMaintenanceOrderMapper.updateById(entity);
         //鎺ㄩ�佷紒涓氬井淇℃秷鎭紝宸ュ崟瀹岀粨涓嶅彂閫�
         if (!WeekMaintenanceStatusEnum.COMPLETE.name().equals(entity.getMaintenanceStatus())) {
-            sendQywxTemplateCardMessage(entity, request);
+            try {
+                sendQywxTemplateCardMessage(entity, request);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
         }
         return entity;
     }

--
Gitblit v1.9.3