From 981634fa893b787f2991d99ebf60276eee8d28c7 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 24 Aug 2024 19:01:44 +0800
Subject: [PATCH] 1、新增disp、mediate、sys服务 2、集成工作流流程设计器
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java | 152 +++++++++++++++++++++++---------------------------
1 files changed, 69 insertions(+), 83 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 af5df0f..eb1e175 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,26 +1,23 @@
-package cn.huge.module.ctuser.controller;
+package cn.huge.module.ctuser.controller.web;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.ctuser.domain.po.CtUser;
-import cn.huge.module.ctuser.service.CtUserService;
+import cn.huge.base.config.CurrentUser;
+import cn.huge.module.ctrole.service.CtRoleService;
+import cn.huge.module.ctuser.dto.CtUserSaveDTO;
+import cn.huge.module.ctuser.service.*;
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.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
@@ -36,6 +33,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参数
@@ -241,85 +256,56 @@
}
/**
- * 条件查询多个
- * @url {ctx}/api/web/ctUser/listQuery
- * @return Object
- */
- @GetMapping("/listQuery")
- public Object listQuery() {
- try {
- Map<String, Object> terms = getParameter();
- return ReturnSucUtils.getRepInfo(service.listTerms(terms));
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 条件分页查询
- * @url {ctx}/api/web/ctUser/pageQuery
- * @param page 页码
- * @param size 每页数量
- * @return Object
- */
- @GetMapping("/pageQuery")
- public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
- try {
- Map<String, Object> terms = getParameter();
- Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
- PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- Page<CtUser> ctUserPage = service.pageQuery(pageRequest, terms);
- return ReturnSucUtils.getRepInfo( "处理成功", ctUserPage);
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 根据编号查询单个
- * @url {ctx}/api/web/ctUser/getById
- * @param id 主键编号
- * @return Object
- */
- @GetMapping("/getById")
- public Object getById(@RequestParam(value = "id") String id) {
- try {
- return ReturnSucUtils.getRepInfo(service.getById(id));
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 根据主键单个
- * @url {ctx}/api/web/ctUser/deleteById
- * @param ids 主键编号
- * @return Object
- */
- @GetMapping("/deleteById")
- public Object deleteById(@RequestParam(value = "id") String id) {
- try {
- service.removeById(id);
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 新增或更新对象
- * @url {ctx}/api/web/ctUser/saveCtUser
- * @param ctUser 实体对象
- * @return Object
- */
+ * web端-人员信息管理-新增/新用户信息
+ * @url {ctx}/api/v1/ctUser/saveCtUser
+ * @param userId
+ * @return Object
+ * @throws Exception
+ */
@PostMapping("/saveCtUser")
- public Object saveCtUser(@RequestBody CtUser ctUser) {
+ public Object saveCtUser(@RequestBody CtUserSaveDTO ctUserSaveDTO, @CurrentUser String userId) {
try {
- service.saveCtUser(ctUser);
+ // 保存更新用户信息
+ 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