From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错,且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报,且点击上报后报错

---
 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 insertions(+), 1 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 d11e5ee..19a19ef 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
@@ -5,15 +5,28 @@
 import cn.huge.base.common.utils.ReturnSucUtils;
 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;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 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;
 
 /**
  * @title: 客户用户账号表接口api-web端-web端
@@ -73,7 +86,7 @@
 
     /**
      * web端-工作人员-修改密码
-     * @url {ctx}/api/v1/ctAccount/changeCipher
+     * @url {ctx}/api/web/ctAccount/changeCipher
      * @param ctCipherDTO 修改密码对象
      * @return Object
      */
@@ -86,4 +99,37 @@
         }
     }
 
+    /**
+     * 微服务调用-数据迁移-批量新增
+     * @url {ctx}/api/web/ctAccount/saveCtAccountList
+     * @param targetCtAccountList 实体对象
+     * @return Object
+     */
+    @PostMapping("/saveCtAccountList")
+    public Object saveCtAccountList(@RequestBody List<CtAccount> targetCtAccountList) {
+        try {
+            service.saveBatch(targetCtAccountList,1000);
+            return ReturnSucUtils.getRepInfo();
+        } catch (Exception e) {
+            log.info(e.getMessage(), e);
+            return ReturnFailUtils.getRepInfo();
+        }
+    }
+
+    /**
+     * 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