修复部分循环依赖的问题+banner的bug

sckw-auth/src/main/java/com/sckw/auth/controller/AuthController.java

@@ -130,17 +130,4 @@ public class AuthController {
         return HttpResult.ok(authService.getLoginResByToken(clientType, token));
     }
 
-
-    /**
-     * @param id 主键ID
-     * @description 重置密码
-     * @author zk
-     * @date 2023/06/02
-     **/
-    @PostMapping("/resetPassword")
-    public HttpResult resetPassword(@RequestParam Long id) {
-        authService.resetPassword(id);
-        return HttpResult.ok(HttpStatus.MSG_001);
-    }
-
 }

sckw-auth/src/main/java/com/sckw/auth/service/IAuthService.java

@@ -11,37 +11,6 @@ import com.sckw.core.web.response.HttpResult;
  */
 public interface IAuthService {
 
-    /**
-     * 登录
-     * @param reqVo
-     * @return
-     */
-    LoginResVo login(LoginReqVo reqVo) throws SystemException;
-
-    /**
-     * @param reqVo 注册入参
-     * @desc: 用户注册
-     * @author: czh
-     * @date: 2023/6/16
-     */
-    void register(RegisterReqVo reqVo);
-
-    /**
-     * @param reqDto 忘记密码入参
-     * @desc: 忘记密码
-     * @author: czh
-     * @date: 2023/6/19
-     */
-    void forgetPassword(ForgetPasswordReqVo reqDto);
-
-    /**
-     * @param id 用户id
-     * @desc: 重置密码
-     * @author: czh
-     * @date: 2023/7/3
-     */
-    void resetPassword(Long id);
-
     /**
      * 司机端登录
      * @param loginBase

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

@@ -1,6 +1,5 @@
 package com.sckw.auth.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.sckw.auth.model.vo.req.*;
 import com.sckw.auth.model.vo.res.DeptInfoResVo;
@@ -23,7 +22,6 @@ import com.sckw.fleet.api.model.vo.RDriverDetailVo;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.req.*;
-import com.sckw.system.api.model.dto.res.KwsRoleResDto;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.web.constant.HttpStatus;
@@ -34,7 +32,6 @@ 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.*;
 
@@ -56,149 +53,6 @@ public class AuthServiceImpl implements IAuthService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteFleetService fleetService;
 
-    @Override
-    public LoginResVo login(LoginReqVo reqDto) {
-//        /*1、根据账号密码或者手机号校验码登录, 手机号后面处理*/
-//        KwsUserResDto kwsUser = checkLogin(reqDto);
-//        LoginResVo loginResVo = new LoginResVo();
-//        loginResVo.setClientType(reqDto.getClientType());
-//        BeanUtils.copyProperties(kwsUser, loginResVo);
-//
-//        //平台管理员直接过了
-//        if (kwsUser.getIsMain() == Global.YES && kwsUser.getSystemType().equals(SystemTypeEnum.MANAGE.getCode())) {
-//            afterProcessor(loginResVo);
-//            return loginResVo;
-//        }
-//        /*2、登录成功，查询角色信息*/
-//        Long userId = kwsUser.getId();
-//        List<KwsRoleResDto> kwsRoleResDtos = remoteUserService.queryRoleInfoByUserId(userId);
-//        loginResVo.setRoleInfo(kwsRoleResDtos);
-//
-//
-//        /*3、查询用户机构*/
-//        List<KwsUserDeptResDto> kwsUserDeptResDtos = remoteUserService.queryUserDeptByUserId(userId);
-//        if (CollectionUtils.isEmpty(kwsUserDeptResDtos)) {
-//            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.USER_DEPT_NOT_EXISTS);
-//        }
-//
-//        List<Long> deptIds = kwsUserDeptResDtos.stream().map(KwsUserDeptResDto::getDeptId).toList();
-//        List<KwsDeptResDto> kwsDepts = remoteUserService.queryDeptByIds(deptIds);
-//        if (CollectionUtils.isEmpty(kwsDepts)) {
-//            //数据不全，直接返回
-//            afterProcessor(loginResVo);
-//            return loginResVo;
-//        }
-//
-//        /*3、查企业*/
-//        //目前一个人只能归属于一个企业，所以这里取第一个就行
-//        Long entId = kwsDepts.get(0).getEntId();
-//        KwsEnterpriseResDto kwsEnterpriseResDto = remoteUserService.queryEnterpriseById(entId);
-//        if (Objects.isNull(kwsEnterpriseResDto)) {
-//            //只要查出了机构，这个if其实不会进的，做保险起见还是加上判空
-//            afterProcessor(loginResVo);
-//            return loginResVo;
-//        }
-//
-//        EntInfoResVo entInfoResVo = new EntInfoResVo();
-//        BeanUtils.copyProperties(kwsEnterpriseResDto, entInfoResVo);
-//        entInfoResVo.setDeptInfo(BeanUtils.copyToList(kwsDepts, DeptInfoResVo.class));
-//
-//        //查企业类型
-//        List<EntTypeResDto> entTypeResDtos = remoteUserService.queryEntTypeById(entId);
-//        if (CollectionUtils.isNotEmpty(entTypeResDtos)) {
-//            entInfoResVo.setEntTypes(String.join(Global.COMMA, entTypeResDtos.stream().map(EntTypeResDto::getType).map(String::valueOf).distinct().toList()));
-//        }
-//        loginResVo.setEntInfo(entInfoResVo);
-//
-//        /* 4、查资质*/
-//        List<EntCertificateResDto> entCertificateResDtoList = remoteUserService.queryCertificateByEntId(entId);
-//        entInfoResVo.setCertificateInfo(entCertificateResDtoList);
-//
-//        //企业资质有效性判断  1、当前资质没过期，且状态是已认证  2、只要有认证过一次就算有效  参数判断
-//        String checkType = String.valueOf(Global.NUMERICAL_TWO);
-//        if (checkType.equals(Global.NUMERICAL_ONE)) {
-//            for (EntCertificateResDto entCertificateResDto : entCertificateResDtoList) {
-//                Date expireTime = entCertificateResDto.getExpireTime();
-//                entInfoResVo.setValid(DateUtil.compare(new Date(), expireTime) <= 0);
-//            }
-//        } else {
-//            List<EntCheckTrackResDto> entCheckTrackResDtoList = remoteUserService.checkTrackByEntId(entId);
-//            if (CollectionUtils.isEmpty(entCheckTrackResDtoList)) {
-//                entInfoResVo.setValid(false);
-//                afterProcessor(loginResVo);
-//                return loginResVo;
-//            }
-//            entInfoResVo.setValid(entCheckTrackResDtoList.stream().anyMatch(item -> item.getStatus() == Global.NO));
-//        }
-//
-//        /*5、生成token，一些信息存redis*/
-//        afterProcessor(loginResVo);
-//        return loginResVo;
-        return null;
-    }
-
-    private KwsUserResDto checkLogin(LoginReqVo reqDto) {
-        List<KwsUserResDto> kwsUsers = remoteUserService.checkUserBase(reqDto.getAccount(), reqDto.getSystemType());
-        KwsUserResDto kwsUser = kwsUsers.get(0);
-        //密码校验、验证码
-        if (StringUtils.isNotBlank(reqDto.getPassword())) {
-            remoteUserService.checkPassword(reqDto.getPassword(), kwsUser.getPassword());
-        } else {
-            String key = Global.USER_LOGIN_CAPTCHA + reqDto.getSystemType() + Global.COLON + kwsUser.getAccount();
-//            String captcha = RedissonUtils.getString(key);
-//            if (StringUtils.isBlank(captcha) || StringUtils.isBlank(reqDto.getCaptcha()) || !reqDto.getCaptcha().equals(captcha)) {
-//                throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.CAPCHA_ERROR);
-//            }
-//            RedissonUtils.delete(key);
-        }
-        return kwsUser;
-    }
-
-    /**
-     * @param loginResVo 登录的返参
-     * @desc: 生成token，存redis
-     * @author: czh
-     * @date: 2023/6/12
-     */
-    private void afterProcessor(LoginResVo loginResVo) {
-        try {
-            //设置token
-            loginResVo.setToken(EncryUtil.encry(Global.PRI_KEY, String.valueOf(loginResVo.getId())));
-
-            //异步存redis
-            AsyncFactory.execute(new AsyncProcess(loginResVo, remoteUserService));
-        } catch (Exception e) {
-            throw new SystemException(HttpStatus.GLOBAL_EXCEPTION_CODE, HttpStatus.GLOBAL_EXCEPTION_MESSAGE);
-        }
-    }
-
-    @Override
-    @Transactional(rollbackFor = {})
-    public void register(RegisterReqVo reqVo) {
-        /*校验验证码*/
-        String key = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, DictEnum.SMS_REGISTER.getValue(), reqVo.getPhone());
-        String sms = RedissonUtils.getString(key);
-        if (!reqVo.getCaptcha().equals(sms)) {
-            throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
-        }
-        RegisterReqDto registerReqDto = new RegisterReqDto();
-        BeanUtils.copyProperties(reqVo, registerReqDto);
-        remoteUserService.register(registerReqDto);
-        RedissonUtils.delete(key);
-    }
-
-
-    @Override
-    public void forgetPassword(ForgetPasswordReqVo reqDto) {
-        ForgetPasswordReqDto forgetPasswordReqDto = new ForgetPasswordReqDto();
-        BeanUtils.copyProperties(reqDto, forgetPasswordReqDto);
-        remoteUserService.forgetPassword(forgetPasswordReqDto);
-    }
-
-    @Override
-    public void resetPassword(Long id) {
-        remoteUserService.resetPassword(id);
-    }
 
     static class AsyncProcess implements Runnable {
 

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/RemoteUserService.java

@@ -43,27 +43,6 @@ public interface RemoteUserService {
      */
     List<KwsDeptResDto> queryDeptByIds(List<Long> ids);
 
-    /**
-     * @param reqDto 用户注册入参
-     * @desc: 用户注册
-     * @author: czh
-     * @date: 2023/6/19
-     */
-    void register(RegisterReqDto reqDto) throws SystemException;
-
-    /**
-     * 校验密码
-     * @param password 入参传的密码
-     * @param currentPwd 当前用户的密码
-     */
-    void checkPassword(String password, String currentPwd) throws SystemException;
-
-    /**
-     * 检验用户信息
-     * @param account
-     * @return
-     */
-    List<KwsUserResDto> checkUserBase(String account, int systemType) throws SystemException;
 
     /**
      * 根基id查企业
@@ -99,15 +78,6 @@ public interface RemoteUserService {
      */
     void saveUserLogin(UserLoginReqDto userLoginReqDto);
 
-
-    /**
-     * @param reqDto 忘记密码入参
-     * @desc: 忘记密码
-     * @author: czh
-     * @date: 2023/6/19
-     */
-    void forgetPassword(ForgetPasswordReqDto reqDto);
-
     /**
      * @param userId 用户id
      * @return 登录
@@ -135,21 +105,6 @@ public interface RemoteUserService {
      */
     List<EntCheckTrackResDto> checkTrackByEntId(Long entId);
 
-    /**
-     * @param updatePassword 修改密码入参
-     * @desc: 修改密码
-     * @author: czh
-     * @date: 2023/7/3
-     */
-    void updatePassword(UpdatePasswordReqDto updatePassword);
-
-    /**
-     * @param id 用户id
-     * @desc: 重置密码
-     * @author: czh
-     * @date: 2023/7/3
-     */
-    void resetPassword(Long id);
 
     /**
      * @param entId 企业id  userId用户id
@@ -168,14 +123,6 @@ public interface RemoteUserService {
      */
     Map<Long, SysDictResDto> querySysDictByIds(List<Long> ids);
 
-    /**
-     * @desc: 校验注册的入参
-     * @param: entName 企业名  phone联系电话  systemType系统类型
-     * @author: czh
-     * @date 2023/7/23
-     */
-    void checkRegisterParam(String entName, String phone, Integer systemType);
-
     /**
      * @param entId 企业id
      * @return EntTypeResDto

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/dubbo/RemoteManageServiceImpl.java

@@ -9,7 +9,6 @@ import com.sckw.manage.api.model.dto.res.EntAddressResDto;
 import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.manage.dao.KwmAddressMapper;
 import com.sckw.manage.model.entity.KwmAddress;
-import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.vo.req.FindCooperateByEntReqVo;
 import com.sckw.manage.model.vo.req.FindEntCooperateReqVo;
 import com.sckw.manage.model.vo.res.FindCooperateByEntResVo;
@@ -18,7 +17,6 @@ import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;
@@ -125,7 +123,7 @@ public class RemoteManageServiceImpl implements RemoteManageService {
                 }
             }
         }
-
         return findEntCooperateResVoList;
     }
+
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -1,10 +1,6 @@
 package com.sckw.manage.service;
 
-import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -21,30 +17,23 @@ 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.excel.utils.EasyExcelUtil;
 import com.sckw.excel.utils.ExcelUtil;
-import com.sckw.manage.api.model.dto.res.EntAddressResDto;
 import com.sckw.manage.dao.KwmAddressMapper;
-import com.sckw.manage.dubbo.RemoteManageServiceImpl;
 import com.sckw.manage.model.entity.KwmAddress;
 import com.sckw.manage.model.report.AddressQueryExport;
 import com.sckw.manage.model.vo.req.*;
 import com.sckw.manage.model.vo.res.AddressDetailResVo;
 import com.sckw.manage.model.vo.res.AddressQueryResVo;
-import com.sckw.stream.enums.MessageEnum;
-import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
-import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -63,17 +52,11 @@ public class KwmAddressService {
     @Autowired
     private CommonBusinessService commonBusinessService;
 
-    @Autowired
-    private RemoteManageServiceImpl remoteManageService;
-
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private RemoteSystemService remoteSystemService;
+    RemoteSystemService remoteSystemService;
 
     @DubboReference(version = "1.0.0", group = "design", check = false)
-    private RemoteUserService remoteUserService;
-
-    @Autowired
-    private StreamBridge streamBridge;
+    RemoteUserService remoteUserService;
 
     /**
      * @param reqVo 分页入参

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateApplyService.java

@@ -1,6 +1,5 @@
 package com.sckw.manage.service;
 
-import java.io.IOException;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,7 +14,6 @@ import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
-import com.sckw.excel.utils.EasyExcelUtil;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.manage.dao.KwmCooperateMapper;
 import com.sckw.manage.dao.KwmCooperateTypeMapper;
@@ -24,7 +22,6 @@ import com.sckw.manage.model.dto.res.CooperateManageQueryResDto;
 import com.sckw.manage.model.dto.res.CooperateQueryDto;
 import com.sckw.manage.model.entity.KwmCooperate;
 import com.sckw.manage.model.entity.KwmCooperateType;
-import com.sckw.manage.model.report.AddressQueryExport;
 import com.sckw.manage.model.report.CooperateManageExport;
 import com.sckw.manage.model.vo.req.CooperateApplyQueryReqVo;
 import com.sckw.manage.model.vo.req.CooperateApproveReqVo;

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/entity/KwoBanner.java

@@ -1,6 +1,5 @@
 package com.sckw.operation.model.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/model/vo/req/BannerAddReqVo.java

@@ -31,7 +31,7 @@ public class BannerAddReqVo extends PageRequest implements Serializable {
     /**
      * 展示图片
      */
-    @NotBlank(message = "图片地址不能为空")
+    @NotBlank(message = "图片不能为空")
     @Size(max = 200, message = "图片地址超长")
     private String url;
     /**

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java

@@ -121,7 +121,7 @@ public class BannerService {
             BannerQueryResVo bannerQueryResVo = new BannerQueryResVo();
             BeanUtils.copyProperties(item, bannerQueryResVo);
             UserCacheResDto userCacheResDto = userCacheResDtoMap.get(item.getCreateBy());
-
+            bannerQueryResVo.setEndTime(item.getEntTime());
             if (Objects.nonNull(userCacheResDto)) {
                 bannerQueryResVo.setCreateByName(userCacheResDto.getName());
             }
@@ -149,6 +149,7 @@ public class BannerService {
         Date date = new Date();
         kwoBanner.setDelFlag(Global.NO);
         kwoBanner.setStatus(reqVo.getStatus());
+        kwoBanner.setEntTime(reqVo.getEndTime());
         kwoBanner.setCreateBy(userId);
         kwoBanner.setUpdateBy(userId);
         kwoBanner.setCreateTime(date);

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteBaseService.java

@@ -3,22 +3,15 @@ package com.sckw.system.dubbo;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.system.api.model.dto.res.REnterpriseVo;
 import com.sckw.system.api.model.dto.res.*;
 import com.sckw.system.api.model.pojo.DeptInfoPojo;
-import com.sckw.system.dao.KwsAuthorityDao;
-import com.sckw.system.dao.KwsEntDeptDao;
-import com.sckw.system.dao.KwsEntTypeDao;
-import com.sckw.system.dao.KwsEnterpriseDao;
+import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindManagePojo;
 import com.sckw.system.model.vo.res.CertificateResVo;
 import com.sckw.system.model.vo.res.KwsDeptResVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
-import com.sckw.system.service.KwsDeptService;
 import com.sckw.system.service.KwsEnterpriseService;
-import com.sckw.system.service.KwsRoleService;
-import com.sckw.system.service.KwsUserService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
@@ -39,13 +32,13 @@ public class RemoteBaseService {
     private KwsAuthorityDao kwsAuthorityDao;
 
     @Resource
-    private KwsDeptService kwsDeptService;
+    private KwsDeptDao kwsDeptDao;
 
     @Resource
-    private KwsUserService kwsUserService;
+    private KwsUserDao kwsUserDao;
 
     @Resource
-    private KwsRoleService kwsRoleService;
+    private KwsRoleDao kwsRoleDao;
 
     @Resource
     private KwsEntDeptDao kwsEntDeptDao;
@@ -56,9 +49,12 @@ public class RemoteBaseService {
     @Resource
     private KwsEnterpriseDao kwsEnterpriseDao;
 
+    @Resource
+    private KwsEntCheckTrackDao kwsEntCheckTrackDao;
+
 
     public KwsEnterpriseResDto queryEnterpriseById(Long id) {
-        KwsEnterprise kwsEnterprise = kwsEnterpriseService.queryKwsEnterpriseById(id);
+        KwsEnterprise kwsEnterprise = kwsEnterpriseDao.selectByKey(id);
         if (Objects.isNull(kwsEnterprise)) {
             return null;
         }
@@ -69,10 +65,9 @@ public class RemoteBaseService {
     }
 
     public KwsUserResDto getUserByAccount(String username) {
-        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
-            put("account", username);
-        }};
-        List<KwsUserResVo> list = kwsUserService.findList(params);
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_TWO);
+        params.put("account", username);
+        List<KwsUserResVo> list = kwsUserDao.findList(params);
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
@@ -82,7 +77,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsUserDeptResDto> queryUserDeptByUserId(Long userId) {
-        List<KwsUserDept> kwsUserDepts = kwsUserService.queryUserDeptByUserId(userId);
+        List<KwsUserDept> kwsUserDepts = kwsUserDao.queryUserDeptByUserId(userId);
         if (CollectionUtils.isEmpty(kwsUserDepts)) {
             return Collections.emptyList();
         }
@@ -90,7 +85,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsDeptResDto> queryDeptByIds(List<Long> ids) {
-        List<KwsDept> kwsDepts = kwsUserService.queryDeptByIds(ids);
+        List<KwsDept> kwsDepts = kwsUserDao.queryDeptByIds(ids);
         if (CollectionUtils.isEmpty(kwsDepts)) {
             return Collections.emptyList();
         }
@@ -99,7 +94,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsRoleResDto> queryRoleInfoByUserId(Long userId) {
-        List<KwsRole> kwsRoles = kwsRoleService.queryRoleByUserId(userId);
+        List<KwsRole> kwsRoles = kwsRoleDao.queryRoleByUserId(userId);
         if (CollectionUtils.isEmpty(kwsRoles)) {
             return Collections.emptyList();
         }
@@ -115,7 +110,7 @@ public class RemoteBaseService {
     }
 
     public List<EntCheckTrackResDto> checkTrackByEntId(Long entId) {
-        List<KwsEntCheckTrack> kwsEntCheckTracks = kwsEnterpriseService.entCheck(entId);
+        List<KwsEntCheckTrack> kwsEntCheckTracks = kwsEntCheckTrackDao.findList(entId);
         if (CollectionUtils.isEmpty(kwsEntCheckTracks)) {
             return Collections.emptyList();
         }
@@ -126,7 +121,7 @@ public class RemoteBaseService {
         KwsDept kwsDept = new KwsDept();
         kwsDept.setEntId(entId);
         kwsDept.setDelFlag(Global.NO);
-        List<KwsDeptResVo> list = kwsDeptService.findList(kwsDept);
+        List<KwsDeptResVo> list = kwsDeptDao.findList(kwsDept);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
@@ -134,7 +129,7 @@ public class RemoteBaseService {
     }
 
     public List<KwsEnterprise> findEnts(Map<String, Object> params) {
-        return kwsEnterpriseService.findEnts(params);
+        return kwsEnterpriseDao.findEnts(params);
     }
 
 
@@ -179,7 +174,12 @@ public class RemoteBaseService {
      * @return list
      */
     public List<KwsUserResDto> getUserByName(String name) {
-        return kwsUserService.getUserByName(name);
+        List<KwsUser> userByName = kwsUserDao.getUserByName(name);
+        if (CollectionUtils.isEmpty(userByName)) {
+            return Collections.emptyList();
+        }
+
+        return BeanUtils.copyToList(userByName, KwsUserResDto.class);
     }
 
     /**
@@ -201,7 +201,7 @@ public class RemoteBaseService {
      * @date: 2023/9/1
      */
     public List<KwsEnterprise> queryEntInfoByCityCodeAndEntTypesWithPage(Integer cityCode, List<Integer> entTypeList, List<Long> entIdList, String entName) {
-        return kwsEnterpriseService.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList, entIdList, entName);
+        return kwsEnterpriseDao.queryEntInfoByCityCodeAndEntTypesWithPage(cityCode, entTypeList, entIdList, entName);
     }
 
     /**
@@ -223,7 +223,7 @@ public class RemoteBaseService {
      * @date: 2023/9/4
      */
     public List<KwsUser> queryUserByDeptIds(List<Long> deptIds) {
-        return kwsUserService.queryUserByDeptIds(deptIds);
+        return kwsUserDao.selectByDeptIds(deptIds);
     }
 
     /**
@@ -238,6 +238,6 @@ public class RemoteBaseService {
         if (Objects.isNull(manageInfoByEntId)) {
             return null;
         }
-        return kwsUserService.selectByKey(manageInfoByEntId.getUserId());
+        return kwsUserDao.selectByKey(manageInfoByEntId.getUserId());
     }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sckw.system.dubbo;
 
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -13,12 +12,12 @@ import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.*;
 import com.sckw.system.api.model.pojo.DeptInfoPojo;
+import com.sckw.system.dao.KwsUserDao;
+import com.sckw.system.dao.SysAreaDao;
 import com.sckw.system.dao.SysDictDao;
 import com.sckw.system.model.*;
 import com.sckw.system.model.vo.res.FindAreaTreeResVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
-import com.sckw.system.service.KwsUserService;
-import com.sckw.system.service.SysAreaService;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +37,13 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
     private SysDictDao sysDictDao;
 
     @Autowired
-    private KwsUserService kwsUserService;
+    private KwsUserDao kwsUserDao;
 
     @Autowired
     private RemoteBaseService remoteBaseService;
 
     @Autowired
-    private SysAreaService sysAreaService;
+    private SysAreaDao sysAreaDao;
 
     /**
      * @param keys type#value,type#value
@@ -518,7 +517,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         String dictCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(dictCache)) {
-            KwsUser kwsUser = kwsUserService.selectByKey(userId);
+            KwsUser kwsUser = kwsUserDao.selectByKey(userId);
             if (Objects.isNull(kwsUser)) {
                 return null;
             }
@@ -592,7 +591,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         String areaCache = RedissonUtils.getString(key);
         //从redis查，查不到从数据库查，并写入redis
         if (StringUtils.isBlank(areaCache)) {
-            SysArea sysArea = sysAreaService.selectById(code);
+            SysArea sysArea = sysAreaDao.selectById(code);
             if (Objects.isNull(sysArea)) {
                 return new SysAreaCacheResDto();
             }
@@ -610,7 +609,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
-        List<SysArea> sysAreas = sysAreaService.selectByIds(list);
+        List<SysArea> sysAreas = sysAreaDao.selectByIds(list);
         if (CollectionUtils.isEmpty(sysAreas)) {
             return Collections.emptyList();
         }
@@ -630,7 +629,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             upLevel.removeIf(x -> x.getLevel() > finalI);
             Map<Integer, List<AreaTreeFrontResDto>> collect = upLevel.stream().collect(Collectors.groupingBy(AreaTreeFrontResDto::getPcode));
             for (Integer pcode : collect.keySet()) {
-                SysArea sysArea = sysAreaService.selectById(pcode);
+                SysArea sysArea = sysAreaDao.selectById(pcode);
                 AreaTreeFrontResDto areaTreeFrontResDto = new AreaTreeFrontResDto();
                 areaTreeFrontResDto.setCode(sysArea.getCode());
                 areaTreeFrontResDto.setPcode(sysArea.getPcode());
@@ -722,7 +721,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             return Collections.emptyList();
         }
 
-        List<SysArea> list = sysAreaService.findList(null);
+        List<SysArea> list = sysAreaDao.findList(null);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
@@ -776,7 +775,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             put("account", account);
             put("systemType", systemType);
         }};
-        List<KwsUserResVo> users = kwsUserService.findList(params);
+        List<KwsUserResVo> users = kwsUserDao.findList(params);
         if (CollectionUtils.isEmpty(users)) {
             return null;
         }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -8,28 +8,19 @@ import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.PasswordUtils;
 import com.sckw.core.web.constant.HttpStatus;
-import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.req.*;
 import com.sckw.system.api.model.dto.res.*;
-import com.sckw.system.dao.KwsEnterpriseDao;
-import com.sckw.system.dao.KwsUserLoginDao;
-import com.sckw.system.dao.SysAreaDao;
-import com.sckw.system.dao.SysDictDao;
+import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
 import com.sckw.system.model.pojo.FindEntUserPojo;
 import com.sckw.system.model.pojo.FindMenuTreePojo;
 import com.sckw.system.model.vo.req.FindListReqVo;
-import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.system.model.vo.res.KwsMenuResVo;
 import com.sckw.system.model.vo.res.KwsUserResVo;
-import com.sckw.system.service.*;
 import jakarta.annotation.Resource;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,20 +37,17 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     private RemoteBaseService remoteBaseService;
 
     @Resource
-    private KwsUserService kwsUserService;
+    private KwsUserDao kwsUserDao;
 
     @Resource
-    private KwsRoleService kwsRoleService;
+    private KwsUserRoleDao kwsUserRoleDao;
 
     @Resource
-    private KwsMenuService kwsMenuService;
+    private KwsMenuDao kwsMenuDao;
 
     @Resource
     private KwsUserLoginDao kwsUserLoginDao;
 
-    @Resource
-    private KwsEnterpriseService kwsEnterpriseService;
-
     @Resource
     private KwsEnterpriseDao kwsEnterpriseDao;
 
@@ -69,9 +57,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     @Resource
     private SysAreaDao sysAreaDao;
 
-    @Resource
-    private CommonService commonService;
-
 
     @Override
     public KwsEnterpriseResDto queryEnterpriseById(Long id) {
@@ -86,13 +71,13 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     @Override
     public List<UserAccessMenuInfoResDto> queryUserAccessMenu(long id) {
         FindMenuTreePojo findMenuTreePojo = new FindMenuTreePojo();
-        List<KwsUserRole> kwsUserRoles = kwsRoleService.findAllByUserId(id);
+        List<KwsUserRole> kwsUserRoles = kwsUserRoleDao.findAllByUserId(id);
         if (CollectionUtils.isEmpty(kwsUserRoles)) {
             return Collections.emptyList();
         }
         findMenuTreePojo.setRoleIds(kwsUserRoles.stream().map(KwsUserRole::getRoleId).toList());
 
-        List<KwsMenuResVo> kwsMenuResVos = kwsMenuService.findList(findMenuTreePojo);
+        List<KwsMenuResVo> kwsMenuResVos = kwsMenuDao.findList(findMenuTreePojo);
         if (CollectionUtils.isEmpty(kwsMenuResVos)) {
             return Collections.emptyList();
         }
@@ -100,12 +85,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return BeanUtils.copyToList(kwsMenuResVos, UserAccessMenuInfoResDto.class);
     }
 
-    @Override
-    public void forgetPassword(ForgetPasswordReqDto reqDto) throws SystemException {
-        com.sckw.system.model.vo.req.ForgetPasswordReqVo forgetPasswordReqVo = new ForgetPasswordReqVo();
-        BeanUtils.copyProperties(reqDto, forgetPasswordReqVo);
-        kwsUserService.forgetPassword(forgetPasswordReqVo);
-    }
 
     @Override
     public void saveUserLogin(UserLoginReqDto userLoginReqDto) {
@@ -136,19 +115,9 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     }
 
 
-    @Override
-    public void updatePassword(UpdatePasswordReqDto updatePassword) {
-        kwsUserService.updatePassword(updatePassword);
-    }
-
-    @Override
-    public void resetPassword(Long id) {
-        kwsUserService.resetPassword(id);
-    }
-
     @Override
     public void bindManager(Long entId, Long userId) {
-        KwsEnterprise kwsEnterprise = kwsEnterpriseService.queryKwsEnterpriseById(entId);
+        KwsEnterprise kwsEnterprise = kwsEnterpriseDao.selectByKey(entId);
         if (Objects.isNull(kwsEnterprise)) {
             return;
         }
@@ -168,11 +137,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return sysDictResDtos.stream().collect(Collectors.toMap(SysDictResDto::getId, item -> item, (oldValue, newValue) -> newValue));
     }
 
-    @Override
-    public void checkRegisterParam(String entName, String phone, Integer systemType) {
-        commonService.checkEntRepeat(entName, phone);
-        kwsUserService.checkAccountValid(phone, systemType);
-    }
 
     @Override
     public List<EntTypeResDto> queryEntTypeById(Long entId) {
@@ -234,11 +198,12 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     public List<FindEntUserResDto> findEntUser(Long entId) {
         FindListReqVo findListReqVo = new FindListReqVo();
         findListReqVo.setId(entId);
-        List<FindEntUserPojo> entUser = kwsEnterpriseService.findEntUser(findListReqVo);
-        if(CollectionUtils.isEmpty(entUser)) {
+        List<FindEntUserPojo> list = kwsEnterpriseDao.findUserByEntIds(Collections.singletonList(entId));
+        if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
         }
-        return BeanUtils.copyToList(entUser,FindEntUserResDto.class);
+
+        return BeanUtils.copyToList(list, FindEntUserResDto.class);
     }
 
 
@@ -266,10 +231,9 @@ public class RemoteUserServiceImpl implements RemoteUserService {
      **/
     @Override
     public List<Long> findEntIds(List<Integer> entTypes, String firmName) {
-        Map<String, Object> params  = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
-            put("entTypes", entTypes);
-            put("firmName", firmName);
-        }};
+        Map<String, Object> params  = new HashMap<>(Global.NUMERICAL_FOUR);
+        params.put("entTypes", entTypes);
+        params.put("firmName", firmName);
         List<KwsEnterprise> ents = remoteBaseService.findEnts(params);
         List<Long> endIds = new ArrayList<>();
         ents.forEach(ent -> endIds.add(ent.getId()));
@@ -285,11 +249,10 @@ public class RemoteUserServiceImpl implements RemoteUserService {
      **/
     @Override
     public List<Long> findUserIds(List<Long> entIds, String userName) {
-        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN){{
-            put("entIds", entIds);
-            put("userName", userName);
-        }};
-        List<KwsUserResVo> users = kwsUserService.findList(params);
+        Map<String, Object> params = new HashMap<>(Global.NUMERICAL_FOUR);
+        params.put("entIds", entIds);
+        params.put("userName", userName);
+        List<KwsUserResVo> users = kwsUserDao.findList(params);
         List<Long> userIds = new ArrayList<>();
         users.forEach(user -> userIds.add(user.getId()));
         return userIds;
@@ -299,7 +262,6 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     /**
      * 根据用户名查用户信息
      * @param username 用户账号
-     * @return
      */
     @Override
     public KwsUserResDto getUserByAccount(String username) {
@@ -327,22 +289,5 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         return remoteBaseService.queryDeptByIds(ids);
     }
 
-    @Override
-    public void register(RegisterReqDto reqDto) throws SystemException {
-        kwsUserService.register(reqDto);
-    }
-
-    @Override
-    public void checkPassword(String password, String currentPwd) throws SystemException {
-        kwsUserService.checkPassword(password, currentPwd);
-    }
-
-    @Override
-    public List<KwsUserResDto> checkUserBase(String account, int systemType) throws SystemException {
-        KwsUser kwsUser = kwsUserService.checkUserBase(account, systemType);
-        KwsUserResDto kwsUserService = new KwsUserResDto();
-        BeanUtils.copyProperties(kwsUser, kwsUserService);
-        return Collections.singletonList(kwsUserService);
-    }
 
 }