From c1a463b9f1c0a7160dbd0ac1c7490eef13861a5e Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Tue, 29 Oct 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 f95e399..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
@@ -1,4 +1,4 @@
-package cn.huge.module.ctuser.controller;
+package cn.huge.module.ctuser.controller.web;
import cn.huge.base.common.bo.ReturnBO;
import cn.huge.base.common.utils.ReturnFailUtils;
@@ -6,9 +6,11 @@
import cn.huge.base.config.CurrentUser;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.ctuser.domain.po.CtAccount;
+import cn.huge.module.ctuser.domain.po.CtUnit;
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;
@@ -20,6 +22,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -82,7 +86,7 @@
/**
* web端-工作人员-修改密码
- * @url {ctx}/api/v1/ctAccount/changeCipher
+ * @url {ctx}/api/web/ctAccount/changeCipher
* @param ctCipherDTO 修改密码对象
* @return Object
*/
@@ -95,4 +99,20 @@
}
}
+ /**
+ * web端-网格系统单点登录
+ * @url {ctx}/api/web/ctAccount/gridLogin
+ * @param gridTokenBaseDTO 网格系统token
+ * @return Object
+ */
+ @PostMapping(value = "gridLogin")
+ public Object gridLogin(@RequestBody GridTokenBaseDTO gridTokenBaseDTO) {
+ try {
+ ReturnBO returnBO = service.webGridLogin(gridTokenBaseDTO);
+ return returnBO;
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.8.0