流程测试

sckw-auth/src/main/java/com/sckw/auth/model/vo/req/LoginReqVo.java

@@ -24,6 +24,12 @@ public class LoginReqVo implements Serializable {
     @NotBlank(message = "账号不能为空")
     private String account;
 
+    /**
+     * 设备类型
+     */
+    @NotBlank(message = "设备类型不能为空")
+    private String clientType;
+
     /**
      * 系统类型
      */

sckw-auth/src/main/java/com/sckw/auth/model/vo/req/RegisterReqVo.java

@@ -1,8 +1,8 @@
 package com.sckw.auth.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 
 import java.io.Serial;
 import java.io.Serializable;

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo.java

@@ -1,6 +1,7 @@
 package com.sckw.auth.model.vo.res;
 
 import com.sckw.system.api.model.dto.res.KwsRoleResDto;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
@@ -73,6 +74,11 @@ public class LoginResVo implements Serializable {
      */
     private EntInfoResVo entInfo;
 
+    /**
+     * 设备类型
+     */
+    private String clientType;
+
     /**
      * 角色信息
      */

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -27,6 +27,7 @@ import com.sckw.system.api.RemoteUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -59,6 +60,7 @@ public class AuthServiceImpl implements IAuthService {
         EntInfoResVo entInfoResVo = new EntInfoResVo();
         loginResVo.setEntInfo(entInfoResVo);
         loginResVo.setRoleInfo(kwsRoleResDtos);
+        loginResVo.setClientType(reqDto.getClientType());
         if (CollectionUtils.isEmpty(kwsRoleResDtos)) {
             //角色信息为空，没有认证
             afterProcessor(loginResVo);
@@ -123,7 +125,7 @@ public class AuthServiceImpl implements IAuthService {
             String id = String.valueOf(loginResVo.getId());
             String token = EncryUtil.encry(Global.PRI_KEY, id);
             loginResVo.setToken(token);
-            RedissonUtils.add(Global.REDIS_USER_PREFIX + id + Global.COLON + loginResVo.getSystemType(), JSON.toJSONString(loginResVo));
+            RedissonUtils.add(Global.REDIS_USER_PREFIX + id + Global.COLON + loginResVo.getClientType(), JSON.toJSONString(loginResVo));
 
             //异步存redis
             AsyncFactory.execute(new SaveMenuInfo(loginResVo.getId()));
@@ -135,9 +137,11 @@ public class AuthServiceImpl implements IAuthService {
     }
 
     @Override
+    @Transactional(rollbackFor = {})
     public void register(RegisterReqVo reqVo) {
         /*1、校验验证码*/
-        String sms = RedissonUtils.get("xxx").toString();
+        String key = Global.USER_LOGIN_CAPTCHA + reqVo.getTelephone() + Global.COLON + reqVo.getSystemType();
+        String sms = RedissonUtils.getString(key);
         if (!reqVo.getCaptcha().equals(sms)) {
             throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
         }
@@ -145,6 +149,7 @@ public class AuthServiceImpl implements IAuthService {
         RegisterReqDto registerReqDto = new RegisterReqDto();
         BeanUtils.copyProperties(reqVo, registerReqDto);
         remoteUserService.register(registerReqDto);
+        RedissonUtils.delete(key);
     }
 
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/aspect/DaoAspect.java

@@ -1,18 +1,15 @@
 package com.sckw.core.aspect;
 
-import com.sckw.core.model.auth.context.LoginUserHolder;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.StringUtils;
+import com.sckw.core.web.context.LoginUserHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 import java.util.Date;
 import java.util.Objects;
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -72,15 +72,14 @@ public class LoginFilter implements Filter {
         }
 
         //从redis获取用户信息
-        Object object = RedissonUtils.get(Global.REDIS_USER_PREFIX + key + Global.COLON + LoginUserHolder.getClientType());
+        String clientType = request.getHeader(RequestConstant.CLIENT_TYPE);
+        Object object = RedissonUtils.get(Global.REDIS_USER_PREFIX + key + Global.COLON + clientType);
         if (Objects.isNull(object)) {
             throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.TOKEN_INVAILD);
         }
 
         /*3、将redis里的用户信息存入内存中，避免业务操作多次从redis获取值*/
-        String clientType = request.getHeader(RequestConstant.CLIENT_TYPE);
         LoginUserInfo loginUserInfo = JSONObject.parseObject(object.toString(), LoginUserInfo.class);
-        loginUserInfo.setClientType(clientType);
         LoginUserHolder.set(loginUserInfo);
         //管理员不限制权限
         if (loginUserInfo.getIsMain() == Global.YES){

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/PasswordUtils.java

@@ -108,8 +108,8 @@ public class PasswordUtils {
     }
 
     public static void main(String[] args) {
-        String password = PasswordUtils.entryptPassword(PasswordUtils.md5("184"));
-        String md5 = PasswordUtils.md5("184");
+        String password = PasswordUtils.entryptPassword(PasswordUtils.md5("123"));
+        String md5 = PasswordUtils.md5("18901010101");
         System.out.println(password);
         System.out.println(md5);
         System.out.println(validatePassword(md5, password));

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/context/LoginUserHolder.java

@@ -44,7 +44,7 @@ public class LoginUserHolder {
      * @Date 2020/04/13 0021
      */
     public static Long getUserId(){
-        return LONGIN_USER_HOLDER.get() == null ? null : LONGIN_USER_HOLDER.get().getId();
+        return LONGIN_USER_HOLDER.get() == null ? 1L : LONGIN_USER_HOLDER.get().getId();
     }
 
     /**

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsUserResDto.java

@@ -1,12 +1,16 @@
 package com.sckw.system.api.model.dto.res;
 
-import com.sckw.system.api.model.dto.BaseModelResDto;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
-public class KwsUserResDto extends BaseModelResDto implements Serializable {
+public class KwsUserResDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 612080679888497523L;
 
     /**
      * 系统类型(1运营端、2企业开户)
@@ -52,5 +56,56 @@ public class KwsUserResDto extends BaseModelResDto implements Serializable {
      * 是否是企业管理（0是 1否）
      */
     private Integer isMain;
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态:0正常/1锁定
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建人姓名
+     */
+//	private String createByName;
+
+    /**
+     * 创建时间
+     */
+    //@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+    /**
+     * 跟新人姓名
+     */
+//	private String updateByName;
+
+    /**
+     * 更新时间
+     */
+    //@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+    /**
+     * 删除标识(0正常/-1删除)
+     */
+    private Integer delFlag;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsDeptController.java

@@ -6,7 +6,6 @@ import com.sckw.system.service.KwsDeptService;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
 
 /**
  * 组织机构
@@ -73,12 +72,13 @@ public class KwsDeptController {
     /**
      * @param ids {ids：主键ID（多个以逗号隔开）}
      * @return
-     * @description 更新
+     * @description 删除
      * @author zk
      * @date 2023/5/30
      **/
     @DeleteMapping("/dels")
     public HttpResult del(@RequestParam String ids) throws Exception {
-        return kwsDeptService.deleteByKey(ids);
+        kwsDeptService.deleteByKey(ids);
+        return HttpResult.ok();
     }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -70,7 +70,7 @@ public class KwsEnterpriseController {
      * @date 2023/06/02
      **/
     @PostMapping("/register")
-    public HttpResult register(@Valid  @RequestBody EntRegisterReqVo reqVo) {
+    public HttpResult register(@Valid @RequestBody EntRegisterReqVo reqVo) {
         kwsEntService.register(reqVo);
         return HttpResult.ok(HttpStatus.MSG_003);
     }
@@ -124,7 +124,7 @@ public class KwsEnterpriseController {
     @DeleteMapping("/dels")
     public HttpResult del(@RequestParam String ids) throws Exception {
         kwsEntService.deleteByKey(ids);
-        return  HttpResult.ok();
+        return HttpResult.ok();
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsMenuController.java

@@ -84,7 +84,8 @@ public class KwsMenuController {
      **/
     @DeleteMapping("/dels")
     public HttpResult del(@RequestParam String ids) throws Exception {
-        return kwsMenuService.deleteByKey(ids);
+        kwsMenuService.deleteByKey(ids);
+        return HttpResult.ok();
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsDeptDao.java

@@ -34,6 +34,22 @@ public interface KwsDeptDao {
      */
     KwsDept selectByKey(Long id);
 
+    /**
+     * @param list id集合
+     * @return KwsDept
+     * @desc: 详批量情查询
+     * @author: czh
+     */
+    List<KwsDept> selectByKeys(List<Long> list);
+
+    /**
+     * @param list ent_id集合
+     * @return KwsDept
+     * @desc: 详批量情查询
+     * @author: czh
+     */
+    List<KwsDept> selectByEntIdList(List<Long> list);
+
     /**
      * 查询
      * @param params

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsEntCertificateDao.java

@@ -12,38 +12,47 @@ import java.util.List;
 @Mapper
 public interface KwsEntCertificateDao {
     /**
-     * 新增
-     * @param record
-     * @return
+     * @param record 实体类
+     * @return int
+     * @desc: 新增
+     * @author: czh
+     * @date: 2023/6/25
      */
     int insert(KwsEntCertificate record);
 
     /**
-     * 更新
-     * @param record
-     * @return
+     * @param record 实体类
+     * @return int
+     * @desc: 修改
+     * @author: czh
+     * @date: 2023/6/25
      */
     int update(KwsEntCertificate record);
 
     /**
-     * 详情查询
-     * @param id
-     * @return
+     * @param id 主键id
+     * @return KwsEntCertificate
+     * @desc: 详情查询
+     * @author: czh
+     * @date: 2023/6/25
      */
     KwsEntCertificate selectByKey(Long id);
 
     /**
-     * 查询
-     * @param entId
-     * @return
-     * @throws Exception
+     * @param list 实体类
+     * @return int
+     * @desc: 批量插入
+     * @author: czh
+     * @date: 2023/6/25
      */
-    List<KwsEntCertificate> findList(Long entId);
+    int saveBatch(List<KwsEntCertificate> list);
 
     /**
-     * 批量插入
+     * @param id 企业id
+     * @return KwsEntCertificate
+     * @desc: 根据企业id查证书
+     * @author: czh
+     * @date: 2023/6/25
      */
-    int saveBatch(List<KwsEntCertificate> list);
-
     List<KwsEntCertificate> selectByEntId(Long id);
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsMenuDao.java

@@ -37,6 +37,14 @@ public interface KwsMenuDao {
      */
     KwsMenu selectByKey(Long id);
 
+    /**
+     * @param list id集合
+     * @return KwsMenu
+     * @desc:  批量详情查询
+     * @author: czh
+     */
+    List<KwsMenu> selectByKeys(List<Long> list);
+
     /**
      * 查询
      * @param params

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsMenuRightsDao.java

@@ -35,6 +35,24 @@ public interface KwsMenuRightsDao {
      */
     KwsMenuRights selectByKey(Long id);
 
+    /**
+     * @param list 角色ID集合
+     * @return KwsMenuRights
+     * @desc: 根据角色id批量查
+     * @author: czh
+     * @date: 2023/6/25
+     */
+    List<KwsMenuRights> selectByRoleIds(List<Long> list);
+
+    /**
+     * @param list 菜单ID集合
+     * @return KwsMenuRights
+     * @desc: 根据菜单id批量查
+     * @author: czh
+     * @date: 2023/6/25
+     */
+    List<KwsMenuRights> selectByMenuIds(List<Long> list);
+
     /**
      * @param  list
      * @return int

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsRoleDao.java

@@ -62,4 +62,13 @@ public interface KwsRoleDao {
      */
     List<KwsRole> selectBatchByKeys(@Param(value = "list") List<Long> id);
 
+    /**
+     * @param list 机构id集合
+     * @return KwsRole
+     * @desc: 根据机构id批量查
+     * @author: czh
+     * @date: 2023/6/14
+     */
+    List<KwsRole> selectBatchByDeptIds(List<Long> list);
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/KwsUserRoleDao.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @date 2023-05-31
  */
 @Mapper
-public interface KwsUserRoleDao {
+public interface  KwsUserRoleDao {
     /**
      * 新增
      * @param record
@@ -59,4 +59,13 @@ public interface KwsUserRoleDao {
      */
     List<KwsUserRole> findAllByRoleId(Long roleId);
 
+    /**
+     * @param list 角色id集合
+     * @return List
+     * @desc: 根据角色ID查用户角色信息
+     * @author: czh
+     * @date: 2023/6/13
+     */
+    List<KwsUserRole> findAllByRoleIds(List<Long> list);
+
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsDeptService.java

@@ -1,9 +1,9 @@
 package com.sckw.system.service;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
@@ -17,8 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 组织机构service接口
@@ -31,6 +31,9 @@ public class KwsDeptService {
     @Autowired
     KwsDeptDao kwsDeptDao;
 
+    @Autowired
+    KwsRoleService kwsRoleService;
+
     @Autowired
     KwsUserDeptDao kwsUserDeptDao;
 
@@ -47,6 +50,9 @@ public class KwsDeptService {
                 params.setParentIds(kwsDept.getParentIds() + Global.COMMA + params.getId());
                 params.setLevel(kwsDept.getLevel() != null ? kwsDept.getLevel() + 1 : 1);
             }
+        } else {
+            params.setParentId(Long.parseLong(Global.PID));
+            params.setParentIds(Global.PID);
         }
 
         if (kwsDeptDao.insert(params) <= 0) {
@@ -57,26 +63,27 @@ public class KwsDeptService {
     /**
      * 删除记录-根据主键
      * @param ids
-     * @return
-     * @throws Exception
      */
-    public HttpResult deleteByKey(String ids) throws Exception {
-        /**1.数据校验**/
-        if (StringUtils.isBlank(ids)) {
-            return HttpResult.error("请选择您要删除的机构信息！");
+    public void deleteByKey(String ids) throws Exception {
+        /*1.删除机构*/
+        List<Long> list = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
+        deleteDept(kwsDeptDao.selectByKeys(list));
+    }
+
+    public void deleteDept(List<KwsDept> kwsDepts) throws Exception {
+        if (CollectionUtils.isEmpty(kwsDepts)) {
+            return;
         }
 
-        int resultCode = 0;
-        String[] idArray = ids.split(",");
-        for (int i = 0; i < idArray.length; i++) {
-            String id = idArray[i];
-            KwsDept kwsDept = kwsDeptDao.selectByKey(Long.parseLong(id));
-            if (null != kwsDept) {
-                kwsDept.setDelFlag(Global.YES);
-                resultCode = kwsDeptDao.update(kwsDept);
+        for (KwsDept kwsDept : kwsDepts) {
+            kwsDept.setDelFlag(Global.YES);
+            if (kwsDeptDao.update(kwsDept) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
             }
         }
-        return resultCode > 0 ? HttpResult.ok("删除成功！") : HttpResult.error("删除失败！");
+
+        /*2、删除岗位角色*/
+        kwsRoleService.deleteByDeptIds(kwsDepts.stream().map(KwsDept::getId).toList());
     }
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -52,9 +52,15 @@ public class KwsEnterpriseService {
     @Autowired
     private KwsEntDeptDao kwsEntDeptDao;
 
+    @Autowired
+    private KwsDeptDao kwsDeptDao;
+
     @Autowired
     private KwsUserService kwsUserService;
 
+    @Autowired
+    private KwsDeptService kwsDeptService;
+
     /**
      * @param params 入库
      * @desc: 单表入库
@@ -75,11 +81,8 @@ public class KwsEnterpriseService {
      * @date: 2023/6/19
      */
     public void deleteByKey(String ids) throws Exception {
-        String[] idArr = ids.split(",");
-        List<Long> list = new ArrayList<>();
-        for (String id : idArr) {
-            list.add(Long.valueOf(id));
-        }
+        /*1、删除企业*/
+        List<Long> list = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
         List<KwsEnterprise> kwsEnterprises = kwsEnterpriseDao.selectByKeys(list);
         if (CollectionUtils.isEmpty(kwsEnterprises)) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
@@ -91,6 +94,9 @@ public class KwsEnterpriseService {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
             }
         }
+
+        /*2、删除机构*/
+        kwsDeptService.deleteDept(kwsDeptDao.selectByEntIdList(list));
     }
 
     /**
@@ -119,7 +125,7 @@ public class KwsEnterpriseService {
 
         //若入参传来的type在表里面本来就有则不管,没有就新增
         typeReqList.forEach(item -> {
-            if (CollectionUtils.isEmpty(kwsEntTypes) || kwsEntTypes.stream().filter(x -> x.getType() == Integer.parseInt(item)).findAny().isPresent()) {
+            if (CollectionUtils.isEmpty(kwsEntTypes) || kwsEntTypes.stream().anyMatch(x -> x.getType() == Integer.parseInt(item))) {
                 return;
             }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -8,10 +8,11 @@ import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
+import com.sckw.core.web.model.LoginUserInfo;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindMenuTreePojo;
@@ -67,34 +68,76 @@ public class KwsMenuService {
     }
 
     /**
-     * 删除记录-根据主键
-     *
-     * @param ids
-     * @return
-     * @throws Exception
+     * @param ids 主键di
+     * @desc: 根据主键删除菜单
+     * @author: czh
+     * @date: 2023/6/25
      */
-    public HttpResult deleteByKey(String ids) throws Exception {
-        /**1.数据校验**/
-        if (StringUtils.isBlank(ids)) {
-            return HttpResult.error("请选择您要删除的菜单信息！");
+    public void deleteByKey(String ids) throws Exception {
+        List<Long> list = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
+        /*1、删除菜单*/
+        List<KwsMenu> kwsMenus = kwsMenuDao.selectByKeys(list);
+        if (CollectionUtils.isEmpty(kwsMenus)) {
+            return;
+        }
+
+        for (KwsMenu kwsMenu : kwsMenus) {
+            kwsMenu.setDelFlag(Global.YES);
+            if (kwsMenuDao.update(kwsMenu) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.DELETE_FAIL);
+            }
         }
 
-        int resultCode = 0;
-        String[] idArray = ids.split(",");
-        for (int i = 0; i < idArray.length; i++) {
-            String id = idArray[i];
-            KwsMenu kwsMenu = kwsMenuDao.selectByKey(Long.parseLong(id));
-            if (null != kwsMenu) {
-                kwsMenu.setDelFlag(Global.YES);
-                resultCode = kwsMenuDao.update(kwsMenu);
-                /**2.对企业/角色已分配该菜单进行清理**/
+        /*2、删除菜单权限*/
+        deleteMenuRightsByMenuIds(kwsMenus.stream().map(KwsMenu::getId).toList());
+    }
 
+    /**
+     * @param menuIdList 菜单id集合
+     * @desc: 删除菜单权限
+     * @author: czh
+     * @date: 2023/6/25
+     */
+    public void deleteMenuRightsByMenuIds(List<Long> menuIdList) throws Exception {
+        deleteMenuRights(kwsMenuRightsDao.selectByMenuIds(menuIdList));
+    }
 
+    /**
+     * @param roleIdList 角色id集合
+     * @desc: 删除菜单权限
+     * @author: czh
+     * @date: 2023/6/25
+     */
+    public void deleteMenuRightsByRoleIds(List<Long> roleIdList) throws Exception {
+        deleteMenuRights(kwsMenuRightsDao.selectByRoleIds(roleIdList));
+    }
+
+    private void deleteMenuRights(List<KwsMenuRights> kwsMenuRightsList) {
+        if (CollectionUtils.isEmpty(kwsMenuRightsList)) {
+            return;
+        }
+
+        for (KwsMenuRights kwsMenuRights : kwsMenuRightsList) {
+            kwsMenuRights.setDelFlag(Global.YES);
+            if (kwsMenuRightsDao.update(kwsMenuRights) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.DELETE_FAIL);
             }
         }
-        return resultCode > 0 ? HttpResult.ok("删除成功！") : HttpResult.error("删除失败！");
+
+        //让涉及到的用户重新登录获取菜单权限
+        List<Long> roleIds = kwsMenuRightsList.stream().map(KwsMenuRights::getRoleId).toList();
+        List<KwsUserRole> kwsUserRoleList = kwsUserRoleDao.findAllByRoleIds(roleIds);
+        if (CollectionUtils.isEmpty(kwsUserRoleList)) {
+            return;
+        }
+
+        for (KwsUserRole kwsUserRole : kwsUserRoleList) {
+            Long userId = kwsUserRole.getUserId();
+            RedissonUtils.delete(Global.REDIS_USER_PREFIX + userId + "*");
+        }
     }
 
+
     /**
      * 更新记录
      *

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -11,11 +11,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.redis.utils.RedissonUtils;
-import com.sckw.system.api.model.dto.res.UserAccessMenuInfoResDto;
-import com.sckw.system.dao.KwsAuthorityDao;
-import com.sckw.system.dao.KwsRoleDao;
-import com.sckw.system.dao.KwsUserDeptDao;
-import com.sckw.system.dao.KwsUserRoleDao;
+import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindMenuTreePojo;
 import com.sckw.system.model.vo.req.AddRoleReqVo;
@@ -29,7 +25,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 角色service接口
@@ -52,11 +47,14 @@ public class KwsRoleService {
     KwsUserDeptDao kwsUserDeptDao;
 
     @Autowired
-    KwsDeptService kwsDeptService;
+    KwsDeptDao kwsDeptDao;
 
     @Autowired
     KwsMenuService kwsMenuService;
 
+    @Autowired
+    KwsMenuRightsDao kwsMenuRightsDao;
+
     @Autowired
     CustomConfig customConfig;
 
@@ -97,7 +95,7 @@ public class KwsRoleService {
         /*2、绑定菜单功能*/
         KwsDept kwsDept = new KwsDept();
         kwsDept.setId(reqVo.getCurrentDeptId());
-        List<KwsDeptResVo> list = kwsDeptService.findList(kwsDept);
+        List<KwsDeptResVo> list = kwsDeptDao.findList(kwsDept);
         if (CollectionUtils.isEmpty(list)) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
@@ -112,11 +110,16 @@ public class KwsRoleService {
             //只能看见自己的数据则不管
             return idResVo;
         }
-        String[] deptIds = reqVo.getDeptIds().split(",");
+
+        String deptIds = reqVo.getDeptIds();
+        if (StringUtils.isBlank(deptIds)) {
+            return idResVo;
+        }
+        String[] deptIdArr = deptIds.split(",");
         List<KwsAuthority> kwsAuthorities = new ArrayList<>();
         Long userId = LoginUserHolder.getUserId();
         Date date = new Date();
-        for (String deptId : deptIds) {
+        for (String deptId : deptIdArr) {
             KwsAuthority kwsAuthority = new KwsAuthority();
             kwsAuthority.setRoleId(roleId);
             kwsAuthority.setDeptId(Long.parseLong(deptId));
@@ -136,19 +139,36 @@ public class KwsRoleService {
         return idResVo;
     }
 
+    /**
+     * @param deptIdList 机构id集合
+     * @desc: 根据机构删除角色信息
+     * @author: czh
+     * @date: 2023/6/25
+     */
+    public void deleteByDeptIds(List<Long> deptIdList) throws Exception {
+        List<KwsRole> kwsRoles = kwsRoleDao.selectBatchByDeptIds(deptIdList);
+        if (CollectionUtils.isEmpty(kwsRoles)) {
+            return;
+        }
+        deleteRole(kwsRoles);
+    }
+
     /**
      * 删除记录-根据主键
      * @param ids 主键
-     * @return HttpResult
      */
     public void deleteByKey(String ids) throws Exception {
-        /*1.数据校验*/
-        List<Long> idList = Arrays.asList(ids.split(",")).stream().map(Long::parseLong).toList();
+
+        List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
         List<KwsRole> kwsRoles = kwsRoleDao.selectBatchByKeys(idList);
         if (CollectionUtils.isEmpty(kwsRoles)) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
 
+        deleteRole(kwsRoles);
+    }
+
+    private void deleteRole(List<KwsRole> kwsRoles) throws Exception {
         /*2、删角色*/
         for (KwsRole kwsRole : kwsRoles) {
             kwsRole.setDelFlag(Global.YES);
@@ -157,8 +177,22 @@ public class KwsRoleService {
             }
         }
 
-        //todo
-        /*3、用户绑定关系怎么办？*/
+        /*3、删用户角色关系*/
+        List<Long> idList = kwsRoles.stream().map(KwsRole::getId).toList();
+        List<KwsUserRole> kwsUserRoleList = kwsUserRoleDao.findAllByRoleIds(idList);
+        if (CollectionUtils.isEmpty(kwsUserRoleList)) {
+            return;
+        }
+
+        for (KwsUserRole kwsUserRole : kwsUserRoleList) {
+            kwsUserRole.setDelFlag(Global.YES);
+            if (kwsUserRoleDao.update(kwsUserRole) <= 0) {
+                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.DELETE_FAIL);
+            }
+        }
+
+        /*4、删除角色菜单关系*/
+        kwsMenuService.deleteMenuRightsByRoleIds(idList);
     }
 
     /**
@@ -259,7 +293,9 @@ public class KwsRoleService {
             kwsUserDept.setDelFlag(Global.NO);
             kwsUserDeptList.add(kwsUserDept);
         });
-        kwsDeptService.addUserDept(kwsUserDeptList);
+        if (kwsUserDeptDao.saveBatch(kwsUserDeptList) < kwsUserDeptList.size()) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
 
         /*4、后置处理，修改redis中的信息*/
         FindMenuTreePojo findMenuTreePojo = new FindMenuTreePojo();

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -79,6 +79,7 @@ public class KwsUserService {
 
     }
 
+    @Transactional(rollbackFor = {})
     public void register(RegisterReqDto reqDto) throws SystemException {
         /*存用户表、企业表，暂时不处理角色关系，需要认证*/
         KwsUser kwsUser = new KwsUser();
@@ -98,13 +99,16 @@ public class KwsUserService {
         }
 
         /*存企业机构等*/
-        //目前注册接口只有管理员进来
-        if(reqDto.getIsMain() == Global.YES) {
+        //目前注册接口只有企业管理员进来
+        if(reqDto.getIsMain() == Global.YES && reqDto.getSystemType() != SystemTypeEnum.MANAGE.getCode()) {
             KwsEnterprise kwsEnterprise = new KwsEnterprise();
             long entId = new IdWorker(1L).nextId();
             kwsEnterprise.setId(entId);
+            kwsEnterprise.setCode("");
             kwsEnterprise.setFirmName(reqDto.getEntName());
             kwsEnterprise.setApproval(ApprovalEnum.NO.getCode());
+            kwsEnterprise.setContacts(reqDto.getName());
+            kwsEnterprise.setTelephone(reqDto.getTelephone());
             if (kwsEnterpriseDao.insert(kwsEnterprise) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
             }

sckw-modules/sckw-system/src/main/resources/mapper/KwsAuthorityDao.xml

@@ -117,16 +117,16 @@
         values
     <foreach collection="list" item="item" separator=",">
       <trim prefix="(" suffix=")" suffixOverrides=",">
-        #{item.id,jdbcType=BIGINT},
-        #{item.roleId,jdbcType=BIGINT},
-        #{item.deptId,jdbcType=VARCHAR},
-        #{item.remark,jdbcType=VARCHAR},
-        #{item.status,jdbcType=INTEGER},
-        #{item.createBy,jdbcType=BIGINT},
-        #{item.createTime,jdbcType=TIMESTAMP},
-        #{item.updateBy,jdbcType=BIGINT},
-        #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.delFlag,jdbcType=INTEGER}
+          #{item.id,jdbcType=BIGINT},
+          #{item.roleId,jdbcType=BIGINT},
+          #{item.deptId,jdbcType=VARCHAR},
+          #{item.remark,jdbcType=VARCHAR},
+          #{item.status,jdbcType=INTEGER},
+          #{item.createBy,jdbcType=BIGINT},
+          #{item.createTime,jdbcType=TIMESTAMP},
+          #{item.updateBy,jdbcType=BIGINT},
+          #{item.updateTime,jdbcType=TIMESTAMP},
+          #{item.delFlag,jdbcType=INTEGER}
       </trim>
     </foreach>
   </insert>

sckw-modules/sckw-system/src/main/resources/mapper/KwsDeptDao.xml

@@ -208,4 +208,24 @@
     </if>
     ORDER BY level, sort
   </select>
+  <select id="selectByKeys" resultType="com.sckw.system.model.KwsDept">
+    select
+    <include refid="Base_Column_List" />
+    from kws_dept
+    where del_flag = 0
+      and id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </select>
+  <select id="selectByEntIdList" resultType="com.sckw.system.model.KwsDept">
+    select
+    <include refid="Base_Column_List" />
+    from kws_dept
+    where del_flag = 0
+    and ent_id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </select>
 </mapper>

sckw-modules/sckw-system/src/main/resources/mapper/KwsEntCertificateDao.xml

@@ -121,19 +121,19 @@
     <insert id="saveBatch">
       insert into kws_ent_certificate
       <trim prefix="(" suffix=")" suffixOverrides=",">
-          id,
-          ent_id,
-          type,
-          code,
-          certificate_mian,
-          certificate_revolt,
-          remark,
-          status,
-          create_by,
-          create_time,
-          update_by,
-          update_time,
-          del_flag
+            id,
+            ent_id,
+            type,
+            code,
+            certificate_mian,
+            certificate_revolt,
+            remark,
+            status,
+            create_by,
+            create_time,
+            update_by,
+            update_time,
+            del_flag,
       </trim>
       values
         <foreach collection="list" item="item" separator=",">

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -95,6 +95,7 @@
         <foreach collection="list" item="item" open="(" close=")" separator=",">
           #{item}
         </foreach>
+      and del_flag = 0
 
   </select>
 

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -287,4 +287,15 @@
     </if>
     ORDER BY sm.level, sm.sort
   </select>
+
+  <select id="selectByKeys" resultType="com.sckw.system.model.KwsMenu">
+    select
+    <include refid="Base_Column_List" />
+    from kws_menu sm
+    where del_flag = 0
+      and id in
+    <foreach collection="list" item="item" open="(" close=")" separator=",">
+      #{item}
+    </foreach>
+  </select>
 </mapper>

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuRightsDao.xml

@@ -26,6 +26,26 @@
     from kws_menu_rights
     where id = #{id,jdbcType=BIGINT}
   </select>
+    <select id="selectByRoleIds" resultType="com.sckw.system.model.KwsMenuRights">
+      select
+      <include refid="Base_Column_List" />
+      from kws_menu_rights
+      where del_flag = 0
+        and role_id in
+      <foreach collection="list" separator="," open="(" close=")" item="item">
+        #{item}
+      </foreach>
+    </select>
+  <select id="selectByMenuIds" resultType="com.sckw.system.model.KwsMenuRights">
+    select
+    <include refid="Base_Column_List" />
+    from kws_menu_rights
+    where del_flag = 0
+    and menu_id in
+    <foreach collection="list" separator="," open="(" close=")" item="item">
+      #{item}
+    </foreach>
+  </select>
 
   <insert id="insert" parameterType="com.sckw.system.model.KwsMenuRights">
     insert into kws_menu_rights

sckw-modules/sckw-system/src/main/resources/mapper/KwsRoleDao.xml

@@ -159,4 +159,15 @@
         </foreach>
     and a.del_flag = 0
   </select>
+
+    <select id="selectBatchByDeptIds" resultType="com.sckw.system.model.KwsRole">
+      select a.*
+        from kws_role a
+       where a.dept_id in
+      <foreach collection="list" item="item" open="(" close=")" separator=",">
+        #{item}
+      </foreach>
+      and a.del_flag = 0
+    </select>
+
 </mapper>

sckw-modules/sckw-system/src/main/resources/mapper/KwsUserRoleDao.xml

@@ -32,6 +32,16 @@
   <select id="findAllByRoleId" resultType="com.sckw.system.model.KwsUserRole">
     select * from kws_user_role where role_id = #{roleId} and del_flag = 0 and status = 0
   </select>
+  <select id="findAllByRoleIds" resultType="com.sckw.system.model.KwsUserRole">
+    select *
+      from kws_user_role
+     where del_flag = 0
+       and status = 0
+       and role_id in
+        <foreach collection="list" separator="," open="(" close=")" item="item">
+          #{item}
+        </foreach>
+  </select>
 
   <insert id="insert" parameterType="com.sckw.system.model.KwsUserRole">
     insert into kws_user_role