Merge pull request #43 from Jzow/master

Add dept api and fix createTime filed format show error
wansenai · Sep 23, 2023 · 06bd953 · 06bd953
2 parents c23f60b + 7dfdf8d
commit 06bd953
Show file tree

Hide file tree

Showing 16 changed files with 1,497 additions and 2,652 deletions.
diff --git a/api/src/main/java/com/wansensoft/api/common/CommonController.java b/api/src/main/java/com/wansensoft/api/common/CommonController.java
@@ -15,7 +15,7 @@
 import com.wansensoft.service.common.CommonService;
 import com.wansensoft.utils.response.Response;
 import com.wansensoft.utils.constants.ApiVersionConstants;
-import com.wansensoft.utils.enums.CodeEnum;
+import com.wansensoft.utils.enums.BaseCodeEnum;
 import com.wansensoft.vo.CaptchaVO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -36,7 +36,7 @@ public CommonController(CommonService commonService) {
     public Response<CaptchaVO> getCaptcha() {
         CaptchaVO captchaVo = commonService.getCaptcha();
         if(captchaVo == null) {
-            return Response.responseMsg(CodeEnum.ERROR);
+            return Response.responseMsg(BaseCodeEnum.ERROR);
         }
         return Response.responseData(captchaVo);
     }
@@ -45,8 +45,8 @@ public Response<CaptchaVO> getCaptcha() {
     public Response<String> sendSmsCode(@PathVariable Integer type, @PathVariable String phoneNumber) {
         boolean result = commonService.sendSmsCode(type, phoneNumber);
         if(!result) {
-            return Response.responseMsg(CodeEnum.PHONE_NUMBER_FORMAT_ERROR);
+            return Response.responseMsg(BaseCodeEnum.PHONE_NUMBER_FORMAT_ERROR);
         }
-        return Response.responseMsg(CodeEnum.SMS_VERIFY_SEND_SUCCESS);
+        return Response.responseMsg(BaseCodeEnum.SMS_VERIFY_SEND_SUCCESS);
     }
 }
diff --git a/api/src/main/java/com/wansensoft/api/user/SysUserController.java b/api/src/main/java/com/wansensoft/api/user/SysUserController.java
@@ -84,7 +84,7 @@ public Response<Page<UserListVO>> list(@RequestBody UserListDTO userListDto) {
 
     @PostMapping(value = "update")
     public Response<String> update(@RequestBody UpdateUserDTO updateUserDTO) {
-        return null;
+        return userService.updateUser(updateUserDTO);
     }
 
 }
diff --git a/docs/wansenerp-2023-09-23.sql b/docs/wansenerp-2023-09-23.sql
diff --git a/docs/wansenerp.sql b/docs/wansenerp.sql
diff --git a/docs/数据库更新记录-首次安装请勿使用.txt b/docs/数据库更新记录-首次安装请勿使用.txt
diff --git a/domain/src/main/java/com/wansensoft/vo/UserListVO.java b/domain/src/main/java/com/wansensoft/vo/UserListVO.java
@@ -1,16 +1,26 @@
 package com.wansensoft.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class UserListVO {
 
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long roleId;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long deptId;
+
     private String username;
 
     private String name;
@@ -23,6 +33,10 @@ public class UserListVO {
 
     private Integer status;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private String createTime;
+    private String type;
+
+    private String deptName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
 }
diff --git a/service/src/main/java/com/wansensoft/service/system/impl/SysDepartmentServiceImpl.java b/service/src/main/java/com/wansensoft/service/system/impl/SysDepartmentServiceImpl.java
@@ -9,7 +9,7 @@
 import com.wansensoft.entities.SysDepartment;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wansensoft.service.user.ISysUserService;
-import com.wansensoft.utils.enums.CodeEnum;
+import com.wansensoft.utils.enums.BaseCodeEnum;
 import com.wansensoft.utils.response.Response;
 import com.wansensoft.vo.DeptListVO;
 import org.springframework.stereotype.Service;
@@ -57,7 +57,7 @@ public Response<List<DeptListVO>> getUserDeptRel() {
 
         var departments = departmentMapper.selectBatchIds(userDeptRelList);
         if(departments.isEmpty()) {
-            return Response.responseMsg(CodeEnum.QUERY_DATA_EMPTY);
+            return Response.responseMsg(BaseCodeEnum.QUERY_DATA_EMPTY);
         }
         // find children department only 2 leave
         departments.forEach(item -> {

diff --git a/service/src/main/java/com/wansensoft/service/user/ISysUserDeptRelService.java b/service/src/main/java/com/wansensoft/service/user/ISysUserDeptRelService.java
@@ -15,11 +15,14 @@
 import com.wansensoft.entities.user.SysUserDeptRel;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 部门用户关系表 服务类
  * </p>
  */
 public interface ISysUserDeptRelService extends IService<SysUserDeptRel> {
 
+    List<SysUserDeptRel> queryBatchByUserIds(List<Long> userIds);
 }
diff --git a/service/src/main/java/com/wansensoft/service/user/ISysUserRoleRelService.java b/service/src/main/java/com/wansensoft/service/user/ISysUserRoleRelService.java
@@ -25,4 +25,6 @@
 public interface ISysUserRoleRelService extends IService<SysUserRoleRel> {
 
     List<SysUserRoleRel> queryByUserId(long userId);
+
+    List<SysUserRoleRel> queryBatchByUserIds(List<Long> userIds);
 }
diff --git a/service/src/main/java/com/wansensoft/service/user/ISysUserService.java b/service/src/main/java/com/wansensoft/service/user/ISysUserService.java
@@ -53,4 +53,5 @@ public interface ISysUserService extends IService<SysUser> {
     Response<String> userLogout();
 
     Response<Page<UserListVO>> userList(UserListDTO pageDto);
+    Response<String> updateUser(UpdateUserDTO updateUserDTO);
 }
diff --git a/service/src/main/java/com/wansensoft/service/user/impl/SysUserDeptRelServiceImpl.java b/service/src/main/java/com/wansensoft/service/user/impl/SysUserDeptRelServiceImpl.java
@@ -6,6 +6,8 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 部门用户关系表 服务实现类
@@ -17,4 +19,10 @@
 @Service
 public class SysUserDeptRelServiceImpl extends ServiceImpl<SysUserDeptRelMapper, SysUserDeptRel> implements ISysUserDeptRelService {
 
+    @Override
+    public List<SysUserDeptRel> queryBatchByUserIds(List<Long> userIds) {
+        return lambdaQuery()
+                .in(SysUserDeptRel::getUserId, userIds)
+                .list();
+    }
 }
diff --git a/service/src/main/java/com/wansensoft/service/user/impl/SysUserRoleRelServiceImpl.java b/service/src/main/java/com/wansensoft/service/user/impl/SysUserRoleRelServiceImpl.java
@@ -25,4 +25,11 @@ public List<SysUserRoleRel> queryByUserId(long userId) {
                 .eq(SysUserRoleRel::getUserId, userId)
                 .list();
     }
+
+    @Override
+    public List<SysUserRoleRel> queryBatchByUserIds(List<Long> userIds) {
+        return lambdaQuery()
+                .in(SysUserRoleRel::getUserId, userIds)
+                .list();
+    }
 }