From 0b597ea4500b3463ac9f0983dbabaca52417226c Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 14 Sep 2024 12:21:37 +0800
Subject: [PATCH] 回退上报流程bug修复2
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java | 282 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 198 insertions(+), 84 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 730926e..4ca98a3 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,27 @@
-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.module.ctuser.domain.po.CtUser;
-import cn.huge.module.ctuser.service.CtUserService;
+import cn.huge.base.common.utils.SelectTermUtils;
+import cn.huge.base.config.CurrentUser;
+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.CtUserInfoDTO;
+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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -14,16 +29,19 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+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-17 15:30:57
+ * @time: 2024-08-19 20:04:19
* @version: 1.0.0
*/
@Slf4j
@@ -36,6 +54,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参数
@@ -213,7 +249,7 @@
if (StringUtils.isNotBlank(dispStatus)){
terms.put("dispStatus", dispStatus);
}
- // 删除状态，0：已删除（默认），1：未删除
+ // 删除状态，0：未删除，1：已删除
String deleteStatus = request.getParameter("deleteStatus");
if (StringUtils.isNotBlank(deleteStatus)){
terms.put("deleteStatus", deleteStatus);
@@ -237,93 +273,171 @@
terms.put("updateStart", updateStart);
terms.put("updateEnd", updateEnd);
}
+ // 平台账号
+ String acc = request.getParameter("acc");
+ if (StringUtils.isNotBlank(acc)){
+ terms.put("acc", acc);
+ }
+ // 角色编码
+ String roleCode = request.getParameter("roleCode");
+ if (StringUtils.isNotBlank(roleCode)){
+ terms.put("roleCode", roleCode);
+ }
+
return terms;
}
/**
- * 条件查询多个
- * @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/deleteByIds
- * @param ids 主键编号
- * @return Object
- */
- @GetMapping("/deleteByIds")
- public Object deleteByIds(@RequestParam(value = "ids") String ids) {
- try {
- if (ids.indexOf(",") != -1) {
- service.removeByIds(Stream.of(ids.split(",")).collect(Collectors.toList()));
- }else{
- service.removeById(ids);
- }
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 新增或更新对象
- * @url {ctx}/api/web/ctUser/saveCtUser
- * @param ctUser 实体对象
- * @return Object
- */
+ * web端-人员信息管理-新增/新用户信息
+ * @url {ctx}/api/web/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/web/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/web/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();
+ }
+ }
+
+ /**
+ * 更新人员状态信息
+ * @url {ctx}/api/web/ctUser/updateCtUserStatus
+ * @param id 编号 status ：用户状态，1：在职（默认），2：停用，99：离职
+ * @return Object
+ * @throws Exception
+ */
+ @GetMapping("/updateCtUserStatus")
+ public Object updateCtUserStatus(@RequestParam(value = "status") String status, @RequestParam(value = "id") String id) {
+ try {
+ // 修改状态
+ UpdateWrapper<CtUser> ctUserUpdateWrapper = new UpdateWrapper();
+ ctUserUpdateWrapper.eq("id", id);
+ ctUserUpdateWrapper.set("status", status).set("update_time", new Date());
+ service.update(ctUserUpdateWrapper);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 根据主键单个/批量删除
+ * @url {ctx}/api/web/ctUser/removeByIds
+ * @return Object
+ * @throws Exception
+ */
+ @PostMapping("/removeByIds")
+ public Object removeByIds(@RequestBody List<String> data) {
+ try {
+ service.removeListId(data);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ log.error("Controller接口[CtUserController.removeByIds]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 选择人员
+ * @url {ctx}/api/web/ctUser/userChoose
+ * @return Object
+ */
+ @GetMapping("/userChoose")
+ public Object userChoose(@CurrentUser String userId) {
+ try {
+ String roleCode = request.getParameter("roleCode");
+ List<SelectTermDTO> unitSelectTerms = service.userChoose(userId, roleCode);
+ return ReturnSucUtils.getRepInfo(unitSelectTerms);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
+
+ /**
+ * 共通组件-根据人员编号查询单个人员信息及角色信息
+ * @url {ctx}/api/web/ctUser/getByIdRole
+ * @param id 主键编号
+ * @return Object
+ * @throws Exception
+ */
+ @GetMapping("/getByIdRole")
+ public Object getByIdRole(@RequestParam(value = "id") String id) {
+ try {
+ CtUserInfoDTO ctUserInfoDTO = new CtUserInfoDTO();
+ CtUser ctUser = service.getById(id);
+ if (ObjectUtils.isNotEmpty(ctUser)) {
+ BeanUtils.copyProperties(ctUser, ctUserInfoDTO);
+ CtAccount ctAccount = ctAccountService.getByUserIdAndType(id, UserBaseConsts.ACC_TYPE_1);
+ ctUserInfoDTO.setLoginTime(ctAccount.getLoginTime());
+ ctUserInfoDTO.setAcc(ctAccount.getAcc());
+ List<String> roleNameList = ctUseroleService.listRoleName(id);
+ if (CollectionUtils.isNotEmpty(roleNameList)) {
+ String userRoles = roleNameList.stream().map(String::valueOf).collect(Collectors.joining("、"));
+ ctUserInfoDTO.setUserRoles(userRoles);
+ }
+ }
+ return ReturnSucUtils.getRepInfo(ctUserInfoDTO);
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 人工配置-统一修改单位名称
+ * @url {ctx}/api/web/ctUser/updateUnitName
+ * @param id 主键编号
+ * @return Object
+ * @throws Exception
+ */
+ @GetMapping("/getByIdupdateUnitNameRole")
+ public Object updateUnitName() {
+ try {
+
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
}
--
Gitblit v1.8.0