租户管理

saas-module/src/main/java/com/makeit/controller/saas/PlatTenantController.java

@@ -40,14 +40,14 @@ public class PlatTenantController {
     @Autowired
     private PlatTenantService platTenantService;
 
-    @Action(module = "租户管理-租户", name = "分页列表", code = "plat:tnt:tenant:page")
+    @Action(module = "租户管理-租户", name = "分页列表", code = "saas:tenant:page")
     @ApiOperation("分页列表")
     @PostMapping("page")
     public ApiResponseEntity<PageVO<PlatTenantVO>> page(@RequestBody PageReqDTO<PlatTenantVO> page){
         return ApiResponseUtils.success(platTenantService.page(page));
     }
 
-    @Action(module = "租户管理-租户", name = "列表", code = "plat:tnt:tenant:list")
+    @Action(module = "租户管理-租户", name = "列表", code = "saas:tenant:list")
     @ApiOperation("列表")
     @PostMapping("list")
     public ApiResponseEntity<List<PlatTenant>> list(@RequestBody PlatTenantVO dto){
@@ -66,21 +66,21 @@ public class PlatTenantController {
         return ApiResponseUtils.success(platTenantService.list(dto));
     }
 
-    @Action(module = "租户管理-租户", name = "列表 根据账号精确查询", code = "plat:tnt:tenant:listByUserIdAndAccount")
+    @Action(module = "租户管理-租户", name = "列表 根据账号精确查询", code = "saas:tenant:listByUserIdAndAccount")
     @ApiOperation("列表 根据账号精确查询")
     @PostMapping("listByUserIdAndAccount")
     public ApiResponseEntity<List<PlatTenant>> listByUserIdAndAccount(@RequestBody PlatTenantVO dto){
         return ApiResponseUtils.success(platTenantService.listByUserIdAndAccount(dto));
     }
 
-    @Action(module = "租户管理-租户", name = "新增", code = "plat:tnt:tenant:add")
+    @Action(module = "租户管理-租户", name = "新增", code = "saas:tenant:add")
     @ApiOperation("新增")
     @PostMapping("add")
     public ApiResponseEntity<String> add(@Validated @RequestBody PlatTenantDTOVO dto){ ;
         return ApiResponseUtils.success(platTenantService.add(dto));
     }
 
-    @Action(module = "租户管理-租户", name = "编辑", code = "plat:tnt:tenant:edit")
+    @Action(module = "租户管理-租户", name = "编辑", code = "saas:tenant:edit")
     @ApiOperation("编辑")
     @PostMapping("edit")
     public ApiResponseEntity<?> edit(@Validated @RequestBody PlatTenantDTOVO dto){
@@ -88,20 +88,20 @@ public class PlatTenantController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "租户管理-租户", name = "详情", code = "plat:tnt:tenant:view")
+    @Action(module = "租户管理-租户", name = "详情", code = "saas:tenant:view")
     @ApiOperation("详情")
     @PostMapping("view")
     public ApiResponseEntity<PlatTenantDTOVO> view(@RequestBody BaseIdDTO dto){
         return ApiResponseUtils.success(platTenantService.view(dto.getId()));
     }
 
-    @ApiOperation("详情")
+    @ApiOperation("详情(AuthIgnore)")
     @PostMapping("viewIgnore")
     public ApiResponseEntity<PlatTenantDTOVO> viewIgnore(@RequestBody BaseIdDTO dto){
         return ApiResponseUtils.success(platTenantService.view(dto.getId()));
     }
 
-    @Action(module = "租户管理-租户", name = "删除", code = "plat:tnt:tenant:del")
+    @Action(module = "租户管理-租户", name = "删除", code = "saas:tenant:del")
     @ApiOperation("删除")
     @PostMapping("del")
     public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto){
@@ -109,7 +109,7 @@ public class PlatTenantController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "租户管理-租户", name = "改变状态", code = "plat:tnt:tenant:changeStatus")
+    @Action(module = "租户管理-租户", name = "改变状态", code = "saas:tenant:changeStatus")
     @ApiOperation("改变状态")
     @PostMapping("changeStatus")
     public ApiResponseEntity<?> changeStatus(@RequestBody PlatTenantStatusDTO dto){
@@ -117,7 +117,7 @@ public class PlatTenantController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "租户管理-租户", name = "租户分配菜单", code = "plat:tnt:tenant:assignMenuList")
+    @Action(module = "租户管理-租户", name = "租户分配菜单", code = "saas:tenant:assignMenuList")
     @ApiOperation("租户分配菜单")
     @PostMapping("assignMenuList")
     public ApiResponseEntity<?> assignMenuList(@RequestBody PlatTenantMenuDTO tntTenantMenuDTO){

saas-module/src/main/java/com/makeit/controller/saas/PlatUserController.java

+package com.makeit.controller.saas;
+
+
+import com.makeit.common.dto.BaseIdDTO;
+import com.makeit.common.dto.StatusDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.global.annotation.Action;
+import com.makeit.module.admin.dto.plat.PlatUserDTOVO;
+import com.makeit.module.admin.dto.plat.PlatUserQueryDTO;
+import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
+import com.makeit.server.platform.auth.PlatUserService;
+import com.makeit.vo.platform.auth.PlatPersonDTOVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 租户端用户 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2022-05-10
+ */
+@Api(tags = "租户管理-租户账号管理")
+@RestController
+@RequestMapping("/saas/plat/user")
+public class PlatUserController {
+
+    @Autowired
+    private PlatUserService platUserService;
+
+    @Action(module = "租户端-人员", name = "分页列表", code = "saas:plat:user:page")
+    @ApiOperation("分页列表")
+    @PostMapping("page")
+    public ApiResponseEntity<PageVO<PlatPersonDTOVO>> page(@RequestBody PageReqDTO<PlatUserQueryDTO> page) {
+        return ApiResponseUtils.success(platUserService.page(page));
+    }
+
+    @Action(module = "租户端-人员", name = "列表", code = "saas:plat:user:list")
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public ApiResponseEntity<List<PlatPersonDTOVO>> list(@RequestBody PlatUserQueryDTO dto) {
+        return ApiResponseUtils.success(platUserService.list(dto));
+    }
+
+    @Action(module = "租户端-人员", name = "未分配部门用户分页列表", code = "saas:plat:user:pageNoDeptUser")
+    @ApiOperation("未分配部门用户分页列表")
+    @PostMapping("pageNoDeptUser")
+    public ApiResponseEntity<PageVO<PlatPersonDTOVO>> pageNoDeptUser(@RequestBody PageReqDTO<PlatUserQueryDTO> page) {
+        return ApiResponseUtils.success(platUserService.pageNoDeptUser(page));
+    }
+
+    @ApiOperation("分页列表(AuthIgnore)")
+    @PostMapping("pageAuthIgnore")
+    public ApiResponseEntity<PageVO<PlatPersonDTOVO>> pageAuthIgnore(@RequestBody PageReqDTO<PlatUserQueryDTO> page) {
+        return ApiResponseUtils.success(platUserService.page(page));
+    }
+
+    @ApiOperation("列表(AuthIgnore)")
+    @PostMapping("listAuthIgnore")
+    public ApiResponseEntity<List<PlatPersonDTOVO>> listAuthIgnore(@RequestBody PlatUserQueryDTO dto) {
+        return ApiResponseUtils.success(platUserService.list(dto));
+    }
+
+    @Action(module = "租户端-人员", name = "新增", code = "saas:plat:user:add")
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ApiResponseEntity<?> add(@Validated @RequestBody PlatPersonDTOVO dto) {
+        platUserService.addPerson(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @Action(module = "租户端-人员", name = "编辑", code = "saas:plat:user:edit")
+    @ApiOperation("编辑")
+    @PostMapping("edit")
+    public ApiResponseEntity<?> edit(@Validated @RequestBody PlatPersonDTOVO dto) {
+        platUserService.editPerson(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @Action(module = "租户端-人员", name = "改变密码", code = "saas:plat:user:changePassword")
+    @ApiOperation("改变密码")
+    @PostMapping("changePassword")
+    public ApiResponseEntity<?> changePassword(@RequestBody PlatUserDTOVO dto) {
+        platUserService.changePassword(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @Action(module = "租户端-人员", name = "详情", code = "saas:plat:user:view")
+    @ApiOperation("详情")
+    @PostMapping("view")
+    public ApiResponseEntity<PlatPersonDTOVO> view(@RequestBody BaseIdDTO dto) {
+        return ApiResponseUtils.success(platUserService.viewPerson(dto.getId()));
+    }
+
+    @Action(module = "租户端-人员", name = "删除", code = "saas:plat:user:del")
+    @ApiOperation("删除")
+    @PostMapping("del")
+    public ApiResponseEntity<?> del(@RequestBody BaseIdDTO dto) {
+        platUserService.del(dto.getId());
+        return ApiResponseUtils.success();
+    }
+
+    @Action(module = "租户端-人员", name = "改变状态", code = "saas:plat:user:changeStatus")
+    @ApiOperation("改变状态")
+    @PostMapping("changeStatus")
+    public ApiResponseEntity<?> changeStatus(@RequestBody StatusDTO dto) {
+        platUserService.changeStatus(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("获取当前登录用户角色菜单")
+    @PostMapping("getRoleMenu")
+    public ApiResponseEntity<PlatUserLoginVO> getRoleAndMenuList() {
+        return ApiResponseUtils.success(platUserService.getRoleAndMenuList());
+    }
+
+    @ApiOperation("获取当前登录用户角色菜单2")
+    @PostMapping("getRoleMenu2")
+    public ApiResponseEntity<PlatUserLoginVO> getRoleAndMenuList2() {
+        return ApiResponseUtils.success(platUserService.getRoleAndMenuList2());
+    }
+
+//    //@Action(module = "租户端-人员", name = "获取当前登录用户企业微信菜单", code = "tnt:user:getWechatMenuList")
+//    @ApiOperation("获取当前登录用户企业微信菜单")
+//    @PostMapping("getWechatMenuList")
+//    public ApiResponseEntity<PlatUserLoginVO> getWechatMenuList() {
+//        return ApiResponseUtils.success(platUserService.getWechatMenuList());
+//    }
+
+    @ApiOperation("获取当前登录用户信息")
+    @PostMapping("getUserVO")
+    public ApiResponseEntity<PlatUserLoginVO> getUserInfo() {
+        return ApiResponseUtils.success(platUserService.getUserVO());
+    }
+
+    @ApiOperation("获取当前登录用户详细信息")
+    @PostMapping("getUserDetail")
+    public ApiResponseEntity<PlatPersonDTOVO> getUserDetail() {
+        return ApiResponseUtils.success(platUserService.getUserDetail());
+    }
+
+}
+

saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java

@@ -43,8 +43,7 @@ public class SaasUserController {
     @ApiOperation("分页列表")
     @PostMapping("page")
     public ApiResponseEntity<PageVO<SaasUserDTOVO>> page(@RequestBody PageReqDTO<SaasUserQueryDTO> page){
-        //return ApiResponseUtils.success(saasUserService.page(page));
-        return ApiResponseUtils.success(null);
+        return ApiResponseUtils.success(saasUserService.page(page));
     }
 
     @ApiOperation("分页列表")

server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatTenantDTOVO.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.LocalDate;
+import java.util.List;
 
 @ApiModel("租户 新增 编辑 详情")
 @Data
@@ -24,14 +25,6 @@ public class PlatTenantDTOVO extends BaseIdDTO {
     @ApiModelProperty(value = "状态 0停用 1启用")
     private String status;
 
-//    @NotNull(message = "开始时间不能为空")
-//    @ApiModelProperty(value = "开始时间")
-//    private LocalDateTime startTime;
-//
-//    @NotNull(message = "结束时间不能为空")
-//    @ApiModelProperty(value = "结束时间")
-//    private LocalDateTime endTime;
-
     @JsonFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "开始时间不能为空")
     @ApiModelProperty(value = "开始时间")
@@ -46,18 +39,16 @@ public class PlatTenantDTOVO extends BaseIdDTO {
     @ApiModelProperty(value = "租户管理员id")
     private String platUserId;
 
-    //todo dto
     @ApiModelProperty(value = "租户账号 详情用")
     private PlatUserVO platUserVO;
 
-//    @ApiModelProperty(value = "菜单id列表 以逗号分隔")
-//    private String menuList;
-
-//    @TableField(exist = false)
-//    @ApiModelProperty(value = "菜单")
-//    private List<TntMenu> tntMenuList;
+    @ApiModelProperty(value = "菜单")
+    private List<PlatMenuDTOVO> tntMenuList;
 
     @ApiModelProperty(value = "租户管理员用户名")
     private String userName;
 
+    @ApiModelProperty(value = "告警渠道")
+    private String alertChannel;
+
 }

server-common/src/main/java/com/makeit/module/admin/dto/saas/SaasUserDTOVO.java

@@ -38,7 +38,7 @@ public class SaasUserDTOVO extends BaseIdDTO implements Serializable {
     @NotBlank(message = "姓名不能为空")
     @Size(max = 64, message = "姓名最长为64字符")
     @ApiModelProperty(value = "姓名")
-    private String name;
+    private String username;
 
     @NotBlank(message = "手机号不能为空")
     @Pattern(regexp = "1[0-9]{10}", message = "手机号格式不对")

server-service/src/main/java/com/makeit/service/saas/impl/SaasUserServiceImpl.java

@@ -41,6 +41,7 @@ import com.makeit.module.admin.vo.saas.SaasUserLoginVO;
 import com.makeit.utils.user.saas.SaasUserUtil;
 import com.makeit.utils.user.saas.SaasUserVO;
 import com.makeit.utils.user.TokenUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -162,20 +163,20 @@ implements SaasUserService{
                 new QueryWrapper<SaasUser>().lambda()
                         .eq(SaasUser::getAccount, dto.getAccount())
                         .or()
-                        .eq(SaasUser::getUsername, dto.getName())
+                        .eq(SaasUser::getUsername, dto.getUsername())
                         .or()
                         .eq(SaasUser::getMobile, dto.getMobile())
 
         );
 
         userList.forEach(e -> {
-            if (e.getAccount().equals(dto.getAccount()) && !e.getId().equals(dto.getId())) {
+            if (StringUtils.equals(e.getAccount(),dto.getAccount()) && !StringUtils.equals(e.getId(),dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_ACCOUNT_DUPLICATE);
             }
-            if (e.getUsername().equals(dto.getName()) && !e.getId().equals(dto.getId())) {
+            if (StringUtils.equals(e.getUsername(),dto.getUsername()) && !StringUtils.equals(e.getId(),dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_NAME_DUPLICATE);
             }
-            if (e.getMobile().equals(dto.getMobile()) && !e.getId().equals(dto.getId())) {
+            if (StringUtils.equals(e.getMobile(),dto.getMobile()) && !StringUtils.equals(e.getId(),dto.getId())) {
                 throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MOBILE_DUPLICATE);
             }
         });
@@ -185,7 +186,7 @@ implements SaasUserService{
     private void setRoleList(SaasUserDTOVO dto) {
         saasUserRoleService.remove(new QueryWrapper<SaasUserRole>().lambda()
                 .eq(SaasUserRole::getUserId, dto.getId()));
-        if (dto.getRoleList() != null) {
+        if (CollectionUtils.isNotEmpty(dto.getRoleList())) {
             List<SaasUserRole> userRoleList = StreamUtil.map(dto.getRoleList(), e -> {
                 SaasUserRole platUserRole = new SaasUserRole();
                 platUserRole.setUserId(dto.getId());