refactor(system): 重构系统服务模块的代码结构

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java

@@ -3,11 +3,10 @@ package cn.odboy.system.service;
 import cn.odboy.constant.SystemConst;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
-import cn.odboy.framework.redis.KitRedisHelper;
+import cn.odboy.system.dal.model.request.SystemUserLoginArgs;
 import cn.odboy.system.dal.model.response.SystemAuthVo;
 import cn.odboy.system.dal.model.response.SystemUserInfoVo;
 import cn.odboy.system.dal.model.response.SystemUserJwtVo;
-import cn.odboy.system.dal.model.request.SystemUserLoginArgs;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
 import cn.odboy.system.framework.permission.core.handler.TokenProvider;
@@ -25,8 +24,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class SystemAuthService {
 
-  @Autowired
-  private KitRedisHelper redisHelper;
   @Autowired
   private AppProperties properties;
   @Autowired
@@ -51,15 +48,19 @@ public class SystemAuthService {
     if (!passwordEncoder.matches(password, jwtUser.getPassword())) {
       throw new BadRequestException("登录密码错误");
     }
+
+    // 登录验证
     Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities());
     SecurityContextHolder.getContext().setAuthentication(authentication);
+
     // 生成令牌
     String token = tokenProvider.createToken(jwtUser);
     // 返回 token 与 用户信息
     SystemAuthVo authInfo = new SystemAuthVo();
     authInfo.setToken(String.format("%s %s", SystemConst.TOKEN_PREFIX, token));
-    // 这里是为了清空密码
+    /// 这里是为了清空密码
     authInfo.setUser(KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class));
+
     if (properties.getLogin().isSingle()) {
       // 踢掉之前已经登录的token
       systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername());

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java

@@ -473,13 +473,6 @@ public class SystemDeptService {
 
   public void exportDeptXlsx(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception {
     List<SystemDeptTb> systemDeptTbs = this.queryAllDeptByArgs(args, false);
-//    KitXlsxExportUtil.exportFile(response, "部门数据", systemDeptTbs, SystemDeptExportRowVo.class, (dataObject) -> {
-//      SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setEnabled(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemDeptExportRowVo> rowVos = new ArrayList<>();
     for (SystemDeptTb dataObject : systemDeptTbs) {
       SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo();

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java

@@ -111,29 +111,6 @@ public class SystemDictService {
 
   public void exportDictXlsx(HttpServletResponse response, SystemQueryDictArgs args) {
     List<SystemDictTb> systemDictTbs = this.queryDictByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "字典数据", systemDictTbs, SystemDictExportRowVo.class, (dataObject) -> {
-//      List<SystemDictDetailVo> dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName());
-//      if (CollUtil.isEmpty(dictDetails)) {
-//        SystemDictExportRowVo rowVo = new SystemDictExportRowVo();
-//        rowVo.setName(dataObject.getName());
-//        rowVo.setDescription(dataObject.getDescription());
-//        rowVo.setCreateTime(dataObject.getCreateTime());
-//        rowVo.setLabel("");
-//        rowVo.setValue("");
-//        return CollUtil.newArrayList(rowVo);
-//      }
-//      List<SystemDictExportRowVo> rowVos = new ArrayList<>();
-//      for (SystemDictDetailVo dictDetail : dictDetails) {
-//        SystemDictExportRowVo rowVo = new SystemDictExportRowVo();
-//        rowVo.setName(dataObject.getName());
-//        rowVo.setDescription(dataObject.getDescription());
-//        rowVo.setCreateTime(dataObject.getCreateTime());
-//        rowVo.setLabel(dictDetail.getLabel());
-//        rowVo.setValue(dictDetail.getValue());
-//        rowVos.add(rowVo);
-//      }
-//      return rowVos;
-//    });
     List<SystemDictExportRowVo> rowVos = new ArrayList<>();
     for (SystemDictTb dataObject : systemDictTbs) {
       List<SystemDictDetailVo> dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName());

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java

@@ -141,13 +141,6 @@ public class SystemJobService {
 
   public void exportJobXlsx(HttpServletResponse response, SystemQueryJobArgs args) {
     List<SystemJobTb> systemJobTbs = this.queryJobByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "岗位数据", systemJobTbs, SystemJobExportRowVo.class, (dataObject) -> {
-//      SystemJobExportRowVo rowVo = new SystemJobExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setEnabled(dataObject.getEnabled() ? "启用" : "停用");
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemJobExportRowVo> rowVos = new ArrayList<>();
     for (SystemJobTb dataObject : systemJobTbs) {
       SystemJobExportRowVo rowVo = new SystemJobExportRowVo();

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java

@@ -296,20 +296,6 @@ public class SystemQuartzJobService {
 
   public void exportQuartzLogXlsx(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     List<SystemQuartzLogTb> systemQuartzLogTbs = this.queryQuartzLogByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "定时任务日志数据", systemQuartzLogTbs, SystemQuartzLogExportRowVo.class,
-//        (dataObject) -> {
-//          SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo();
-//          rowVo.setJobName(dataObject.getJobName());
-//          rowVo.setBeanName(dataObject.getBeanName());
-//          rowVo.setMethodName(dataObject.getMethodName());
-//          rowVo.setParams(dataObject.getParams());
-//          rowVo.setCronExpression(dataObject.getCronExpression());
-//          rowVo.setExceptionDetail(dataObject.getExceptionDetail());
-//          rowVo.setTime(dataObject.getTime());
-//          rowVo.setStatus(dataObject.getIsSuccess() ? "成功" : "失败");
-//          rowVo.setCreateTime(dataObject.getCreateTime());
-//          return CollUtil.newArrayList(rowVo);
-//        });
     List<SystemQuartzLogExportRowVo> rowVos = new ArrayList<>();
     for (SystemQuartzLogTb dataObject : systemQuartzLogTbs) {
       SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo();

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java

@@ -281,14 +281,6 @@ public class SystemRoleService {
 
   public void exportRoleXlsx(HttpServletResponse response, SystemQueryRoleArgs args) {
     List<SystemRoleVo> systemRoleVos = this.queryRoleByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "角色数据", systemRoleVos, SystemRoleExportRowVo.class, (dataObject) -> {
-//      SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setLevel(dataObject.getLevel());
-//      rowVo.setDescription(dataObject.getDescription());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemRoleExportRowVo> rowVos = new ArrayList<>();
     for (SystemRoleVo dataObject : systemRoleVos) {
       SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo();

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java

@@ -31,11 +31,11 @@ import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserJobTb;
 import cn.odboy.system.dal.dataobject.SystemUserRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.response.SystemDeptVo;
-import cn.odboy.system.dal.model.request.SystemQueryUserArgs;
-import cn.odboy.system.dal.model.response.SystemRoleVo;
-import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs;
 import cn.odboy.system.dal.model.export.SystemUserExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryUserArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
 import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.dal.mysql.SystemUserMapper;
 import cn.odboy.system.dal.redis.SystemUserInfoDAO;
@@ -510,35 +510,6 @@ public class SystemUserService {
   }
 
   public void exportUserXlsx(HttpServletResponse response, SystemQueryUserArgs args) {
-    //    List<SystemUserVo> systemUserVos = systemUserService.queryUserVoByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "用户数据", systemUserVos, SystemUserExportRowVo.class, (dataObject) -> {
-//      SystemUserExportRowVo rowVo = new SystemUserExportRowVo();
-//      rowVo.setUsername(dataObject.getUsername());
-//      rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setDept(dataObject.getDept().getName());
-//      rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setEmail(dataObject.getEmail());
-//      rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setMobile(dataObject.getPhone());
-//      rowVo.setUpdatePwdTime(dataObject.getPwdResetTime());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
-//    List<SystemUserExportRowVo> rowVos = new ArrayList<>();
-//    for (SystemUserVo dataObject : systemUserVos) {
-//      SystemUserExportRowVo rowVo = new SystemUserExportRowVo();
-//      rowVo.setUsername(dataObject.getUsername());
-//      rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setDept(dataObject.getDept().getName());
-//      rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setEmail(dataObject.getEmail());
-//      rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setMobile(dataObject.getPhone());
-//      rowVo.setUpdatePwdTime(dataObject.getPwdResetTime());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      rowVos.add(rowVo);
-//    }
-//    KitExcelExporter.exportSimple(response, "用户数据", SystemUserExportRowVo.class, rowVos);
     long totalCount = this.countUserByArgs(args);
     KitExcelExporter.exportByPage(response, "用户数据", SystemUserExportRowVo.class, totalCount, (long pageNum, long pageSize) -> {
       KitPageResult<SystemUserVo> pageResult = this.searchUserByArgs(args, new Page<>(pageNum, pageSize));