格式化项目代码规范

common/src/main/java/com/koobietech/eas/common/config/RedisConfig.java → common/src/main/java/com/koobietech/eas/common/config/RedisConfiguration.java

@@ -7,8 +7,11 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
 
+/**
+ * @author lc
+ */
 @Configuration
-public class RedisConfig {
+public class RedisConfiguration {
 
     @Bean
     @SuppressWarnings("all")

common/src/main/java/com/koobietech/eas/common/constant/UniversityCodeUtils.java → common/src/main/java/com/koobietech/eas/common/constant/UniversityCode.java

@@ -4,7 +4,7 @@ package com.koobietech.eas.common.constant;
  * @author lc
  */
 
-public enum UniversityCodeUtils {
+public enum UniversityCode {
     //学校编码
     c10212(10212, "黑龙江大学"),
     c10213(10213, "哈尔滨工业大学"),
@@ -35,7 +35,7 @@ public enum UniversityCodeUtils {
     private int code;
     private String name;
 
-    UniversityCodeUtils(int code, String name) {
+    UniversityCode(int code, String name) {
         this.code = code;
         this.name = name;
     }
@@ -49,18 +49,18 @@ public enum UniversityCodeUtils {
     }
 
     public static String getName(int code) {
-        for (UniversityCodeUtils universityCodeUtils : UniversityCodeUtils.values()) {
-            if (universityCodeUtils.getCode() == code) {
-                return universityCodeUtils.getName();
+        for (UniversityCode universityCode : UniversityCode.values()) {
+            if (universityCode.getCode() == code) {
+                return universityCode.getName();
             }
         }
         return null;
     }
 
     public static int getCode(String name) {
-        for (UniversityCodeUtils universityCodeUtils : UniversityCodeUtils.values()) {
-            if (universityCodeUtils.getName().equals(name)) {
-                return universityCodeUtils.getCode();
+        for (UniversityCode universityCode : UniversityCode.values()) {
+            if (universityCode.getName().equals(name)) {
+                return universityCode.getCode();
             }
         }
         return -1;

common/src/main/java/com/koobietech/eas/common/pojo/ArchiveNumberInfo.java → common/src/main/java/com/koobietech/eas/common/pojo/ArchiveNumberInfoPojo.java

@@ -6,7 +6,7 @@ import lombok.Data;
  * @author lc
  */
 @Data
-public class ArchiveNumberInfo {
+public class ArchiveNumberInfoPojo {
     int studentId;
     String studentCode;
     long createTime;

common/src/main/java/com/koobietech/eas/common/pojo/JwtUserDto.java → common/src/main/java/com/koobietech/eas/common/pojo/JwtUserPojo.java

@@ -6,18 +6,18 @@ import lombok.Data;
  * @author lc
  */
 @Data
-public class JwtUserDto {
+public class JwtUserPojo {
     String username;
     Long id;
     Enum type;
 
-    public JwtUserDto(String username, Long id, Enum type) {
+    public JwtUserPojo(String username, Long id, Enum type) {
         this.username = username;
         this.id = id;
         this.type = type;
     }
 
-    public JwtUserDto() {
+    public JwtUserPojo() {
 
     }
 }

common/src/main/java/com/koobietech/eas/common/pojo/StudentNumberInfo.java → common/src/main/java/com/koobietech/eas/common/pojo/StudentNumberInfoPojo.java

@@ -6,7 +6,7 @@ import lombok.Data;
  * @author lc
  */
 @Data
-public class StudentNumberInfo {
+public class StudentNumberInfoPojo {
     private String studentNum;
     private Long studentId;
     private int studentAge;

common/src/main/java/com/koobietech/eas/common/result/JsonPageResult.java

@@ -8,7 +8,7 @@ public class JsonPageResult<T> implements Serializable {
     private T data = null;
     private Long total = 0L;
 
-    public static JsonPageResult data(PageData data , String message  ){
+    public static JsonPageResult data(PageDataResult data , String message  ){
         JsonPageResult result = JsonPageResult.ok();
         result.setTotal(data.getTotal());
         result.setData(data.getData());
@@ -16,7 +16,7 @@ public class JsonPageResult<T> implements Serializable {
         return result;
     }
 
-    public static JsonPageResult data( PageData data  ){
+    public static JsonPageResult data( PageDataResult data  ){
         JsonPageResult result = JsonPageResult.ok();
         result.setData(data.getData());
         result.setTotal(data.getTotal());

common/src/main/java/com/koobietech/eas/common/result/JsonResult.java

@@ -2,6 +2,9 @@ package com.koobietech.eas.common.result;
 
 import java.io.Serializable;
 
+/**
+ * @author lc
+ */
 public class JsonResult implements Serializable {
     private boolean status = false;
     private String msg = "";

common/src/main/java/com/koobietech/eas/common/result/PageData.java → common/src/main/java/com/koobietech/eas/common/result/PageDataResult.java

@@ -2,12 +2,15 @@ package com.koobietech.eas.common.result;
 
 import lombok.Data;
 
+/**
+ * @author lc
+ */
 @Data
-public class PageData {
+public class PageDataResult {
     private long total = 0;
     private Object data = null;
-    public static PageData init(Object data, long total){
-        PageData ret = new PageData();
+    public static PageDataResult init(Object data, long total){
+        PageDataResult ret = new PageDataResult();
         ret.setData(data);
         ret.setTotal(total);
         return ret;

common/src/main/java/com/koobietech/eas/common/utils/StudentArchiveGenerator.java → common/src/main/java/com/koobietech/eas/common/utils/ArchiveManager.java

@@ -1,9 +1,9 @@
 package com.koobietech.eas.common.utils;
 
 import com.koobietech.eas.common.constant.FileType;
-import com.koobietech.eas.common.constant.UniversityCodeUtils;
-import com.koobietech.eas.common.pojo.ArchiveNumberInfo;
-import com.koobietech.eas.common.pojo.StudentNumberInfo;
+import com.koobietech.eas.common.constant.UniversityCode;
+import com.koobietech.eas.common.pojo.ArchiveNumberInfoPojo;
+import com.koobietech.eas.common.pojo.StudentNumberInfoPojo;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -15,7 +15,7 @@ import java.util.UUID;
 /**
  * @author lc
  */
-public class StudentArchiveGenerator {
+public class ArchiveManager {
 
     private static final String ARCHIVE_CODE_PREFIX = "SA";
     private static final int ARCHIVE_CODE_LENGTH = 25;
@@ -47,8 +47,8 @@ public class StudentArchiveGenerator {
      * @param archiveNumber
      * @return
      */
-    public static ArchiveNumberInfo parseArchiveNumber(String archiveNumber) {
-        ArchiveNumberInfo archiveInfo = new ArchiveNumberInfo();
+    public static ArchiveNumberInfoPojo parseArchiveNumber(String archiveNumber) {
+        ArchiveNumberInfoPojo archiveInfo = new ArchiveNumberInfoPojo();
         String studentCode = archiveNumber.substring(2, STUDENT_NUM_LENGTH + 3);
         String studentId = studentCode.split("X")[0];
         String createTime = archiveNumber.substring(STUDENT_NUM_LENGTH + 3, STUDENT_NUM_LENGTH + 15);
@@ -96,7 +96,7 @@ public class StudentArchiveGenerator {
      * @param studentNumber 学生档案编号
      * @return 学生档案编号信息
      */
-    public static StudentNumberInfo parseStudentNumber(String studentNumber) {
+    public static StudentNumberInfoPojo parseStudentNumber(String studentNumber) {
         if (studentNumber == null) {
             return null;
         }
@@ -106,13 +106,13 @@ public class StudentArchiveGenerator {
         String studentGender = studentNumber.substring(STUDENT_NUM_LENGTH + 5, STUDENT_NUM_LENGTH + 6);
         String graduationDate = studentNumber.substring(STUDENT_NUM_LENGTH + 6, STUDENT_NUM_LENGTH + 10);
         String schoolCode = studentNumber.substring(STUDENT_NUM_LENGTH + 10, STUDENT_NUM_LENGTH + 15);
-        StudentNumberInfo info = new StudentNumberInfo();
+        StudentNumberInfoPojo info = new StudentNumberInfoPojo();
         info.setStudentNum(studentNum);
         info.setStudentId(Long.valueOf(studentId));
         info.setStudentAge(Integer.parseInt(studentAge));
         info.setStudentGender(studentGender);
         info.setGraduationDate(graduationDate);
-        info.setSchoolName(UniversityCodeUtils.getName(Integer.parseInt(schoolCode)));
+        info.setSchoolName(UniversityCode.getName(Integer.parseInt(schoolCode)));
         info.setSchoolCode(Integer.parseInt(schoolCode));
         return info;
     }

common/src/main/java/com/koobietech/eas/common/utils/DateUtils.java → common/src/main/java/com/koobietech/eas/common/utils/DateManager.java

@@ -4,7 +4,10 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class DateUtils {
+/**
+ * @author lc
+ */
+public class DateManager {
     public static String convertToYearMonthDay(Date date) {
         SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd");
         return outputFormat.format(date);

common/src/main/java/com/koobietech/eas/common/utils/JwtManager.java

@@ -7,7 +7,7 @@ import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.JWTVerifier;
 import com.koobietech.eas.dao.constant.UserType;
 import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.pojo.JwtUserDto;
+import com.koobietech.eas.common.pojo.JwtUserPojo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -27,7 +27,7 @@ public class JwtManager {
      * @param userDto
      * @return
      */
-    public String createJwt(JwtUserDto userDto){
+    public String createJwt(JwtUserPojo userDto){
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.DATE, expires);
         String sign = JWT.create()
@@ -44,7 +44,7 @@ public class JwtManager {
      * @param userDto
      * @return
      */
-    public String createJwt(JwtUserDto userDto, Integer expires){
+    public String createJwt(JwtUserPojo userDto, Integer expires){
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.DATE, expires);
         String sign = JWT.create()
@@ -61,18 +61,18 @@ public class JwtManager {
      * @param token
      * @return
      */
-    public JwtUserDto decodeJwt(String token){
-        JwtUserDto jwtUserDto = new JwtUserDto();
+    public JwtUserPojo decodeJwt(String token){
+        JwtUserPojo jwtUserPojo = new JwtUserPojo();
         JWTVerifier build = JWT.require(Algorithm.HMAC256(SECRET)).build();
         try {
             DecodedJWT verify = build.verify(token);
-            jwtUserDto.setId(verify.getClaim("id").asLong());
-            jwtUserDto.setUsername(verify.getClaim("user").asString());
-            jwtUserDto.setType(UserType.valueOf(verify.getClaim("type").asString()));
+            jwtUserPojo.setId(verify.getClaim("id").asLong());
+            jwtUserPojo.setUsername(verify.getClaim("user").asString());
+            jwtUserPojo.setType(UserType.valueOf(verify.getClaim("type").asString()));
         } catch ( JWTVerificationException e){
             throw new EasException("token 不正确!");
         }
-        return jwtUserDto;
+        return jwtUserPojo;
     }
 
 }

common/src/main/java/com/koobietech/eas/common/utils/SecurityUtils.java → common/src/main/java/com/koobietech/eas/common/utils/SecurityManager.java

@@ -1,7 +1,7 @@
 package com.koobietech.eas.common.utils;
 
 import com.koobietech.eas.dao.constant.UserType;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.Objects;
@@ -9,14 +9,14 @@ import java.util.Objects;
 /**
  * @author lc
  */
-public class SecurityUtils {
+public class SecurityManager {
 
     /**
      * 取登录名
      * @return
      */
     public static String getLoginUserName() {
-        UserDetail principal = getPrincipal();
+        UserDetailPojo principal = getPrincipal();
         if (Objects.nonNull(principal)) {
             return principal.getUsername();
         }
@@ -28,7 +28,7 @@ public class SecurityUtils {
      * @return
      */
     public static Long getLoginUid() {
-        UserDetail principal = getPrincipal();
+        UserDetailPojo principal = getPrincipal();
         if (Objects.nonNull(principal)) {
             if ( !isStudentUser() ) {
                 return principal.getId();
@@ -43,7 +43,7 @@ public class SecurityUtils {
      */
     public static boolean isStudentUser() {
         boolean isStudent = false;
-        UserDetail principal = getPrincipal();
+        UserDetailPojo principal = getPrincipal();
         if (Objects.nonNull(principal)) {
             if ( principal.getUserType().equals(UserType.MEMBER) ) {
                 isStudent = true;
@@ -57,7 +57,7 @@ public class SecurityUtils {
      * @return
      */
     public static Long getLoginSid() {
-        UserDetail principal = getPrincipal();
+        UserDetailPojo principal = getPrincipal();
         if (Objects.nonNull(principal)) {
             if ( isStudentUser() ) {
                 return principal.getId();
@@ -71,15 +71,15 @@ public class SecurityUtils {
      * @return
      */
     public static boolean isLogged() {
-        UserDetail principal = getPrincipal();
+        UserDetailPojo principal = getPrincipal();
         return Objects.nonNull(principal);
     }
 
-    private static UserDetail getPrincipal() {
+    private static UserDetailPojo getPrincipal() {
         Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         if (Objects.nonNull(principal)) {
-            if (principal instanceof UserDetail) {
-                return (UserDetail) principal;
+            if (principal instanceof UserDetailPojo) {
+                return (UserDetailPojo) principal;
             } else {
                 return null;
             }

controller/src/main/java/com/koobietech/eas/config/CaptchaConfig.java → controller/src/main/java/com/koobietech/eas/config/CaptchaConfiguration.java

@@ -23,7 +23,7 @@ import java.util.Properties;
  * @author lc
  */
 @Configuration
-public class CaptchaConfig {
+public class CaptchaConfiguration {
 
     @Bean(name = "AjCaptchaCacheService")
     public CaptchaCacheService captchaCacheService() {

controller/src/main/java/com/koobietech/eas/config/ExceptionAdvice.java → controller/src/main/java/com/koobietech/eas/config/ExceptionAdviceConfiguration.java

@@ -10,10 +10,13 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+/**
+ * @author lc
+ */
 @RestControllerAdvice
-public class ExceptionAdvice {
+public class ExceptionAdviceConfiguration {
 
-    private static final Logger logger = LoggerFactory.getLogger(ExceptionAdvice.class);
+    private static final Logger logger = LoggerFactory.getLogger(ExceptionAdviceConfiguration.class);
 
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)

controller/src/main/java/com/koobietech/eas/config/SwaggerConfiguration.java

@@ -5,16 +5,19 @@ import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
-import io.swagger.v3.oas.models.security.*;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.springdoc.core.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
-import java.util.Arrays;
 import java.util.HashMap;
 
+/**
+ * @author lc
+ */
 @Configuration
 @Profile("dev")
 public class SwaggerConfiguration {

controller/src/main/java/com/koobietech/eas/controller/EasArcTlsAttendanceController.java

@@ -3,9 +3,8 @@ package com.koobietech.eas.controller;
 import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasArcTlsAttendance;
-import com.koobietech.eas.mbg.model.EasEduClassroom;
 import com.koobietech.eas.service.EasArcTlsAttendanceService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,7 +31,7 @@ public class EasArcTlsAttendanceController {
     public JsonPageResult query(@RequestBody EasArcTlsAttendance attendance,
                                 @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easArcTlsAttendanceService.query(attendance);
+        PageDataResult ret = easArcTlsAttendanceService.query(attendance);
         return JsonPageResult.data(ret);
     }
 

controller/src/main/java/com/koobietech/eas/controller/EasArchiveFileDownload.java → controller/src/main/java/com/koobietech/eas/controller/EasArcTlsFileDownloadController.java

@@ -11,9 +11,12 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+/**
+ * @author lc
+ */
 @Tag(name = "下载文件模块")
 @RestController
-public class EasArchiveFileDownload {
+public class EasArcTlsFileDownloadController {
 
     @Resource
     EasArchiveFileDownloadService easArchiveFileDownloadService;

controller/src/main/java/com/koobietech/eas/controller/EasArcTlsScoresController.java

@@ -1,13 +1,11 @@
 package com.koobietech.eas.controller;
 
-import cn.hutool.db.Page;
 import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasArcTlsScores;
 import com.koobietech.eas.service.EasArcTlsScoresService;
-import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -78,8 +76,8 @@ public class EasArcTlsScoresController {
     public JsonPageResult selectScoreByExample(@RequestBody EasArcTlsScores easArcTlsScores,
                                                @RequestParam Integer pageNum,@RequestParam Integer pageSize){
         PageHelper.startPage(pageNum,pageSize);
-        PageData pageData = easArcTlsScoresService.selectScoreByExample(easArcTlsScores);
-        return JsonPageResult.data(pageData);
+        PageDataResult pageDataResult = easArcTlsScoresService.selectScoreByExample(easArcTlsScores);
+        return JsonPageResult.data(pageDataResult);
     }
 
     @PostMapping(value = "/importExcelScores")

controller/src/main/java/com/koobietech/eas/controller/EasEduCategoryController.java

@@ -4,19 +4,14 @@ import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.constant.Disabled;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduCategory;
 import com.koobietech.eas.service.EasEduCategoryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -109,7 +104,7 @@ public class EasEduCategoryController {
     public JsonPageResult selectByCondition(@RequestBody EasEduCategory easEduCategory,
                                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData pageData = easEduCategoryService.selectByCondition(easEduCategory);
-        return JsonPageResult.data( pageData );
+        PageDataResult pageDataResult = easEduCategoryService.selectByCondition(easEduCategory);
+        return JsonPageResult.data(pageDataResult);
     }
 }

controller/src/main/java/com/koobietech/eas/controller/EasEduClassController.java

@@ -5,17 +5,14 @@ import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.constant.Disabled;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduClass;
-import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.service.EasEduClassService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.management.ValueExp;
 import java.util.List;
 
 @RestController
@@ -108,7 +105,7 @@ public class EasEduClassController {
     public JsonPageResult selectCondition(@RequestBody EasEduClass easEduClass,
                                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData data = easEduClassService.selectCondition(easEduClass);
+        PageDataResult data = easEduClassService.selectCondition(easEduClass);
         return JsonPageResult.data(data);
     }
 }

controller/src/main/java/com/koobietech/eas/controller/EasEduClassroomController.java

@@ -3,7 +3,7 @@ package com.koobietech.eas.controller;
 import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduClassroom;
 import com.koobietech.eas.service.EasEduClassroomService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,7 +25,7 @@ public class EasEduClassroomController {
     public JsonPageResult query(@RequestBody EasEduClassroom classroom,
                                 @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easEduClassroomService.query(classroom);
+        PageDataResult ret = easEduClassroomService.query(classroom);
         return JsonPageResult.data(ret);
     }
 

controller/src/main/java/com/koobietech/eas/controller/EasEduScheduleController.java

@@ -2,12 +2,10 @@ package com.koobietech.eas.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.mbg.model.EasEduSchedule;
-import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.service.EasEduScheduleService;
-import com.koobietech.eas.service.EasSysUserInfoService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -60,7 +58,7 @@ public class EasEduScheduleController {
 
 
         PageHelper.startPage(Math.toIntExact(pageNum), Math.toIntExact(pageSize));
-        PageData ret = easEduScheduleService.query(schedule);
+        PageDataResult ret = easEduScheduleService.query(schedule);
         System.out.println(ret.toString());
         return JsonResult.data(ret);
     }

controller/src/main/java/com/koobietech/eas/controller/EasEduSubjectsController.java

@@ -5,11 +5,9 @@ import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.constant.Disabled;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
-import com.koobietech.eas.mbg.model.EasEduCategory;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.service.EasEduSubjectsService;
-import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -108,7 +106,7 @@ public class EasEduSubjectsController {
     public JsonPageResult selectByCondition(@RequestBody EasEduSubjects easEduSubjects,
                                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData pageData = easEduSubjectsService.selectByCondition(easEduSubjects);
-        return JsonPageResult.data( pageData );
+        PageDataResult pageDataResult = easEduSubjectsService.selectByCondition(easEduSubjects);
+        return JsonPageResult.data(pageDataResult);
     }
 }

controller/src/main/java/com/koobietech/eas/controller/EasSysDepartmentController.java

@@ -3,7 +3,7 @@ package com.koobietech.eas.controller;
 import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.service.EasSysDepartmentService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +27,7 @@ public class EasSysDepartmentController {
     public JsonPageResult query(@RequestBody EasSysDepartment department,
                                 @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easSysDepartmentService.query(department);
+        PageDataResult ret = easSysDepartmentService.query(department);
         return JsonPageResult.data(ret);
     }
 

controller/src/main/java/com/koobietech/eas/controller/EasSysPermissionController.java

@@ -3,7 +3,7 @@ package com.koobietech.eas.controller;
 import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonPageResult;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.service.EasSysPermissionService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -26,7 +26,7 @@ public class EasSysPermissionController {
     public JsonPageResult query(@RequestBody(required = false) EasSysPermission permission,
                                 @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easSysPermissionService.query(permission);
+        PageDataResult ret = easSysPermissionService.query(permission);
         return JsonPageResult.data(ret);
     }
 

controller/src/main/java/com/koobietech/eas/controller/EasStuProfileController.java → controller/src/main/java/com/koobietech/eas/controller/EasSysStuProfileController.java

@@ -11,9 +11,12 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.io.FileNotFoundException;
 
+/**
+ * @author lc
+ */
 @Tag(name = "学生档案下载模块")
 @RestController
-public class EasStuProfileController {
+public class EasSysStuProfileController {
 
     @Resource
     private EasStuProfileService easStuProfileService;

controller/src/main/java/com/koobietech/eas/controller/EasSysUserInfoController.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.service.EasSysUserInfoService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -54,7 +54,7 @@ public class EasSysUserInfoController {
     public JsonResult query(@RequestBody(required = false) EasSysUserinfo userinfo,
                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easSysUserInfoService.query(userinfo);
+        PageDataResult ret = easSysUserInfoService.query(userinfo);
         return JsonResult.data(ret);
     }
 }

controller/src/main/java/com/koobietech/eas/controller/AdminLoginController.java → controller/src/main/java/com/koobietech/eas/controller/EasSysUsersLoginController.java

@@ -7,24 +7,45 @@ import com.anji.captcha.service.CaptchaService;
 import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.dao.pojo.AdminPojo;
-import com.koobietech.eas.dao.dto.LoginToken;
-import com.koobietech.eas.service.AdminLoginService;
+import com.koobietech.eas.dao.dto.LoginTokenDto;
+import com.koobietech.eas.service.EasSysAdminLoginService;
+import com.koobietech.eas.service.EasSysStudentLoginService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
+/**
+ * @author lc
+ */
 @Tag(name = "登陆模块")
 @RestController
-public class AdminLoginController {
+public class EasSysUsersLoginController {
     @Resource
-    private AdminLoginService adminLoginService;
+    private EasSysAdminLoginService adminLoginService;
 
     @Resource
     private CaptchaService captchaService;
 
+    @Resource
+    EasSysStudentLoginService studentLoginService;
+
+    @PostMapping("/studentLogin")
+    @Operation(summary = "学生登陆", description = "用户名和密码为请求载荷，若登录成功，返回两个token")
+    public JsonResult studentLogin(@RequestBody AdminPojo adminPojo) {
 
+        CaptchaVO captchaVO = new CaptchaVO();
+        captchaVO.setCaptchaVerification(adminPojo.getCaptchaVerification());
+
+        ResponseModel response = captchaService.verification(captchaVO);
+        if (!response.isSuccess()) {
+            throw new EasException(response.getRepMsg(), Integer.parseInt(response.getRepCode()));
+        }
+
+        LoginTokenDto ret = studentLoginService.studentLogin(adminPojo);
+        return JsonResult.data(ret);
+    }
 
     @PostMapping("/adminLogin")
     @Operation(summary = "管理员登录",  description = "用户名和密码为请求载荷，若登录成功，返回两token")
@@ -37,7 +58,7 @@ public class AdminLoginController {
             throw new EasException( response.getRepMsg() , Integer.parseInt(response.getRepCode()));
         }
 
-        LoginToken result = adminLoginService.adminLogin(adminPojo);
+        LoginTokenDto result = adminLoginService.adminLogin(adminPojo);
 
         return JsonResult.data(result);
     }

controller/src/main/java/com/koobietech/eas/controller/StudentLoginController.java

@@ -1,45 +0,0 @@
-package com.koobietech.eas.controller;
-
-import com.anji.captcha.model.common.ResponseModel;
-import com.anji.captcha.model.vo.CaptchaVO;
-import com.anji.captcha.service.CaptchaService;
-import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.dao.dto.LoginToken;
-import com.koobietech.eas.dao.pojo.AdminPojo;
-import com.koobietech.eas.service.StudentLoginService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * @author lc
- */
-@RestController
-@Tag(name = "学生登陆模块")
-public class StudentLoginController {
-
-    @Resource
-    CaptchaService captchaService;
-
-    @Resource
-    StudentLoginService studentLoginService;
-
-    @PostMapping("/studentLogin")
-    @Operation(summary = "学生登陆", description = "用户名和密码为请求载荷，若登录成功，返回两个token")
-    public JsonResult studentLogin(@RequestBody AdminPojo adminPojo) {
-
-        CaptchaVO captchaVO = new CaptchaVO();
-        captchaVO.setCaptchaVerification(adminPojo.getCaptchaVerification());
-
-        ResponseModel response = captchaService.verification(captchaVO);
-        if (!response.isSuccess()) {
-            throw new EasException(response.getRepMsg(), Integer.parseInt(response.getRepCode()));
-        }
-
-        LoginToken ret = studentLoginService.studentLogin(adminPojo);
-        return JsonResult.data(ret);
-    }
-}

controller/src/test/java/com/koobietech/eas/controller/ControllerApplicationTests.java

@@ -18,12 +18,12 @@ class ControllerApplicationTests {
                 archivesSavePath
         );
 
-//        System.out.println(StudentArchiveGenerator.generateStudentCode(
+//        System.out.println(ArchiveManager.generateStudentCode(
 //                "2211",
 //                "232126198703194770", "12016", "2020"
 //        ));
 //        System.out.println(
-//                StudentArchiveGenerator.generateArchiveCode(
+//                ArchiveManager.generateArchiveCode(
 //                        "ST2211XE6EE36M202412016",
 //                        "20"
 //                )

dao/src/main/java/com/koobietech/eas/dao/constant/UserType.java

@@ -1,5 +1,9 @@
 package com.koobietech.eas.dao.constant;
 
+/**
+ * @author lc
+ */
+
 public enum UserType {
     TEACHER, MEMBER, ADMIN
 }

dao/src/main/java/com/koobietech/eas/dao/dto/LoginToken.java → dao/src/main/java/com/koobietech/eas/dao/dto/LoginTokenDto.java

@@ -2,11 +2,14 @@ package com.koobietech.eas.dao.dto;
 
 import lombok.Data;
 
+/**
+ * @author lc
+ */
 @Data
-public class LoginToken {
+public class LoginTokenDto {
     String token;
     String refreshToken;
-    public LoginToken(String token, String refreshToken) {
+    public LoginTokenDto(String token, String refreshToken) {
         this.token = token;
         this.refreshToken = refreshToken;
     }

dao/src/main/java/com/koobietech/eas/dao/mapper/AdminLoginMapper.java

@@ -1,8 +1,8 @@
 package com.koobietech.eas.dao.mapper;
 
-import com.koobietech.eas.dao.login.pojo.Department;
-import com.koobietech.eas.dao.login.pojo.Permission;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
+import com.koobietech.eas.dao.pojo.DepartmentPojo;
+import com.koobietech.eas.dao.pojo.PermissionPojo;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
 
 import java.util.List;
 
@@ -10,16 +10,16 @@ import java.util.List;
  * @author lc
  */
 public interface AdminLoginMapper {
-    List<Permission> getUserPermissionsById(Long adminId);
+    List<PermissionPojo> getUserPermissionsById(Long adminId);
 
-    List<Department> getUserDepartmentsById(Long adminId);
+    List<DepartmentPojo> getUserDepartmentsById(Long adminId);
 
-    UserDetail getUserDetailById(Long adminId);
+    UserDetailPojo getUserDetailById(Long adminId);
 
-    List<Permission> getStudentPermissionsById(Long adminId);
+    List<PermissionPojo> getStudentPermissionsById(Long adminId);
 
-    List<Department> getStudentDepartmentsById(Long adminId);
+    List<DepartmentPojo> getStudentDepartmentsById(Long adminId);
 
-    UserDetail getStudentDetailById(Long adminId);
+    UserDetailPojo getStudentDetailById(Long adminId);
 
 }

dao/src/main/java/com/koobietech/eas/dao/login/pojo/Department.java → dao/src/main/java/com/koobietech/eas/dao/pojo/DepartmentPojo.java

@@ -1,10 +1,10 @@
-package com.koobietech.eas.dao.login.pojo;
+package com.koobietech.eas.dao.pojo;
 
 import lombok.Data;
 import java.util.Date;
 
 @Data
-public class Department {
+public class DepartmentPojo {
     private Long id;
     private String depname;
     private String address;

dao/src/main/java/com/koobietech/eas/dao/login/pojo/Permission.java → dao/src/main/java/com/koobietech/eas/dao/pojo/PermissionPojo.java

@@ -1,10 +1,10 @@
-package com.koobietech.eas.dao.login.pojo;
+package com.koobietech.eas.dao.pojo;
 
 import lombok.Data;
 import java.util.Date;
 
 @Data
-public class Permission {
+public class PermissionPojo {
     private Integer id;
     private String name;
     private Byte isActive;

dao/src/main/java/com/koobietech/eas/dao/login/pojo/UserDetail.java → dao/src/main/java/com/koobietech/eas/dao/pojo/UserDetailPojo.java

@@ -1,4 +1,4 @@
-package com.koobietech.eas.dao.login.pojo;
+package com.koobietech.eas.dao.pojo;
 
 import com.koobietech.eas.dao.constant.UserType;
 import lombok.Data;
@@ -8,13 +8,13 @@ import java.util.List;
  * @author lc
  */
 @Data
-public class UserDetail {
+public class UserDetailPojo {
     private Long id;
     private String username;
     private String phone;
     private String email;
     private UserType userType;
-    private List<Permission> permissions;
-    private List<Department> departments;
+    private List<PermissionPojo> permissionPojos;
+    private List<DepartmentPojo> departments;
 
 }

dao/src/main/resources/com/koobietech/eas/dao/mapper/AdminLoginMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.koobietech.eas.dao.mapper.AdminLoginMapper">
-    <resultMap id="permissionResultMap" type="com.koobietech.eas.dao.login.pojo.Permission">
+    <resultMap id="permissionResultMap" type="com.koobietech.eas.dao.pojo.PermissionPojo">
         <!-- 映射查询结果到实体类属性 -->
         <id column="id" property="id"/>
         <result column="name" property="name"/>
@@ -12,7 +12,7 @@
         <result column="description" property="description"/>
     </resultMap>
 
-    <resultMap id="departmentResultMap" type="com.koobietech.eas.dao.login.pojo.Department">
+    <resultMap id="departmentResultMap" type="com.koobietech.eas.dao.pojo.DepartmentPojo">
         <!-- 映射查询结果到实体类属性 -->
         <id column="id" property="id"/>
         <result column="depname" property="depname"/>
@@ -25,7 +25,7 @@
         <result column="create_uid" property="createUid"/>
     </resultMap>
 
-    <resultMap id="userDetailResultMap" type="com.koobietech.eas.dao.login.pojo.UserDetail">
+    <resultMap id="userDetailResultMap" type="com.koobietech.eas.dao.pojo.UserDetailPojo">
         <!-- 映射查询结果到实体类属性 -->
         <result column="id" property="id"/>
         <result column="username" property="username"/>
@@ -33,7 +33,7 @@
         <result column="email" property="email"/>
     </resultMap>
 
-    <resultMap id="permissionResult" type="com.koobietech.eas.dao.login.pojo.Permission">
+    <resultMap id="permissionResult" type="com.koobietech.eas.dao.pojo.PermissionPojo">
         <!-- 映射查询结果到实体类属性 -->
         <id column="id" property="id"/>
         <result column="name" property="name"/>
@@ -44,7 +44,7 @@
         <result column="description" property="description"/>
     </resultMap>
 
-    <resultMap id="departmentResult" type="com.koobietech.eas.dao.login.pojo.Department">
+    <resultMap id="departmentResult" type="com.koobietech.eas.dao.pojo.DepartmentPojo">
         <!-- 映射查询结果到实体类属性 -->
         <id column="id" property="id"/>
         <result column="depname" property="depname"/>
@@ -57,7 +57,7 @@
         <result column="create_uid" property="createUid"/>
     </resultMap>
 
-    <resultMap id="studentDetailResult" type="com.koobietech.eas.dao.login.pojo.UserDetail">
+    <resultMap id="studentDetailResult" type="com.koobietech.eas.dao.pojo.UserDetailPojo">
         <!-- 映射查询结果到实体类属性 -->
         <result column="id" property="id"/>
         <result column="student_name" property="username"/>

security/src/main/java/com/koobietech/eas/security/filter/EasSecurityFilter.java

@@ -1,11 +1,11 @@
 package com.koobietech.eas.security.filter;
 
 import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.pojo.JwtUserDto;
+import com.koobietech.eas.common.pojo.JwtUserPojo;
 import com.koobietech.eas.common.utils.JwtManager;
-import com.koobietech.eas.dao.login.pojo.Permission;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
-import com.koobietech.eas.service.LoginRedisService;
+import com.koobietech.eas.dao.pojo.PermissionPojo;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
+import com.koobietech.eas.service.EasSysUserLoginRedisService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -16,15 +16,15 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
 @Component
 public class EasSecurityFilter extends OncePerRequestFilter {
@@ -32,7 +32,7 @@ public class EasSecurityFilter extends OncePerRequestFilter {
     private static final Logger logger = LoggerFactory.getLogger(EasSecurityFilter.class);
 
     @Resource
-    private LoginRedisService loginRedisService;
+    private EasSysUserLoginRedisService loginRedisService;
 
     @Resource
     JwtManager jwtManager;
@@ -45,42 +45,42 @@ public class EasSecurityFilter extends OncePerRequestFilter {
         //判断token是否存在
         if (StringUtils.hasText(token)) {
             //解析token成JwtUserDto
-            JwtUserDto jwtUserDto = null;
+            JwtUserPojo jwtUserPojo = null;
             try {
                 //过滤器 允许 Token 不正确, 后面Security 会拦截处理
-                jwtUserDto = jwtManager.decodeJwt(token);
+                jwtUserPojo = jwtManager.decodeJwt(token);
             } catch ( EasException e) {
                 logger.debug(e.getMessage());
             }
-            if ( Objects.nonNull(jwtUserDto) ) {
+            if ( Objects.nonNull(jwtUserPojo) ) {
                 //判断token是否有效
-                UserDetail userDetail = null;
+                UserDetailPojo userDetailPojo = null;
                 try {
-                    userDetail = loginRedisService.checkToken(jwtUserDto);
+                    userDetailPojo = loginRedisService.checkToken(jwtUserPojo);
                 } catch ( EasException e) {
                     logger.debug(e.getMessage());
                 }
 
                 // 如果获取到了有效的用户对象
-                if (Objects.nonNull(userDetail)) {
+                if (Objects.nonNull(userDetailPojo)) {
                     // 获取当前的 SecurityContext 对象，用于保存当前用户的安全上下文信息
                     SecurityContext context = SecurityContextHolder.getContext();
 
                     // 获取用户的权限列表
-                    List<Permission> permission = userDetail.getPermissions();
+                    List<PermissionPojo> permissionPojo = userDetailPojo.getPermissionPojos();
 
                     // 创建一个 ArrayList 集合，用于存储用户权限对应的 SimpleGrantedAuthority 权限对象
                     ArrayList<SimpleGrantedAuthority> objects = new ArrayList<>();
 
                     // 遍历用户的权限列表
-                    for (Permission adminPermission : permission) {
+                    for (PermissionPojo adminPermissionPojo : permissionPojo) {
                         // 创建一个 SimpleGrantedAuthority 权限对象，并添加到集合中
-                        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(adminPermission.getDescription());
+                        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(adminPermissionPojo.getDescription());
                         objects.add(authority);
                     }
 
                     // 使用用户的用户名、空凭证参数和权限对象集合创建一个 UsernamePasswordAuthenticationToken 身份验证令牌
-                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userDetail, null, objects);
+                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userDetailPojo, null, objects);
 
                     // 将身份验证令牌设置到当前的 SecurityContext 中
                     context.setAuthentication(authenticationToken);

service/src/main/java/com/koobietech/eas/service/ArchiveRedisService.java → service/src/main/java/com/koobietech/eas/service/EasArcArchiveRedisService.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service;
 
-public interface ArchiveRedisService {
+public interface EasArcArchiveRedisService {
     void saveArchiveToken(String token, String filePath);
 
     String getFilePathByToken(String token);

service/src/main/java/com/koobietech/eas/service/EasArcTlsAttendanceService.java

@@ -1,12 +1,12 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasArcTlsAttendance;
 
 import java.util.List;
 
 public interface EasArcTlsAttendanceService {
-    PageData query(EasArcTlsAttendance attendance);
+    PageDataResult query(EasArcTlsAttendance attendance);
 
     Boolean add(EasArcTlsAttendance attendance);
 

service/src/main/java/com/koobietech/eas/service/EasArcTlsScoresService.java

@@ -1,8 +1,7 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasArcTlsScores;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
 import java.util.List;
@@ -34,7 +33,7 @@ public interface EasArcTlsScoresService {
      * @param easArcTlsScores
      * @return
      */
-    PageData selectScoreByExample(EasArcTlsScores easArcTlsScores);
+    PageDataResult selectScoreByExample(EasArcTlsScores easArcTlsScores);
 
     /**
      * 导入学员分数

service/src/main/java/com/koobietech/eas/service/EasEduCategoryService.java

@@ -1,8 +1,7 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduCategory;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -18,6 +17,6 @@ public interface EasEduCategoryService {
 
     List<EasEduCategory> selectAll();
 
-    PageData selectByCondition(EasEduCategory easEduCategory );
+    PageDataResult selectByCondition(EasEduCategory easEduCategory );
 
 }

service/src/main/java/com/koobietech/eas/service/EasEduClassService.java

@@ -1,7 +1,6 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
-import com.koobietech.eas.mbg.model.EasEduCategory;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduClass;
 
 import java.util.List;
@@ -18,6 +17,6 @@ public interface EasEduClassService {
 
     List<EasEduClass> selectTotal();
 
-    PageData selectCondition(EasEduClass easEduClass );
+    PageDataResult selectCondition(EasEduClass easEduClass );
 
 }

service/src/main/java/com/koobietech/eas/service/EasEduClassroomService.java

@@ -1,10 +1,10 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduClassroom;
 
 public interface EasEduClassroomService {
-    PageData query(EasEduClassroom classroom);
+    PageDataResult query(EasEduClassroom classroom);
 
     Boolean add(EasEduClassroom classroom);
 

service/src/main/java/com/koobietech/eas/service/EasEduScheduleService.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.mbg.model.EasEduSchedule;
 
@@ -11,7 +11,7 @@ public interface EasEduScheduleService {
 
     Boolean update(EasEduSchedule schedule);
 
-    PageData query(EasEduSchedule schedule);
+    PageDataResult query(EasEduSchedule schedule);
 
     Boolean queryConflict(ConflictDto conflictDto);
 }

service/src/main/java/com/koobietech/eas/service/EasEduSubjectsService.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasEduSubjects;
 
 import java.util.List;
@@ -17,5 +17,5 @@ public interface EasEduSubjectsService {
 
     List<EasEduSubjects> selectAll();
 
-    PageData selectByCondition(EasEduSubjects easEduSubjects);
+    PageDataResult selectByCondition(EasEduSubjects easEduSubjects);
 }

service/src/main/java/com/koobietech/eas/service/AdminLoginService.java → service/src/main/java/com/koobietech/eas/service/EasSysAdminLoginService.java

@@ -3,17 +3,17 @@ package com.koobietech.eas.service;
 import com.anji.captcha.model.common.ResponseModel;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.dao.pojo.AdminPojo;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
-import com.koobietech.eas.dao.dto.LoginToken;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
+import com.koobietech.eas.dao.dto.LoginTokenDto;
 
-public interface AdminLoginService {
-    LoginToken adminLogin(AdminPojo adminPojo);
+public interface EasSysAdminLoginService {
+    LoginTokenDto adminLogin(AdminPojo adminPojo);
 
-    LoginToken refreshToken(String refreshToken);
+    LoginTokenDto refreshToken(String refreshToken);
 
     //增加一个接口 把ResponseModel 里面的值赋值到JsonResult里面
     JsonResult verifyToJsonResult(ResponseModel responseModel);
 
 
-    UserDetail getUserInfo(String token);
+    UserDetailPojo getUserInfo(String token);
 }

service/src/main/java/com/koobietech/eas/service/EasSysDepartmentService.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 
 
@@ -12,5 +12,5 @@ public interface EasSysDepartmentService {
 
     Boolean delete(Long id);
 
-    PageData query(EasSysDepartment department);
+    PageDataResult query(EasSysDepartment department);
 }

service/src/main/java/com/koobietech/eas/service/EasSysPermissionService.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 
 public interface EasSysPermissionService {
@@ -11,5 +11,5 @@ public interface EasSysPermissionService {
 
     Boolean delete(Integer id);
 
-    PageData query(EasSysPermission permission);
+    PageDataResult query(EasSysPermission permission);
 }

service/src/main/java/com/koobietech/eas/service/StudentLoginService.java → service/src/main/java/com/koobietech/eas/service/EasSysStudentLoginService.java

@@ -1,17 +1,17 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.dao.dto.LoginToken;
+import com.koobietech.eas.dao.dto.LoginTokenDto;
 import com.koobietech.eas.dao.pojo.AdminPojo;
 
 
 /**
  * @author lc
  */
-public interface StudentLoginService {
+public interface EasSysStudentLoginService {
     /**
      * 学员登录
      * @param adminPojo
      * @return
      */
-    LoginToken studentLogin(AdminPojo adminPojo);
+    LoginTokenDto studentLogin(AdminPojo adminPojo);
 }

service/src/main/java/com/koobietech/eas/service/EasSysUserInfoService.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 
 public interface EasSysUserInfoService {
@@ -11,5 +11,5 @@ public interface EasSysUserInfoService {
 
     Boolean update(EasSysUserinfo userinfo);
 
-    PageData query(EasSysUserinfo userinfo);
+    PageDataResult query(EasSysUserinfo userinfo);
 }

service/src/main/java/com/koobietech/eas/service/EasSysUserLoginRedisService.java

@@ -0,0 +1,22 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.pojo.JwtUserPojo;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
+
+
+/**
+ * @author lc
+ */
+public interface EasSysUserLoginRedisService {
+    UserDetailPojo checkToken(JwtUserPojo jwtUserPojo);
+
+    void loginSaveCache(String redisTokenKey, UserDetailPojo userDetailPojoInRedis, Integer token_expires);
+
+    UserDetailPojo loginGetCache(String newRedisTokenKey);
+
+    String createJwtTokenKey(JwtUserPojo jwtUserPojo);
+
+    String createJwtRefreshTokenKey(JwtUserPojo jwtUserPojo);
+
+    Boolean loginDeleteCache(String newRedisRefreshTokenKey);
+}

service/src/main/java/com/koobietech/eas/service/LoginRedisService.java

@@ -1,19 +0,0 @@
-package com.koobietech.eas.service;
-
-import com.koobietech.eas.common.pojo.JwtUserDto;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
-
-
-public interface LoginRedisService {
-    UserDetail checkToken(JwtUserDto jwtUserDto);
-
-    void loginSaveCache(String redisTokenKey, UserDetail userDetailInRedis, Integer token_expires);
-
-    UserDetail loginGetCache(String newRedisTokenKey);
-
-    String createJwtTokenKey(JwtUserDto jwtUserDto);
-
-    String createJwtRefreshTokenKey(JwtUserDto jwtUserDto);
-
-    Boolean loginDeleteCache(String newRedisRefreshTokenKey);
-}

service/src/main/java/com/koobietech/eas/service/impl/ArchiveRedisServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasArcArchiveRedisServiceImpl.java

@@ -1,15 +1,17 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.service.RedisService;
-import com.koobietech.eas.service.ArchiveRedisService;
+import com.koobietech.eas.service.EasArcArchiveRedisService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 
+/**
+ * @author lc
+ */
 @Service
-public class ArchiveRedisServiceImpl implements ArchiveRedisService {
+public class EasArcArchiveRedisServiceImpl implements EasArcArchiveRedisService {
     @Resource
     private RedisService redisService;
 

service/src/main/java/com/koobietech/eas/service/impl/EasArcTlsAttendanceServiceImpl.java

@@ -5,8 +5,8 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
 import com.koobietech.eas.common.constant.FileType;
 import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.result.PageData;
-import com.koobietech.eas.common.utils.SecurityUtils;
+import com.koobietech.eas.common.result.PageDataResult;
+import com.koobietech.eas.common.utils.SecurityManager;
 import com.koobietech.eas.dao.pojo.EasArcTlsAttendancePojo;
 import com.koobietech.eas.dao.pojo.EasArcTlsScoresPojo;
 import com.koobietech.eas.dao.dto.ArchivesDto;
@@ -49,7 +49,7 @@ public class EasArcTlsAttendanceServiceImpl implements EasArcTlsAttendanceServic
     EasArcArchivesMapper arcArchivesMapper;
 
     @Override
-    public PageData query(EasArcTlsAttendance attendance) {
+    public PageDataResult query(EasArcTlsAttendance attendance) {
         EasArcTlsAttendanceExample easArcTlsAttendanceExample = new EasArcTlsAttendanceExample();
         EasArcTlsAttendanceExample.Criteria criteria = easArcTlsAttendanceExample.createCriteria();
         if (Objects.nonNull(attendance)) {
@@ -89,7 +89,7 @@ public class EasArcTlsAttendanceServiceImpl implements EasArcTlsAttendanceServic
         List<EasArcTlsAttendance> easArcTlsAttendances =
                 easArcTlsAttendanceMapper.selectByExample(easArcTlsAttendanceExample);
         long l = easArcTlsAttendanceMapper.countByExample(easArcTlsAttendanceExample);
-        PageData ret = new PageData();
+        PageDataResult ret = new PageDataResult();
         ret.setData(easArcTlsAttendances);
         ret.setTotal(l);
         return ret;
@@ -191,10 +191,10 @@ public class EasArcTlsAttendanceServiceImpl implements EasArcTlsAttendanceServic
         easArcArchives.setArchiveNumber(archivesDto.getArchiveCode());
         easArcArchives.setFilePath(archivesDto.getPath());
         easArcArchives.setCreateTime(new Date());
-        easArcArchives.setCreateUid( SecurityUtils.getLoginUid().intValue() );
+        easArcArchives.setCreateUid( SecurityManager.getLoginUid().intValue() );
         easArcArchives.setModifyTime(new Date());
         easArcArchives.setArctype(FileType.XLSX.name());
-        easArcArchives.setManagerId( SecurityUtils.getLoginUid().intValue() );
+        easArcArchives.setManagerId( SecurityManager.getLoginUid().intValue() );
         easArcArchives.setValidityTime( new Date(LocalDate.now().plusMonths(20)
                 .atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli()) );
         int insert = arcArchivesMapper.insert(easArcArchives);

service/src/main/java/com/koobietech/eas/service/impl/EasArcTlsScoresServiceImpl.java

@@ -7,8 +7,8 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.bean.BeanUtil;
 import com.koobietech.eas.common.constant.FileType;
 import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.result.PageData;
-import com.koobietech.eas.common.utils.SecurityUtils;
+import com.koobietech.eas.common.result.PageDataResult;
+import com.koobietech.eas.common.utils.SecurityManager;
 import com.koobietech.eas.dao.pojo.EasArcTlsScoresPojo;
 import com.koobietech.eas.dao.dto.ArchivesDto;
 import com.koobietech.eas.mbg.mapper.EasArcArchivesMapper;
@@ -64,10 +64,10 @@ public class EasArcTlsScoresServiceImpl implements EasArcTlsScoresService {
         easArcArchives.setArchiveNumber(archivesDto.getArchiveCode());
         easArcArchives.setFilePath(archivesDto.getPath());
         easArcArchives.setCreateTime(new Date());
-        easArcArchives.setCreateUid( SecurityUtils.getLoginUid().intValue() );
+        easArcArchives.setCreateUid( SecurityManager.getLoginUid().intValue() );
         easArcArchives.setModifyTime(new Date());
         easArcArchives.setArctype(FileType.XLSX.name());
-        easArcArchives.setManagerId( SecurityUtils.getLoginUid().intValue() );
+        easArcArchives.setManagerId( SecurityManager.getLoginUid().intValue() );
         easArcArchives.setValidityTime( new Date(LocalDate.now().plusMonths(20)
                 .atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli()) );
         int insert = arcArchivesMapper.insert(easArcArchives);
@@ -86,7 +86,7 @@ public class EasArcTlsScoresServiceImpl implements EasArcTlsScoresService {
     }
 
     @Override
-    public PageData selectScoreByExample(EasArcTlsScores easArcTlsScores) {
+    public PageDataResult selectScoreByExample(EasArcTlsScores easArcTlsScores) {
         EasArcTlsScoresExample easArcTlsScoresExample = new EasArcTlsScoresExample();
         EasArcTlsScoresExample.Criteria criteria = easArcTlsScoresExample.createCriteria();
         if (Objects.nonNull(easArcTlsScores)){
@@ -123,7 +123,7 @@ public class EasArcTlsScoresServiceImpl implements EasArcTlsScoresService {
         }
         List<EasArcTlsScores> easArcTlsScores1 = easArcTlsScoresMapper.selectByExample(easArcTlsScoresExample);
         long l = easArcTlsScoresMapper.countByExample(easArcTlsScoresExample);
-        return PageData.init(easArcTlsScores1,l);
+        return PageDataResult.init(easArcTlsScores1,l);
     }
 
     @Override

service/src/main/java/com/koobietech/eas/service/impl/EasArchiveFileDownloadServiceImpl.java

@@ -6,7 +6,7 @@ import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.utils.PasswordManager;
 import com.koobietech.eas.mbg.mapper.EasArcArchivesMapper;
 import com.koobietech.eas.mbg.model.EasArcArchives;
-import com.koobietech.eas.service.ArchiveRedisService;
+import com.koobietech.eas.service.EasArcArchiveRedisService;
 import com.koobietech.eas.service.EasArchiveFileDownloadService;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +24,7 @@ public class EasArchiveFileDownloadServiceImpl implements EasArchiveFileDownload
     private PasswordManager passwordManager;
 
     @Resource
-    private ArchiveRedisService archiveRedisService;
+    private EasArcArchiveRedisService archiveRedisService;
 
     @Resource
     private EasArcArchivesMapper archivesMapper;

service/src/main/java/com/koobietech/eas/service/impl/EasArchivesFilesServiceImpl.java

@@ -2,7 +2,7 @@ package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.common.constant.FileType;
 import com.koobietech.eas.common.utils.FileManager;
-import com.koobietech.eas.common.utils.StudentArchiveGenerator;
+import com.koobietech.eas.common.utils.ArchiveManager;
 import com.koobietech.eas.dao.dto.ArchivesDto;
 import com.koobietech.eas.mbg.mapper.EasArcTlsStudentsMapper;
 import com.koobietech.eas.mbg.model.EasArcTlsStudents;
@@ -115,21 +115,21 @@ public class EasArchivesFilesServiceImpl implements EasArchivesFilesService {
     }
 
     private ArchivesDto saveArchiveDocumentFile(String studentNumber, XWPFDocument document, String type) {
-        String archiveCode = StudentArchiveGenerator.generateArchiveCode(studentNumber, FileType.valueOf(type).getSuffix());
+        String archiveCode = ArchiveManager.generateArchiveCode(studentNumber, FileType.valueOf(type).getSuffix());
         String path = getArchivePath(studentNumber, archiveCode, FileType.valueOf(type).getSuffix());
         boolean status = fileManager.saveDocument(document, path);
         return new ArchivesDto(path, status, archiveCode, type);
     }
 
     private ArchivesDto saveArchiveWorkbookFile(String studentNumber, Workbook workbook, String type) {
-        String archiveCode = StudentArchiveGenerator.generateArchiveCode(studentNumber, FileType.valueOf(type).getSuffix());
+        String archiveCode = ArchiveManager.generateArchiveCode(studentNumber, FileType.valueOf(type).getSuffix());
         String path = getArchivePath(studentNumber, archiveCode, FileType.valueOf(type).getSuffix());
         boolean status = fileManager.saveWorkbook(workbook, path);
         return new ArchivesDto(path, status, archiveCode, type);
     }
 
     private String getArchiveCode(String studentNumber, String fileCode) {
-        return StudentArchiveGenerator.generateArchiveCode(studentNumber, fileCode);
+        return ArchiveManager.generateArchiveCode(studentNumber, fileCode);
     }
 
     private String getArchivePath(String studentNumber, String archiveCode, String suffix) {

service/src/main/java/com/koobietech/eas/service/impl/EasEduCategoryServiceImpl.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasEduCategoryMapper;
 import com.koobietech.eas.mbg.model.EasEduCategory;
 import com.koobietech.eas.mbg.model.EasEduCategoryExample;
@@ -8,10 +8,10 @@ import com.koobietech.eas.service.EasEduCategoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.util.Objects;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class EasEduCategoryServiceImpl implements EasEduCategoryService {
@@ -48,7 +48,7 @@ public class EasEduCategoryServiceImpl implements EasEduCategoryService {
     }
 
     @Override
-    public PageData selectByCondition(EasEduCategory easEduCategory) {
+    public PageDataResult selectByCondition(EasEduCategory easEduCategory) {
         EasEduCategoryExample easEduCategoryExample = new EasEduCategoryExample();
         EasEduCategoryExample.Criteria criteria = easEduCategoryExample.createCriteria();
         if ( Objects.nonNull(easEduCategory) ) {
@@ -76,6 +76,6 @@ public class EasEduCategoryServiceImpl implements EasEduCategoryService {
         }
         List<EasEduCategory> easEduCategories = easEduCategoryMapper.selectByExample(easEduCategoryExample);
         long l = easEduCategoryMapper.countByExample(easEduCategoryExample);
-        return PageData.init( easEduCategories, l );
+        return PageDataResult.init( easEduCategories, l );
     }
 }

service/src/main/java/com/koobietech/eas/service/impl/EasEduClassServiceImpl.java

@@ -1,9 +1,7 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasEduClassMapper;
-import com.koobietech.eas.mbg.model.EasEduCategory;
-import com.koobietech.eas.mbg.model.EasEduCategoryExample;
 import com.koobietech.eas.mbg.model.EasEduClass;
 import com.koobietech.eas.mbg.model.EasEduClassExample;
 import com.koobietech.eas.service.EasEduClassService;
@@ -11,7 +9,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import javax.imageio.metadata.IIOMetadataFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -50,7 +47,7 @@ public class EasEduClassServiceImpl implements EasEduClassService {
     }
 
     @Override
-    public PageData selectCondition(EasEduClass easEduClass) {
+    public PageDataResult selectCondition(EasEduClass easEduClass) {
         EasEduClassExample easEduClassExample = new EasEduClassExample();
         EasEduClassExample.Criteria criteria = easEduClassExample.createCriteria();
         if ( Objects.nonNull(easEduClass) ) {
@@ -81,11 +78,11 @@ public class EasEduClassServiceImpl implements EasEduClassService {
         }
         List<EasEduClass> easEduClasses = easEduClassMapper.selectByExample(easEduClassExample);
         long l = easEduClassMapper.countByExample(easEduClassExample);
-        return PageData.init(easEduClasses,l);
+        return PageDataResult.init(easEduClasses,l);
     }
 
 //    @Override
-//    public PageData selectCondition(EasEduClass easEduClass) {
+//    public PageDataResult selectCondition(EasEduClass easEduClass) {
 //        EasEduClassExample easEduClassExample = new EasEduClassExample();
 //        EasEduClassExample.Criteria criteria = easEduClassExample.createCriteria();
 //        if (Objects.nonNull(easEduClass)){
@@ -116,7 +113,7 @@ public class EasEduClassServiceImpl implements EasEduClassService {
 //        }
 //        List<EasEduClass> easEduClasses = easEduClassMapper.selectByExample(easEduClassExample);
 //        long l = easEduClassMapper.countByExample(easEduClassExample);
-//        PageData ret = new PageData();
+//        PageDataResult ret = new PageDataResult();
 //        ret.setData(easEduClasses);
 //        ret.setTotal(l);
 //        return ret;

service/src/main/java/com/koobietech/eas/service/impl/EasEduClassroomServiceImpl.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasEduClassroomMapper;
 import com.koobietech.eas.mbg.model.EasEduClassroom;
 import com.koobietech.eas.mbg.model.EasEduClassroomExample;
@@ -37,7 +37,7 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
     }
 
     @Override
-    public PageData query(EasEduClassroom classroom) {
+    public PageDataResult query(EasEduClassroom classroom) {
 
         EasEduClassroomExample easEduClassroomExample = new EasEduClassroomExample();
         EasEduClassroomExample.Criteria criteria = easEduClassroomExample.createCriteria();
@@ -95,7 +95,7 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
         List<EasEduClassroom> classrooms =
                 easEduClassroomMapper.selectByExample(easEduClassroomExample);
         long l = easEduClassroomMapper.countByExample(easEduClassroomExample);
-        PageData ret = new PageData();
+        PageDataResult ret = new PageDataResult();
         ret.setData(classrooms);
         ret.setTotal(l);
         return ret;

service/src/main/java/com/koobietech/eas/service/impl/EasEduScheduleServiceImpl.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.dao.dto.ConflictDto;
 import com.koobietech.eas.mbg.mapper.EasEduClassroomMapper;
 import com.koobietech.eas.mbg.mapper.EasEduScheduleMapper;
@@ -68,7 +68,7 @@ public class EasEduScheduleServiceImpl implements EasEduScheduleService {
     }
 
     @Override
-    public PageData query(EasEduSchedule schedule) {
+    public PageDataResult query(EasEduSchedule schedule) {
 
         EasEduScheduleExample easEduScheduleExample = new EasEduScheduleExample();
         EasEduScheduleExample.Criteria criteria = easEduScheduleExample.createCriteria();
@@ -134,7 +134,7 @@ public class EasEduScheduleServiceImpl implements EasEduScheduleService {
         List<EasEduSchedule> schedules =
                 easEduScheduleMapper.selectByExample(easEduScheduleExample);
         long l = easEduScheduleMapper.countByExample(easEduScheduleExample);
-        PageData ret = new PageData();
+        PageDataResult ret = new PageDataResult();
         ret.setData(schedules);
         ret.setTotal(l);
         return ret;

service/src/main/java/com/koobietech/eas/service/impl/EasEduSubjectsServiceImpl.java

@@ -1,7 +1,6 @@
 package com.koobietech.eas.service.impl;
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasEduSubjectsMapper;
-import com.koobietech.eas.mbg.model.EasEduCategoryExample;
 import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.mbg.model.EasEduSubjectsExample;
 import com.koobietech.eas.service.EasEduSubjectsService;
@@ -9,7 +8,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import javax.xml.crypto.Data;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -50,7 +48,7 @@ public class EasEduSubjectsServiceImpl implements EasEduSubjectsService {
     }
 
     @Override
-    public PageData selectByCondition(EasEduSubjects easEduSubjects) {
+    public PageDataResult selectByCondition(EasEduSubjects easEduSubjects) {
         EasEduSubjectsExample easEduSubjectsExample = new EasEduSubjectsExample();
         EasEduSubjectsExample.Criteria criteria = easEduSubjectsExample.createCriteria();
         if ( Objects.nonNull(easEduSubjects) ) {
@@ -81,6 +79,6 @@ public class EasEduSubjectsServiceImpl implements EasEduSubjectsService {
         }
         List<EasEduSubjects> easEduSubjects1 = easEduSubjectsMapper.selectByExample(easEduSubjectsExample);
         long l = easEduSubjectsMapper.countByExample(easEduSubjectsExample);
-        return PageData.init(easEduSubjects1,l);
+        return PageDataResult.init(easEduSubjects1,l);
     }
 }

service/src/main/java/com/koobietech/eas/service/impl/EasStuProfileServiceImpl.java

@@ -3,8 +3,8 @@ package com.koobietech.eas.service.impl;
 import com.koobietech.eas.common.constant.FileType;
 import com.koobietech.eas.common.constant.Gender;
 import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.utils.DateUtils;
-import com.koobietech.eas.common.utils.StudentArchiveGenerator;
+import com.koobietech.eas.common.utils.ArchiveManager;
+import com.koobietech.eas.common.utils.DateManager;
 import com.koobietech.eas.dao.dto.ArchivesDto;
 import com.koobietech.eas.mbg.mapper.EasArcArchivesMapper;
 import com.koobietech.eas.mbg.mapper.EasArcTlsStudentsMapper;
@@ -84,7 +84,7 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
         map.put("gender", convertToGender(easArcTlsStudents.getGender()));
         map.put("major", easArcTlsStudents.getMajor());
         map.put("grade", easArcTlsStudents.getGrade());
-        map.put("enrollment_date", DateUtils.convertToYearMonthDay(easArcTlsStudents.getEnrollmentDate()));
+        map.put("enrollment_date", DateManager.convertToYearMonthDay(easArcTlsStudents.getEnrollmentDate()));
         map.put("phone", easArcTlsStudents.getPhone());
         map.put("university", easArcTlsStudents.getUniversity());
         map.put("student_idnumber", easArcTlsStudents.getStudentIdnumber());
@@ -95,7 +95,7 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
 
     public boolean insertEasArcArchives(EasArcTlsStudents easArcTlsStudents, String studentNumber, Integer managerId, XWPFDocument doc) {
         // 生成档案号
-        String archiveCode = StudentArchiveGenerator.generateArchiveCode(studentNumber, String.valueOf(FileType.DOCX));
+        String archiveCode = ArchiveManager.generateArchiveCode(studentNumber, String.valueOf(FileType.DOCX));
 
         // 保存学员档案文件
         ArchivesDto archivesDto = easArchivesFilesService.saveArchiveStudentsFile(easArcTlsStudents.getStudentIdnumber(), doc);
@@ -103,7 +103,7 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
         String arcType = archivesDto.getFileType();
 
         // 设置时间和有效期
-        Date createTime = DateUtils.convertToYearMonthDayToDate(new Date());
+        Date createTime = DateManager.convertToYearMonthDayToDate(new Date());
         Date modifyTime = new Date();
         Calendar calendar = Calendar.getInstance();
         assert createTime != null;
@@ -152,7 +152,7 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
         calendar.setTime(easArcTlsStudents.getEnrollmentDate());
         String year = String.valueOf(calendar.get(Calendar.YEAR));
 
-        return StudentArchiveGenerator.generateStudentCode("",
+        return ArchiveManager.generateStudentCode("",
                 easArcTlsStudents.getStudentIdnumber(), easArcTlsStudents.getUniversity(), year);
     }
 

service/src/main/java/com/koobietech/eas/service/impl/AdminLoginServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasSysAdminLoginServiceImpl.java

@@ -3,18 +3,18 @@ package com.koobietech.eas.service.impl;
 import com.anji.captcha.model.common.ResponseModel;
 import com.koobietech.eas.dao.constant.UserType;
 import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.pojo.JwtUserDto;
+import com.koobietech.eas.common.pojo.JwtUserPojo;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.utils.JwtManager;
 import com.koobietech.eas.common.utils.PasswordManager;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
-import com.koobietech.eas.dao.dto.LoginToken;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
+import com.koobietech.eas.dao.dto.LoginTokenDto;
 import com.koobietech.eas.dao.mapper.AdminLoginMapper;
 import com.koobietech.eas.mbg.mapper.EasSysUserinfoMapper;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.mbg.model.EasSysUserinfoExample;
-import com.koobietech.eas.service.AdminLoginService;
-import com.koobietech.eas.service.LoginRedisService;
+import com.koobietech.eas.service.EasSysAdminLoginService;
+import com.koobietech.eas.service.EasSysUserLoginRedisService;
 import com.koobietech.eas.dao.pojo.AdminPojo;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Optional;
 
 @Service
-public class AdminLoginServiceImpl implements AdminLoginService {
+public class EasSysAdminLoginServiceImpl implements EasSysAdminLoginService {
 
     @Resource
     private PasswordEncoder passwordEncoder;
@@ -35,7 +35,7 @@ public class AdminLoginServiceImpl implements AdminLoginService {
     @Resource
     private EasSysUserinfoMapper easSysUserinfoMapper;
     @Resource
-    private LoginRedisService loginRedisService;
+    private EasSysUserLoginRedisService loginRedisService;
     @Resource
     private JwtManager jwtManager;
 
@@ -44,7 +44,7 @@ public class AdminLoginServiceImpl implements AdminLoginService {
     private final Integer refreshToken_expires = 48 * 60 * 60;
 
     @Override
-    public LoginToken adminLogin(AdminPojo adminPojo) {
+    public LoginTokenDto adminLogin(AdminPojo adminPojo) {
         if (adminPojo.getUsername() == null || adminPojo.getPasswd() == null || adminPojo.getUsername().isEmpty() || adminPojo.getPasswd().isEmpty()) {
             throw new EasException("用户不存在", 412);
         }
@@ -56,61 +56,61 @@ public class AdminLoginServiceImpl implements AdminLoginService {
         //先获取id，进行枚举判断
         Long id = easSysUserinfo.getId();
         //先调用自定义sql查询detail类中的数据 最后把这个类封装到redis里面
-        UserDetail userDetailInRedis = adminLoginMapper.getUserDetailById(id);
-        System.out.println("接收前" + userDetailInRedis);
-        userDetailInRedis.setDepartments(adminLoginMapper.getUserDepartmentsById(id));
-        userDetailInRedis.setPermissions(adminLoginMapper.getUserPermissionsById(id));
-        System.out.println("接收后" + userDetailInRedis);
+        UserDetailPojo userDetailPojoInRedis = adminLoginMapper.getUserDetailById(id);
+        System.out.println("接收前" + userDetailPojoInRedis);
+        userDetailPojoInRedis.setDepartments(adminLoginMapper.getUserDepartmentsById(id));
+        userDetailPojoInRedis.setPermissionPojos(adminLoginMapper.getUserPermissionsById(id));
+        System.out.println("接收后" + userDetailPojoInRedis);
 
         // 先调用自定义sql查询用户详细信息、部门信息 和 权限信息
         UserType userType = UserType.TEACHER;
-        if (userDetailInRedis.getUsername().equals("admin")) {
+        if (userDetailPojoInRedis.getUsername().equals("admin")) {
             userType = UserType.ADMIN;
         }
-        userDetailInRedis.setUserType(userType);
+        userDetailPojoInRedis.setUserType(userType);
         // 生成token
-        JwtUserDto jwtUserDto = new JwtUserDto(userDetailInRedis.getUsername(), userDetailInRedis.getId(), userType);
-        String token = jwtManager.createJwt(jwtUserDto, token_expires);
-        String refreshToken = jwtManager.createJwt(jwtUserDto, refreshToken_expires);
+        JwtUserPojo jwtUserPojo = new JwtUserPojo(userDetailPojoInRedis.getUsername(), userDetailPojoInRedis.getId(), userType);
+        String token = jwtManager.createJwt(jwtUserPojo, token_expires);
+        String refreshToken = jwtManager.createJwt(jwtUserPojo, refreshToken_expires);
         System.out.println("token:" + token);
         System.out.println("refreshToken:" + refreshToken);
 
         // 生成redis key
-        String redisTokenKey = loginRedisService.createJwtTokenKey(jwtUserDto);
-        String redisRefreshTokenKey = loginRedisService.createJwtRefreshTokenKey(jwtUserDto);
+        String redisTokenKey = loginRedisService.createJwtTokenKey(jwtUserPojo);
+        String redisRefreshTokenKey = loginRedisService.createJwtRefreshTokenKey(jwtUserPojo);
 
         // 将token存入redis
-        loginRedisService.loginSaveCache(redisTokenKey, userDetailInRedis, token_expires);
-        loginRedisService.loginSaveCache(redisRefreshTokenKey, userDetailInRedis, refreshToken_expires);
+        loginRedisService.loginSaveCache(redisTokenKey, userDetailPojoInRedis, token_expires);
+        loginRedisService.loginSaveCache(redisRefreshTokenKey, userDetailPojoInRedis, refreshToken_expires);
 
         // 登录成功
-        return new LoginToken(token, refreshToken);
+        return new LoginTokenDto(token, refreshToken);
     }
 
     @Override
-    public LoginToken refreshToken(String refreshToken) {
+    public LoginTokenDto refreshToken(String refreshToken) {
         // 解析refresh token
-        JwtUserDto jwtUserDto = jwtManager.decodeJwt(refreshToken);
+        JwtUserPojo jwtUserPojo = jwtManager.decodeJwt(refreshToken);
 
         //生成新的 刷新k值 （refresh_token）
-        String newRedisRefreshTokenKey = loginRedisService.createJwtRefreshTokenKey(jwtUserDto);
+        String newRedisRefreshTokenKey = loginRedisService.createJwtRefreshTokenKey(jwtUserPojo);
 
         //查询redis里面有没有这个k值
-        UserDetail userDetailInRedis = loginRedisService.loginGetCache(newRedisRefreshTokenKey);
-        if (userDetailInRedis == null) {
+        UserDetailPojo userDetailPojoInRedis = loginRedisService.loginGetCache(newRedisRefreshTokenKey);
+        if (userDetailPojoInRedis == null) {
             throw new EasException("refresh token已过期", 412);
         }
         //如果不为空 那UserDetail里面就封装了用户的信息 生成新的token和refresh token
-        String newToken = jwtManager.createJwt(jwtUserDto, token_expires);
-        String newRefreshToken = jwtManager.createJwt(jwtUserDto, refreshToken_expires);
+        String newToken = jwtManager.createJwt(jwtUserPojo, token_expires);
+        String newRefreshToken = jwtManager.createJwt(jwtUserPojo, refreshToken_expires);
 
         //生成新的k值 （token）
-        String newRedisTokenKey = loginRedisService.createJwtTokenKey(jwtUserDto);
+        String newRedisTokenKey = loginRedisService.createJwtTokenKey(jwtUserPojo);
 
         // 更新Redis中的token和refresh token
-        loginRedisService.loginSaveCache(newRedisTokenKey, userDetailInRedis, token_expires);
-        loginRedisService.loginSaveCache(newRedisRefreshTokenKey, userDetailInRedis, refreshToken_expires);
-        return new LoginToken(newToken, newRefreshToken);
+        loginRedisService.loginSaveCache(newRedisTokenKey, userDetailPojoInRedis, token_expires);
+        loginRedisService.loginSaveCache(newRedisRefreshTokenKey, userDetailPojoInRedis, refreshToken_expires);
+        return new LoginTokenDto(newToken, newRefreshToken);
     }
 
 
@@ -132,13 +132,13 @@ public class AdminLoginServiceImpl implements AdminLoginService {
     }
 
     @Override
-    public UserDetail getUserInfo(String token) {
+    public UserDetailPojo getUserInfo(String token) {
 
         try {
             // 解析token
-            JwtUserDto jwtUserDto = jwtManager.decodeJwt(token);
+            JwtUserPojo jwtUserPojo = jwtManager.decodeJwt(token);
             // 封装成字符以便在redis中查找
-            String tokenToRedisKey = loginRedisService.createJwtTokenKey(jwtUserDto);
+            String tokenToRedisKey = loginRedisService.createJwtTokenKey(jwtUserPojo);
             return loginRedisService.loginGetCache(tokenToRedisKey);
         } catch (Exception e) {
             // 处理异常情况

service/src/main/java/com/koobietech/eas/service/impl/EasSysDepartmentServiceImpl.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasSysDepartmentMapper;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.mbg.model.EasSysDepartmentExample;
@@ -39,7 +39,7 @@ public class EasSysDepartmentServiceImpl implements EasSysDepartmentService {
     }
 
     @Override
-    public PageData query(EasSysDepartment department) {
+    public PageDataResult query(EasSysDepartment department) {
 
         EasSysDepartmentExample departmentExample = new EasSysDepartmentExample();
         EasSysDepartmentExample.Criteria criteria = departmentExample.createCriteria();
@@ -88,7 +88,7 @@ public class EasSysDepartmentServiceImpl implements EasSysDepartmentService {
         List<EasSysDepartment> departments =
                 easSysDepartmentMapper.selectByExample(departmentExample);
         long l = easSysDepartmentMapper.countByExample(departmentExample);
-        PageData ret = new PageData();
+        PageDataResult ret = new PageDataResult();
         ret.setData(departments);
         ret.setTotal(l);
         return ret;

service/src/main/java/com/koobietech/eas/service/impl/EasSysPermissionServiceImpl.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasSysPermissionMapper;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.mbg.model.EasSysPermissionExample;
@@ -38,7 +38,7 @@ public class EasSysPermissionServiceImpl implements EasSysPermissionService {
     }
 
     @Override
-    public PageData query(EasSysPermission permission) {
+    public PageDataResult query(EasSysPermission permission) {
         EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
         EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
         if (Objects.nonNull(permission)) {
@@ -73,7 +73,7 @@ public class EasSysPermissionServiceImpl implements EasSysPermissionService {
         }
         List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
         long l = easSysPermissionMapper.countByExample(easSysPermissionExample);
-        PageData ret = new PageData();
+        PageDataResult ret = new PageDataResult();
         ret.setData(easSysPermissions);
         ret.setTotal(l);
         return ret;

service/src/main/java/com/koobietech/eas/service/impl/StudentLoginServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasSysStudentLoginServiceImpl.java

@@ -1,19 +1,19 @@
 package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.pojo.JwtUserDto;
+import com.koobietech.eas.common.pojo.JwtUserPojo;
 import com.koobietech.eas.common.utils.JwtManager;
 import com.koobietech.eas.common.utils.PasswordManager;
 import com.koobietech.eas.dao.constant.UserType;
-import com.koobietech.eas.dao.dto.LoginToken;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
+import com.koobietech.eas.dao.dto.LoginTokenDto;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
 import com.koobietech.eas.dao.mapper.AdminLoginMapper;
 import com.koobietech.eas.dao.pojo.AdminPojo;
 import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
 import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.mbg.model.EasSysStudentExample;
-import com.koobietech.eas.service.LoginRedisService;
-import com.koobietech.eas.service.StudentLoginService;
+import com.koobietech.eas.service.EasSysUserLoginRedisService;
+import com.koobietech.eas.service.EasSysStudentLoginService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -21,8 +21,11 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * @author lc
+ */
 @Service
-public class StudentLoginServiceImpl implements StudentLoginService {
+public class EasSysStudentLoginServiceImpl implements EasSysStudentLoginService {
 
 
     @Resource
@@ -38,7 +41,7 @@ public class StudentLoginServiceImpl implements StudentLoginService {
     AdminLoginMapper adminLoginMapper;
 
     @Resource
-    LoginRedisService studentLoginRedisService;
+    EasSysUserLoginRedisService studentLoginRedisService;
 
     @Resource
     JwtManager jwtManager;
@@ -49,7 +52,7 @@ public class StudentLoginServiceImpl implements StudentLoginService {
     private final Integer refreshToken_expires = 48 * 60 * 60;
 
     @Override
-    public LoginToken studentLogin(AdminPojo adminPojo) {
+    public LoginTokenDto studentLogin(AdminPojo adminPojo) {
         if (adminPojo.getUsername() == null || adminPojo.getPasswd() == null
                 || adminPojo.getUsername().equals("") || adminPojo.getPasswd().equals("")) {
             throw new EasException("用户不存在", 412);
@@ -59,30 +62,30 @@ public class StudentLoginServiceImpl implements StudentLoginService {
         Long adminId = easSysStudent.getId();
 
         //先调用自定义sql查询detail类中的数据 最后把这个类封装到redis里面
-        UserDetail userDetail = adminLoginMapper.getStudentDetailById(adminId);
-        userDetail.setDepartments(adminLoginMapper.getStudentDepartmentsById(adminId));
-        userDetail.setPermissions(adminLoginMapper.getStudentPermissionsById(adminId));
+        UserDetailPojo userDetailPojo = adminLoginMapper.getStudentDetailById(adminId);
+        userDetailPojo.setDepartments(adminLoginMapper.getStudentDepartmentsById(adminId));
+        userDetailPojo.setPermissionPojos(adminLoginMapper.getStudentPermissionsById(adminId));
 
-        userDetail.setUserType(UserType.MEMBER);
+        userDetailPojo.setUserType(UserType.MEMBER);
         // 生成token
-        JwtUserDto jwtUserDto = new JwtUserDto(userDetail.getUsername(), userDetail.getId(), UserType.MEMBER);
+        JwtUserPojo jwtUserPojo = new JwtUserPojo(userDetailPojo.getUsername(), userDetailPojo.getId(), UserType.MEMBER);
 
-        String token = jwtManager.createJwt(jwtUserDto, token_expires);
+        String token = jwtManager.createJwt(jwtUserPojo, token_expires);
 
-        String refreshToken = jwtManager.createJwt(jwtUserDto, refreshToken_expires);
+        String refreshToken = jwtManager.createJwt(jwtUserPojo, refreshToken_expires);
 
         // 生成redis key
-        String jwtTokenKey = studentLoginRedisService.createJwtTokenKey(jwtUserDto);
+        String jwtTokenKey = studentLoginRedisService.createJwtTokenKey(jwtUserPojo);
 
-        String jwtRefreshTokenKey = studentLoginRedisService.createJwtRefreshTokenKey(jwtUserDto);
+        String jwtRefreshTokenKey = studentLoginRedisService.createJwtRefreshTokenKey(jwtUserPojo);
 
         // 将token存入redis
-        studentLoginRedisService.loginSaveCache(jwtTokenKey, userDetail, token_expires);
+        studentLoginRedisService.loginSaveCache(jwtTokenKey, userDetailPojo, token_expires);
 
-        studentLoginRedisService.loginSaveCache(jwtRefreshTokenKey, userDetail, refreshToken_expires);
+        studentLoginRedisService.loginSaveCache(jwtRefreshTokenKey, userDetailPojo, refreshToken_expires);
 
         // 登录成功
-        return new LoginToken(token, refreshToken);
+        return new LoginTokenDto(token, refreshToken);
     }
 
     private EasSysStudent findStudentByUsername(String username, String password) {

service/src/main/java/com/koobietech/eas/service/impl/EasSysUserInfoServiceImpl.java

@@ -1,6 +1,6 @@
 package com.koobietech.eas.service.impl;
 
-import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.common.result.PageDataResult;
 import com.koobietech.eas.mbg.mapper.EasSysUserinfoMapper;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.mbg.model.EasSysUserinfoExample;
@@ -56,7 +56,7 @@ public class EasSysUserInfoServiceImpl implements EasSysUserInfoService {
     }
 
     @Override
-    public PageData query(EasSysUserinfo userinfo) {
+    public PageDataResult query(EasSysUserinfo userinfo) {
 
         EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
         EasSysUserinfoExample.Criteria criteria = easSysUserinfoExample.createCriteria();
@@ -109,7 +109,7 @@ public class EasSysUserInfoServiceImpl implements EasSysUserInfoService {
         }
         List<EasSysUserinfo> easSysUserinfos = easSysUserinfoMapper.selectByExample(easSysUserinfoExample);
         long l = easSysUserinfoMapper.countByExample(easSysUserinfoExample);
-        PageData ret = new PageData();
+        PageDataResult ret = new PageDataResult();
         ret.setData(easSysUserinfos);
         ret.setTotal(l);
         return ret;

service/src/main/java/com/koobietech/eas/service/impl/EasSysUserLoginRedisServiceImpl.java

@@ -0,0 +1,64 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.exception.EasException;
+import com.koobietech.eas.common.pojo.JwtUserPojo;
+import com.koobietech.eas.common.service.RedisService;
+import com.koobietech.eas.dao.pojo.UserDetailPojo;
+import com.koobietech.eas.service.EasSysUserLoginRedisService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author lc
+ */
+@Service
+public class EasSysUserLoginRedisServiceImpl implements EasSysUserLoginRedisService {
+
+    @Resource
+    private RedisService redisService;
+
+
+    @Override
+    public UserDetailPojo checkToken(JwtUserPojo jwtUserPojo) {
+        String jwtKey = createJwtTokenKey(jwtUserPojo);
+        //判断redis里面是否有这个key
+        if (!redisService.hasKey(jwtKey)) {
+            throw new EasException("token已过期");
+        }
+        return (UserDetailPojo) redisService.get(jwtKey);
+    }
+
+    @Override
+    public void loginSaveCache(String redisTokenKey, UserDetailPojo userDetailPojoInRedis, Integer token_expires) {
+        redisService.set(redisTokenKey, userDetailPojoInRedis, token_expires);
+    }
+
+
+    @Override
+    public UserDetailPojo loginGetCache(String newRedisTokenKey) {
+        //看看redis里面有没有这个key
+        if (redisService.hasKey(newRedisTokenKey)) {
+            //有的话，就从redis里面取出来
+            return (UserDetailPojo) redisService.get(newRedisTokenKey);
+        }
+        return null;
+    }
+
+    @Override
+    public String createJwtTokenKey(JwtUserPojo jwtUserPojo) {
+        //根据jwtUserDto 生成jwtKey，格式为：eas_token_{id}_{username}_{type}
+        return "eas_token_" + jwtUserPojo.getId() + "_" + jwtUserPojo.getUsername() + "_" + jwtUserPojo.getType();
+    }
+
+    @Override
+    public String createJwtRefreshTokenKey(JwtUserPojo jwtUserPojo) {
+        //根据jwtUserDto 生成jwtKey，格式为：eas_refresh_{id}_{username}_{type}
+        return "eas_refresh_" + jwtUserPojo.getId() + "_" + jwtUserPojo.getUsername() + "_" + jwtUserPojo.getType();
+    }
+
+    @Override
+    public Boolean loginDeleteCache(String newRedisRefreshTokenKey) {
+        return redisService.del(newRedisRefreshTokenKey);
+    }
+}

service/src/main/java/com/koobietech/eas/service/impl/LoginRedisServiceImpl.java

@@ -1,64 +0,0 @@
-package com.koobietech.eas.service.impl;
-
-import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.pojo.JwtUserDto;
-import com.koobietech.eas.common.service.RedisService;
-import com.koobietech.eas.dao.login.pojo.UserDetail;
-import com.koobietech.eas.service.LoginRedisService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * @author lc
- */
-@Service
-public class LoginRedisServiceImpl implements LoginRedisService {
-
-    @Resource
-    private RedisService redisService;
-
-
-    @Override
-    public UserDetail checkToken(JwtUserDto jwtUserDto) {
-        String jwtKey = createJwtTokenKey(jwtUserDto);
-        //判断redis里面是否有这个key
-        if (!redisService.hasKey(jwtKey)) {
-            throw new EasException("token已过期");
-        }
-        return (UserDetail) redisService.get(jwtKey);
-    }
-
-    @Override
-    public void loginSaveCache(String redisTokenKey, UserDetail userDetailInRedis, Integer token_expires) {
-        redisService.set(redisTokenKey, userDetailInRedis, token_expires);
-    }
-
-
-    @Override
-    public UserDetail loginGetCache(String newRedisTokenKey) {
-        //看看redis里面有没有这个key
-        if (redisService.hasKey(newRedisTokenKey)) {
-            //有的话，就从redis里面取出来
-            return (UserDetail) redisService.get(newRedisTokenKey);
-        }
-        return null;
-    }
-
-    @Override
-    public String createJwtTokenKey(JwtUserDto jwtUserDto) {
-        //根据jwtUserDto 生成jwtKey，格式为：eas_token_{id}_{username}_{type}
-        return "eas_token_" + jwtUserDto.getId() + "_" + jwtUserDto.getUsername() + "_" + jwtUserDto.getType();
-    }
-
-    @Override
-    public String createJwtRefreshTokenKey(JwtUserDto jwtUserDto) {
-        //根据jwtUserDto 生成jwtKey，格式为：eas_refresh_{id}_{username}_{type}
-        return "eas_refresh_" + jwtUserDto.getId() + "_" + jwtUserDto.getUsername() + "_" + jwtUserDto.getType();
-    }
-
-    @Override
-    public Boolean loginDeleteCache(String newRedisRefreshTokenKey) {
-        return redisService.del(newRedisRefreshTokenKey);
-    }
-}