From 0c6754b975a29eb207304a9714a0d0f6a7d9748c Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 21 Aug 2024 20:37:15 +0800
Subject: [PATCH] 1、优化代码生成器 2、优化用户中心 3、新增client微服务调用controller
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java | 80 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
index dbfbcb0..185774d 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java
@@ -1,12 +1,23 @@
-package cn.huge.module.ctuser.controller;
+package cn.huge.module.ctuser.controller.web;
+import cn.huge.base.common.dto.SelectTermDTO;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.base.common.utils.SelectTermUtils;
import cn.huge.base.config.CurrentUser;
-import cn.huge.module.ctuser.domain.po.CtUser;
-import cn.huge.module.ctuser.service.CtUserService;
+import cn.huge.module.ctrole.domain.po.CtRole;
+import cn.huge.module.ctrole.service.CtRoleService;
+import cn.huge.module.ctuser.domain.po.*;
+import cn.huge.module.ctuser.dto.CtUserSaveDTO;
+import cn.huge.module.ctuser.service.*;
+import cn.huge.module.cust.constant.RoleBaseEnum;
+import cn.huge.module.cust.constant.UserBaseConsts;
+import cn.huge.module.cust.dto.CtUserDTO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -15,13 +26,15 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
- * @title: 客户用户表接口api
- * @description: 客户用户表接口api
+ * @title: 客户用户表接口api-web端
+ * @description: 客户用户表接口api-web端
* @company: hugeinfo
* @author: liyj
* @time: 2024-08-19 20:04:19
@@ -37,6 +50,24 @@
@Autowired
private CtUserService service;
+
+ @Autowired
+ private CtUnitService ctUnitService;
+
+ @Autowired
+ private CtRoleService ctRoleService;
+
+ @Autowired
+ private CtDeptService ctDeptService;
+
+ @Autowired
+ private CtUseroleService ctUseroleService;
+
+ @Autowired
+ private CtAccountService ctAccountService;
+
+ @Autowired
+ private CtUsepostService ctUsepostService;
/**
* 获取请求URL参数
@@ -249,14 +280,49 @@
* @throws Exception
*/
@PostMapping("/saveCtUser")
- public Object saveCtUser(@RequestBody CtUser ctUser, @CurrentUser String userId) {
+ public Object saveCtUser(@RequestBody CtUserSaveDTO ctUserSaveDTO, @CurrentUser String userId) {
try {
// 保存更新用户信息
- service.webSaveCtUser(ctUser, userId);
+ service.webSaveCtUser(ctUserSaveDTO, userId);
return ReturnSucUtils.getRepInfo();
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
}
+ /**
+ * 获取人员信息列表查询条件
+ * @url {ctx}/api/v1/ctUser/listSelectTerm
+ * @return userId 登录用户标识称
+ * @return Object
+ * @throws Exception
+ */
+ @GetMapping("/listSelectTerm")
+ public Object listSelectTerm(@CurrentUser String userId) {
+ try {
+ Map<String, Object> result = service.webListSelectTerm(userId);
+ return ReturnSucUtils.getRepInfo(result);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * web端-人员信息管理-人员列表
+ * @url {ctx}/api/v1/ctUser/pageQuery
+ * @param page 页码
+ * @param size 每页数量
+ * @return Object
+ */
+ @GetMapping("/pageQuery")
+ public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
+ @CurrentUser String userId) {
+ try {
+ Map<String, Object> terms = getParameter();
+ Map<String, Object> result = service.webPageQuery(page, size, terms, userId);
+ return ReturnSucUtils.getRepInfo(result);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
}
--
Gitblit v1.8.0