From 1713fac8ca97c63924d2f1ed08ef520a7b4a4439 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 06 二月 2026 17:34:24 +0800
Subject: [PATCH] 修改分页
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 7d2086f..9751402 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
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.service.IServiceExternalService;
import com.smartor.service.IServiceSubtaskDetailService;
@@ -37,6 +38,8 @@
private IServiceExternalService serviceExternalService;
@Autowired
private ISvyTaskSingleService svyTaskSingleService;
+ @Autowired
+ private ISysConfigService configService;
/**
* 閫氱敤鎺ュ彛
@@ -62,7 +65,7 @@
@ApiOperation("鏂板浣撴浠诲姟杩涘瓙浠诲姟")
@PostMapping("/generalInterfaceAddTask")
public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceTaskInfo) {
- log.error("------serviceTaskInfo鐨勫�间负锛歿}", serviceTaskInfo);
+ log.info("------serviceTaskInfo鐨勫�间负锛歿}", serviceTaskInfo);
Integer res = 0;
try {
res = svyTaskSingleService.insertTaskInfo(serviceTaskInfo);
@@ -80,9 +83,13 @@
@ApiOperation("360鎮ｈ�呬俊鎭幏鍙�")
@PostMapping("/query360PatInfo")
public Map query360PatInfo(@RequestBody ServiceQueryInfo serviceQueryInfo) {
- log.error("------serviceQueryInfo鐨勫叆鍙備负锛歿}", serviceQueryInfo);
+ 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 +144,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);
@@ -351,7 +376,6 @@
-
private Map<String, Object> returnParam(Boolean b, Map dataMap) {
Map yeWuXX = (Map) dataMap.get("YeWuXX");
String XiaoXiID = (String) yeWuXX.get("XiaoXiID");
@@ -372,4 +396,8 @@
return map;
}
+
+
+
+
}
--
Gitblit v1.9.3