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/EamRepairOrderServiceImpl.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 40028d3..81ed54b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -47,6 +47,7 @@
 import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -96,6 +97,9 @@
 
     @Resource
     private ISysUserService sysUserService;
+
+    @Value("${wechatEnterprise.cardActionUrl}")
+    private String cardActionUrl;
 
     /**
      * 鍒嗛〉鍒楄〃
@@ -217,7 +221,11 @@
             //鏇存柊璁惧缁翠慨鐘舵��
             eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
             //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
-            sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
+            try {
+                sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
         }
     }
 
@@ -232,6 +240,7 @@
         String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
         eamRepairOrder.setRepairCode(codeSeq);
         EamReportRepair eamReportRepair = eamReportRepairService.getById(eamReportRepairQuery.getId());
+        eamRepairOrder.setReportId(eamReportRepairQuery.getId());
         eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
         eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
         eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
@@ -263,7 +272,11 @@
             //鏇存柊璁惧缁翠慨鐘舵��
             eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
             //鎺ㄩ�佷紒涓氬井淇℃秷鎭�
-            sendQywxTemplateCardMessage(eamRepairOrder, null, null);
+            try {
+                sendQywxTemplateCardMessage(eamRepairOrder, null, null);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
         }
     }
 
@@ -376,7 +389,7 @@
 
         TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
         cardAction.setType(1);
-        cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
+        cardAction.setUrl(cardActionUrl);
         templateCardEntity.setCard_action(cardAction);
 
         wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
@@ -444,7 +457,7 @@
                         values.put("dataId", eamRepairOrder.getId());
                         values.put("organization", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
                         values.put("comment", "缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
-                        values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
+                        values.put("NextAssignee", equipment.getEquipmentManager().split(","));
                         values.put("status", 1);
                         request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
                         eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
@@ -542,7 +555,11 @@
         eamReportRepairService.updateById(eamReportRepair);
         if (!ReportRepairEnum.COMPLETE.name().equals(eamRepairOrder.getRepairStatus())) {
             //鎺ㄩ�佷紒涓氬井淇℃秷鎭紙娴佺▼瀹岀粨涓嶅彂閫佹秷鎭級
-            sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
+            try {
+                sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
+            } catch (Exception e) {
+                log.error("鎺ㄩ�佷紒涓氬井淇℃秷鎭け璐ワ細" + e.getMessage(), e);
+            }
         }
         return eamRepairOrder;
     }

--
Gitblit v1.9.3