From e0b8a22df9a40e1b5691140e23721d2c0a5a5a0b Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 25 Oct 2024 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_grid' into gzdyh_grid
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
index 2abecc2..760db38 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java
@@ -10,6 +10,7 @@
import cn.huge.module.ctuser.dto.CtAccountLoginDTO;
import cn.huge.module.ctuser.dto.CtCipherDTO;
import cn.huge.module.ctuser.service.CtAccountService;
+import cn.huge.module.sys.dto.GridTokenBaseDTO;
import cn.huge.module.utils.JwtUtils;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
@@ -99,19 +100,18 @@
}
/**
- * 微服务调用-数据迁移-批量新增
- * @url {ctx}/api/web/ctAccount/saveCtAccountList
- * @param targetCtAccountList 实体对象
+ * web端-网格系统单点登录
+ * @url {ctx}/api/web/ctAccount/gridLogin
+ * @param gridTokenBaseDTO 网格系统token
* @return Object
*/
- @PostMapping("/saveCtAccountList")
- public Object saveCtAccountList(@RequestBody List<CtAccount> targetCtAccountList) {
+ @PostMapping(value = "gridLogin")
+ public Object gridLogin(@RequestBody GridTokenBaseDTO gridTokenBaseDTO) {
try {
- service.saveBatch(targetCtAccountList,1000);
- return ReturnSucUtils.getRepInfo();
+ ReturnBO returnBO = service.webGridLogin(gridTokenBaseDTO);
+ return returnBO;
} catch (Exception e) {
- log.info(e.getMessage(), e);
- return ReturnFailUtils.getRepInfo();
+ return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
--
Gitblit v1.8.0