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 | 70 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 11 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 b696c11..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
@@ -4,7 +4,10 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.controller.BaseController;
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;
import com.smartor.service.IServiceSubtaskDetailService;
@@ -13,10 +16,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.HashMap;
@@ -37,6 +37,8 @@
private IServiceExternalService serviceExternalService;
@Autowired
private ISvyTaskSingleService svyTaskSingleService;
+ @Autowired
+ private ISysConfigService configService;
/**
* 閫氱敤鎺ュ彛
@@ -49,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);
@@ -83,6 +84,10 @@
log.info("------serviceQueryInfo鐨勫叆鍙備负锛歿}", serviceQueryInfo);
Map map = null;
try {
+ String url = configService.selectConfigByKey("token.360", serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
+ serviceQueryInfo.setUrl(url);
+ String url360 = configService.selectConfigByKey("url.360", serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
+ serviceQueryInfo.setUrl360(url360);
map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
} catch (Exception e) {
e.printStackTrace();
@@ -137,6 +142,24 @@
} catch (Exception e) {
e.printStackTrace();
log.error("serviceExternal---addUserInfo鍑哄紓甯镐簡锛歿}", e.getMessage());
+ aBoolean = false;
+ }
+ return returnParam(aBoolean, dataMap);
+
+ }
+
+ /**
+ * 鏂板绉戝淇℃伅
+ */
+ @ApiOperation("鏂板鐢ㄦ埛淇℃伅")
+ @PostMapping("/addUserDeptInfo")
+ public Map<String, Object> addUserDeptInfo(@RequestBody Map dataMap) {
+ Boolean aBoolean = true;
+ try {
+ aBoolean = serviceExternalService.addUserDeptInfo(dataMap);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("serviceExternal---addUserDeptInfo鍑哄紓甯镐簡锛歿}", e.getMessage());
aBoolean = false;
}
return returnParam(aBoolean, dataMap);
@@ -342,19 +365,43 @@
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);
}
-
+ /**
+ * 360鎮ｈ�呬俊鎭幏鍙�
+ */
+ @ApiOperation("360鎮ｈ�呬俊鎭幏鍙栵紙鏉ユ湭鏉ワ級")
+ @GetMapping("/query360PatInfolwl/{patid}")
+ public Map<String, Object> query360PatInfolwl(@PathVariable("patid") Long patid) {
+ Map<String, Object> result = new HashMap<>();
+ if (patid == null) {
+ result.put("url", null);
+ result.put("error", "鎮ｈ�卛d涓虹┖");
+ return result;
+ }
+ LoginUser loginUser = getLoginUser();
+ return serviceExternalService.query360PatInfolwl(patid, loginUser.getUser());
+ }
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) {
@@ -372,4 +419,5 @@
return map;
}
+
}
--
Gitblit v1.9.3