配置的更改

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.core.base.BaseModel;
 import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -20,6 +22,8 @@ import java.util.List;
 @Data
 @TableName("sys_user_jzg_info")
 @Schema(description = "业务员信息表")
+@NoArgsConstructor
+@AllArgsConstructor
 public class SysUserJzgInfo extends BaseModel implements Serializable {
     @TableId(value = "id")
     @Schema(description = "主键")

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -1,5 +1,6 @@
 package com.jzg.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysSystemAddParam;
@@ -7,12 +8,14 @@ import com.jzg.commons.entity.dto.SysSystemEditParam;
 import com.jzg.commons.entity.dto.SysSystemParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.SysConfig;
+import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.service.SysSystemService;
+import com.jzg.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +37,9 @@ public class SysSystemController {
     @Autowired
     private SysSystemService sysSystemService;
 
+    @Autowired
+    private SysUserService sysUserService;
+
     /**
      * 获取平台初始化配置
      * @return
@@ -107,6 +113,18 @@ public class SysSystemController {
         return HttpResult.ok(sysSystemService.queryById(id));
     }
 
+    /**
+     * 根据手机号获取用户名
+     * @param mobile
+     * @return
+     */
+    @GetMapping(value = { "/userGet"})
+    @Operation(summary = "租户信息查询")
+    public HttpResult userGet(String mobile) {
+        return HttpResult.ok(sysUserService.list(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getMobile, mobile)));
+    }
+
     /**
      * 租户添加
      * @param param
@@ -148,7 +166,7 @@ public class SysSystemController {
      */
     @Operation(summary = "批量删除租户")
     @DeleteMapping("/sysDelete")
-    public HttpResult remove(String[] ids) {
+    public HttpResult sysDelete(String[] ids) {
         String errorStr = sysSystemService.sysDeleteValid(List.of(ids));
         AssertionUtils.isFail(StringUtils.isNotEmpty(errorStr),errorStr);
 

platform/src/main/java/com/jzg/controller/SysUserController.java

@@ -7,7 +7,6 @@ import com.jzg.commons.entity.dto.SysUserAddParam;
 import com.jzg.commons.entity.dto.SysUserEditParam;
 import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
-import com.jzg.commons.entity.po.SysUserPlateInfo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.mapper.SysUserPlateInfoMapper;
@@ -71,6 +70,8 @@ public class SysUserController extends BaseController {
     @PostMapping("/userAdd")
     public HttpResult userAdd(@Validated @RequestBody SysUserAddParam param) {
         // 手机号不允许重复
+        boolean nameExists = sysUserService.isExistsName(param.getUsername(), null);
+        AssertionUtils.isFail(nameExists,"用户名重复！");
         boolean mobileExists = sysUserService.isExistsMobile(param.getMobile(), null);
         AssertionUtils.isFail(mobileExists,"手机号重复！");
         sysUserService.userAdd(param);
@@ -85,6 +86,9 @@ public class SysUserController extends BaseController {
     @Operation(summary = "平台用户修改")
     @PutMapping("/userEdit")
     public HttpResult userEdit(@Validated @RequestBody SysUserEditParam param) {
+        // 手机号不允许重复
+        boolean nameExists = sysUserService.isExistsName(param.getUsername(), param.getId());
+        AssertionUtils.isFail(nameExists,"用户名重复！");
         // 手机号不允许重复
         boolean mobileExists = sysUserService.isExistsMobile(param.getMobile(), param.getId());
         AssertionUtils.isFail(mobileExists,"手机号重复！");

platform/src/main/java/com/jzg/service/SysUserService.java

@@ -8,6 +8,8 @@ import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import java.util.List;
 
@@ -42,6 +44,14 @@ public interface SysUserService extends IService<SysUser> {
      */
     boolean isExistsMobile(String mobile, String id);
 
+    /**
+     * 平台用户名称重复校验
+     * @param username
+     * @param id
+     * @return
+     */
+    boolean isExistsName(String username, String id);
+
     /**
      * 平台用户新增
      *

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -15,6 +15,8 @@ import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.SysSystemPermsVo;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.mapper.*;
@@ -260,8 +262,18 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         }else{
             // 新增管理员用户
             user = new SysUser(param);
+            // 用户名和手机号不允许重复
+            boolean mobileExists = this.isExistsMobile(user.getMobile());
+            if(mobileExists){
+                throw new SystemException("管理员手机号重复！");
+            }
+            boolean nameExists = this.isExistsUserName(user.getUsername());
+            if(nameExists){
+                throw new SystemException("管理员用户名重复！");
+            }
             sysUserMapper.insert(user);
         }
+
         // 新增用户机构关联信息
         SysUserJzgInfo info = new SysUserJzgInfo(user, sysSystem.getSysCode());
         sysUserJzgInfoMapper.insert(info);
@@ -297,6 +309,20 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         this.updateById(sysSystem);
     }
 
+    private boolean isExistsUserName(String username) {
+        long count = sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getUsername, username)
+        );
+        return count > 0;
+    }
+
+    private boolean isExistsMobile(String mobile) {
+        long count = sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getMobile, mobile)
+        );
+        return count > 0;
+    }
+
     /**
      * 租户权限保存
      * @param permsList 树形租户权限
@@ -326,9 +352,6 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         SysSystem sysSystem = new SysSystem();
         BeanUtils.copyProperties(param, sysSystem);
         updateById(sysSystem);
-        SysSystem system = getById(sysSystem.getId());
-        // 修改管理员信息
-
         List<SysUser> userList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getMobile, param.getUserAccount())
         );
@@ -340,6 +363,14 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         }else{
             // 新增管理员用户
             sysUser = new SysUser(param);
+            boolean mobileExists = this.isExistsMobile(sysUser.getMobile());
+            if(mobileExists){
+                throw new SystemException("管理员手机号重复！");
+            }
+            boolean nameExists = this.isExistsUserName(sysUser.getUsername());
+            if(nameExists){
+                throw new SystemException("管理员用户名重复！");
+            }
             sysUserMapper.insert(sysUser);
             // 新增用户机构关联信息
             SysUserJzgInfo info = new SysUserJzgInfo(sysUser,sysSystem.getSysCode());
@@ -401,10 +432,10 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                     return errorStr;
                 }
 
-                Long count = sysUserPlateInfoMapper.selectCount(new LambdaQueryWrapper<SysUserPlateInfo>()
-                        .eq(SysUserPlateInfo::getSystemCode, sysSystem.getSysCode())
-                        .eq(SysUserPlateInfo::getIsEnable, 1)
-                        .eq(SysUserPlateInfo::getIsDelete, 0));
+                Long count = sysUserJzgInfoMapper.selectCount(new LambdaQueryWrapper<SysUserJzgInfo>()
+                        .eq(SysUserJzgInfo::getSystemCode, sysSystem.getSysCode())
+                        .eq(SysUserJzgInfo::getIsEnable, 0)
+                        .eq(SysUserJzgInfo::getIsDelete, 0));
 
                 if(count > 0){
                     errorStr = "租户["+sysSystem.getSysName()+"]还有部分员工，请将这些员工变更机构或者删除后，再进行删除！";

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -110,6 +110,31 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         return false;
     }
 
+    @Override
+    public boolean isExistsName(String username, String id) {
+        List<SysUser> userList = this.list(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getUsername, username)
+                .ne(StringUtils.isNotNull(id),SysUser::getId, id));
+        if(CollUtil.isNotEmpty(userList)){
+            if(userList.size() > 1){
+                return true;
+            }
+            SysUser user = userList.get(0);
+            LambdaQueryWrapper<SysUserPlateInfo> infoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            infoLambdaQueryWrapper.eq(SysUserPlateInfo::getUserId, user.getId());
+            List<SysUserPlateInfo> infoList = sysUserPlateInfoMapper.selectList(infoLambdaQueryWrapper);
+            if(CollUtil.isNotEmpty(infoList)){
+                List<SysUserPlateInfo> jzgInfos = infoList.stream().filter(info ->
+                                SystemConstants.SYSTEM_PLATFORM.getCode().equals(info.getSystemCode()))
+                        .collect(Collectors.toList());
+                if(CollUtil.isNotEmpty(jzgInfos)){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void userAdd(SysUserAddParam param) {

platform/src/main/resources/application.yml

@@ -32,12 +32,16 @@ tenant:
   column: system_code
   filterTables:
   ignoreTables:
+    - sys_config
+    - sys_user
+    - sys_user_jzg_info
     - sys_system
     - sys_role_perms
     - sys_user_role
     - sys_upload_files
     - sys_role_data_scope
     - sys_role_data_scope_link
+
   ignoreLoginNames:
 
 data-scope:

tenant/openfeign/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 spring:
   redis:
     redisson:
-      address: redis://192.168.5.250:6379
+      address: redis://127.0.0.1:16379
       password: 123456
       database: 0
 

tenant/organization/src/main/resources/application.yml

@@ -44,6 +44,7 @@ tenant:
     - sys_organization
     - sys_organization_user_link
     - sys_upload_files
+    - sys_config
   ignoreLoginNames:
 
 data-scope:
@@ -55,4 +56,4 @@ minio:
   url: http://192.168.0.250:9000
   access-key: v7Zb8XhyLcYNcSHlxvyK
   secret-key: 58YibMwpxGKtXcekPL065OM4GonC1hf2tFMjI9EN
-  bucket-name: jzg
+  bucket-name: jzg