From abb0d631ffed8b67b0a78205ba127b46a4cb546b Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 16:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtAccountWebController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 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..2abecc2 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,27 @@
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.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 +85,7 @@
/**
* web端-工作人员-修改密码
- * @url {ctx}/api/v1/ctAccount/changeCipher
+ * @url {ctx}/api/web/ctAccount/changeCipher
* @param ctCipherDTO 修改密码对象
* @return Object
*/
@@ -86,4 +98,21 @@
}
}
+ /**
+ * 微服务调用-数据迁移-批量新增
+ * @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();
+ }
+ }
+
}
--
Gitblit v1.8.0