From 254932f503b41e246e88d76e33d1a9b860597630 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 26 十月 2026 16:27:03 +0800
Subject: [PATCH] 【丽水】JC_BG_BaoGao 同步报错问题处理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
index eb956a2..2d70b4d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.service.IServiceExternalService;
@@ -50,8 +51,7 @@
try {
aBoolean = serviceExternalService.generalInterface(dataMap);
} catch (Exception e) {
- e.printStackTrace();
- log.error("serviceExternal---generalInterface鍑哄紓甯镐簡锛歿}", e.getMessage());
+ log.error("serviceExternal---generalInterface鍑哄紓甯镐簡锛歿}", e.getMessage(), e);
aBoolean = false;
}
return returnParam(aBoolean, dataMap);
@@ -365,8 +365,7 @@
try {
aBoolean = serviceExternalService.addInspectBGService(dataMap);
} catch (Exception e) {
- e.printStackTrace();
- log.error("serviceExternal---addInspectBGService锛歿}", e.getMessage());
+ log.error("serviceExternal---addInspectBGService锛歿}", e.getMessage(), e);
aBoolean = false;
}
return returnParam(aBoolean, dataMap);
@@ -390,8 +389,19 @@
private Map<String, Object> returnParam(Boolean b, Map dataMap) {
- Map yeWuXX = (Map) dataMap.get("YeWuXX");
- String XiaoXiID = (String) yeWuXX.get("XiaoXiID");
+ String XiaoXiID = null;
+ if (dataMap != null) {
+ Map yeWuXX = (Map) dataMap.get("YeWuXX");
+ if (yeWuXX != null && yeWuXX.get("XiaoXiID") != null) {
+ XiaoXiID = yeWuXX.get("XiaoXiID").toString();
+ }
+ if (StringUtils.isBlank(XiaoXiID)) {
+ Map xiaoXiTou = (Map) dataMap.get("XiaoXiTou");
+ if (xiaoXiTou != null && xiaoXiTou.get("XiaoXiID") != null) {
+ XiaoXiID = xiaoXiTou.get("XiaoXiID").toString();
+ }
+ }
+ }
Map<String, Object> map = new HashMap<>();
if (b) {
--
Gitblit v1.9.3