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

@@ -10,7 +10,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
 @Configuration
 public class RedisConfig {
 
-    @Bean("CommonRedisTemplate")
+    @Bean
     @SuppressWarnings("all")
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory){
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();

common/src/main/java/com/koobietech/eas/common/exception/EasException.java

@@ -25,4 +25,12 @@ public class EasException extends RuntimeException{
         this.msg = msg;
         this.code = code;
     }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
 }

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

@@ -7,6 +7,8 @@ public class JsonResult implements Serializable {
     private String msg = "";
     private Object data = null;
 
+    private Integer code = 200;
+
     /**
      * 成功
      * @return
@@ -18,6 +20,18 @@ public class JsonResult implements Serializable {
         return result;
     }
 
+    /**
+     * 成功
+     * @return
+     */
+    public static JsonResult data(Object data , String message, Integer code ){
+        JsonResult result = JsonResult.ok();
+        result.setData(data);
+        result.setMsg(message);
+        result.setCode(code);
+        return result;
+    }
+
     /**
      * 成功
      * @return
@@ -65,10 +79,11 @@ public class JsonResult implements Serializable {
      * 失败
      * @return
      */
-    public static JsonResult fail( Object data ){
+    public static JsonResult fail( int code){
         JsonResult result = new JsonResult();
         result.setStatus(false);
-        result.setData(data);
+        result.setCode(code);
+        result.setMsg("操作失败");
         return result;
     }
 
@@ -76,10 +91,9 @@ public class JsonResult implements Serializable {
      * 失败
      * @return
      */
-    public static JsonResult fail( Object data, String msg ){
+    public static JsonResult fail( Object data ){
         JsonResult result = new JsonResult();
         result.setStatus(false);
-        result.setMsg(msg);
         result.setData(data);
         return result;
     }
@@ -95,7 +109,39 @@ public class JsonResult implements Serializable {
         return result;
     }
 
+    /**
+     * 失败
+     * @return
+     */
+    public static JsonResult fail( String message, int code ){
+        JsonResult result = new JsonResult();
+        result.setStatus(false);
+        result.setCode(code);
+        result.setMsg(message);
+        return result;
+    }
 
+    /**
+     * 失败
+     * @return
+     */
+    public static JsonResult fail( Object data, String msg ){
+        JsonResult result = new JsonResult();
+        result.setStatus(false);
+        result.setMsg(msg);
+        result.setData(data);
+        return result;
+    }
+
+
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
     public boolean getStatus() {
         return status;
     }

common/src/main/java/com/koobietech/eas/common/service/impl/RedisServiceImpl.java

@@ -19,8 +19,7 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class RedisServiceImpl implements RedisService {
 
-    @Autowired
-    @Qualifier("CommonRedisTemplate")
+    @Resource
     private RedisTemplate<String, Object> redisTemplate;
 
     @Override

controller/pom.xml

@@ -14,6 +14,10 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>com.anji-plus</groupId>
+            <artifactId>spring-boot-starter-captcha</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>

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

@@ -1,5 +1,6 @@
 package com.koobietech.eas.config;
 
+import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.result.JsonResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +29,22 @@ public class ExceptionAdvice {
             logger.error(element.toString());
         }
         logger.error("-------------");
-        return JsonResult.fail(e.getMessage());
+        return JsonResult.fail(e.getMessage(), 500);
+    }
+
+    @ResponseBody
+    @ResponseStatus(HttpStatus.OK)
+    @ExceptionHandler(EasException.class)
+    public JsonResult exceptionHandler(EasException e){
+        StackTraceElement[] stackTrace = e.getStackTrace();
+        e.printStackTrace();
+        logger.error("运行异常提醒：");
+        logger.error(e.getMessage());
+        logger.error("异常堆栈信息：");
+        for (StackTraceElement element : stackTrace) {
+            logger.error(element.toString());
+        }
+        logger.error("-------------");
+        return JsonResult.fail(e.getMessage(), e.getCode());
     }
 }

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

@@ -1,22 +1,34 @@
 package com.koobietech.eas.controller;
 
 
+import com.anji.captcha.model.common.RepCodeEnum;
+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.Pojo.AdminPojo;
 import com.koobietech.eas.dao.dto.LoginToken;
 import com.koobietech.eas.service.AdminLoginService;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
 
+@Tag(name = "登陆模块")
 @RestController
 public class AdminLoginController {
     @Resource
     private AdminLoginService adminLoginService;
 
-    @RequestMapping("/adminLogin")
+    @Resource
+    private CaptchaService captchaService;
+
+
+
+    @PostMapping("/adminLogin")
+    @Operation(summary = "管理员登录",  description = "用户名和密码为请求载荷，若登录成功，返回两token")
     public JsonResult adminLogin(@RequestBody AdminPojo adminPojo){
 
         LoginToken result = adminLoginService.adminLogin(adminPojo);
@@ -24,5 +36,35 @@ public class AdminLoginController {
         return JsonResult.data(result);
     }
 
+    @PostMapping("/refreshToken")
+    @Operation(summary = "刷新token", description = "当token过期，在请求头中携带refresh token，若刷新成功，返回新的token和refresh token")
+    public JsonResult refreshToken(@RequestHeader("Authorization") String refreshToken) {
+        // 返回新的token和refresh token
+        return JsonResult.data(adminLoginService.refreshToken(refreshToken));
+    }
+
+    @PostMapping("/verify.get")
+    @Operation(summary = "获取验证码", description = "前端发起获取验证码请求，后端访问静态资源返回滑动图片")
+    public JsonResult get(@RequestBody CaptchaVO captchaVO) {
+        return  adminLoginService.verifyToJsonResult(captchaService.get(captchaVO)) ;
+    }
+
+    @PostMapping("/verify.check")
+    @Operation(summary = "核对验证码轨迹", description = "前端把用户的滑动轨迹转化成字符串传入后端，通过算法判断轨迹是否为真人")
+    public JsonResult check(@RequestBody CaptchaVO captchaVO) {
+        return adminLoginService.verifyToJsonResult(captchaService.check(captchaVO));
+    }
+
+    @PostMapping("/verify.judge")
+    @Operation(summary = "二次校验验证码", description = "校验滑动验证码结果，是否匹配上，传参：captchaVerification")
+    public JsonResult verify(@RequestBody CaptchaVO captchaVO) {
+        ResponseModel response = captchaService.verification(captchaVO);
+        if (!response.isSuccess()) {
+            throw new EasException( response.getRepMsg() , Integer.parseInt(response.getRepCode()));
+        }
+        return adminLoginService.verifyToJsonResult(response);
+    }
+
+
 
 }

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

@@ -0,0 +1,114 @@
+package com.koobietech.eas.controller;
+
+
+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.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
+@Tag(name = "班级控制器")
+public class EasEduClassController {
+
+    @Resource
+    EasEduClassService easEduClassService;
+
+    /**
+     * 添加班级类
+     * @param easEduClass
+     * @return
+     */
+    @PostMapping("/addClass")
+    @Operation(summary = "增加班级类" , description = "用于增加班级类")
+    public JsonResult addClass(@RequestBody  EasEduClass easEduClass){
+
+        int add_i = easEduClassService.addClass(easEduClass);
+        return JsonResult.ok("班级类添加成功");
+    }
+
+    /**
+     * 修改班级类信息
+     * @param easEduClass
+     * @return
+     */
+    @PutMapping(value = "/updateClass")
+    @Operation(summary = "更新班级类",description = "用于修改班级类信息")
+    public JsonResult updateClass(@RequestBody EasEduClass easEduClass){
+        int update_i = easEduClassService.updateClass(easEduClass);
+        if (update_i > 0){
+            return JsonResult.ok("修改成功！");
+        }else {
+            return JsonResult.fail("修改失败");
+        }
+    }
+
+    /**
+     * 删除班级类
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/deleteClass/{id}")
+    @Operation(summary = "删除班级类",description = "用于根据 id 删除班级类")
+    public JsonResult deleteClass(@PathVariable Long id ){
+        int delete_i = easEduClassService.deleteClass(id);
+        if (delete_i > 0){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+
+    /**
+     * 通过 id 查询班级类
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/selectId")
+    @Operation(summary = "id 查询班级类" , description = "通过id查询班级类")
+    public JsonResult selectId( Long id ){
+        EasEduClass easEduClass = easEduClassService.selectId(id);
+        System.out.println(
+                Disabled.valueOf(easEduClass.getDisabled())
+        );
+        return JsonResult.data(easEduClass);
+    }
+
+    /**
+     * 查询所有的班级类
+     * @return
+     */
+    @GetMapping(value = "/selectTotal")
+    @Operation(summary = "查询所有的班级类",description = "用于查询所有的班级类")
+    public JsonResult selectTotal(){
+        List<EasEduClass> easEduClasses = easEduClassService.selectTotal();
+        return JsonResult.data(easEduClasses);
+    }
+
+    /**
+     * 通过条件查询班级类
+     * @param easEduClass
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping(value = "/selectCondition")
+    @Operation(summary = "根据条件进行查询班级类", description = "用于根据条件查询班级类")
+    public JsonPageResult selectCondition(@RequestBody EasEduClass easEduClass,
+                                            @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData data = easEduClassService.selectCondition(easEduClass);
+        return JsonPageResult.data(data);
+    }
+}

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 
 @RestController
-@Tag(name = "教室信息")
+@Tag(name = "教室模块")
 @RequestMapping("/classroom")
 public class EasEduClassroomController {
     @Resource
@@ -21,16 +21,16 @@ public class EasEduClassroomController {
 
 
     @PostMapping("/query")
-    @Operation(summary = "查询教室" ,  description = "根据参数查询基本信息")
+    @Operation(summary = "查询教室", description = "根据参数查询教室表信息")
     public JsonPageResult query(@RequestBody EasEduClassroom classroom,
-                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PageData ret = easEduClassroomService.query(classroom);
         return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")
-    @Operation(summary = "添加教室" ,  description = "用于添加教室信息")
+    @Operation(summary = "添加教室", description = "用于添加教室信息")
     public JsonResult add(@RequestBody EasEduClassroom classroom) {
         Boolean ret = easEduClassroomService.add(classroom);
         if (ret) {
@@ -41,7 +41,7 @@ public class EasEduClassroomController {
 
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除教室" ,  description = "删除教室信息根据ID")
+    @Operation(summary = "删除教室", description = "删除教室信息表数据根据ID")
     public JsonResult delete(@RequestParam Integer id) {
         Boolean ret = easEduClassroomService.delete(id);
         if (ret) {
@@ -52,7 +52,7 @@ public class EasEduClassroomController {
 
 
     @PutMapping("/update")
-    @Operation(summary = "更新教室" ,  description = "更新教室信息根据ID")
+    @Operation(summary = "更新教室", description = "更新教室信息")
     public JsonResult update(@RequestBody EasEduClassroom classroom) {
         Boolean ret = easEduClassroomService.update(classroom);
         if (ret) {

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

@@ -0,0 +1,79 @@
+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.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.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Tag(name = "课程表模块")
+@RequestMapping("/schedule")
+public class EasEduScheduleController {
+
+
+    @Resource
+    EasEduScheduleService easEduScheduleService;
+
+    @PostMapping("/add")
+    @Operation(summary = "添加课程", description = "根据课程和重复预约次数(接下来连续多少天都预约这节课)录入基本课程信息")
+    public JsonResult add(@RequestBody EasEduSchedule schedule, @RequestParam int repeatTime) {
+        Boolean ret = easEduScheduleService.add(schedule, repeatTime);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除用户信息", description = "删除课程表数据根据ID")
+    public JsonResult delete(@RequestParam Long id) {
+        Boolean ret = easEduScheduleService.delete(id);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新用户信息", description = "更新课程信息")
+    public JsonResult update(@RequestBody EasEduSchedule schedule) {
+        Boolean ret = easEduScheduleService.update(schedule);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+    @PostMapping("/query")
+    @Operation(summary = "查询用户信息", description = "根据参数查询课程表信息")
+    public JsonResult query(@RequestBody(required = false) EasEduSchedule schedule,
+                            @RequestParam Long pageNum, @RequestParam Long pageSize) {
+
+
+        PageHelper.startPage(Math.toIntExact(pageNum), Math.toIntExact(pageSize));
+        PageData ret = easEduScheduleService.query(schedule);
+        System.out.println(ret.toString());
+        return JsonResult.data(ret);
+    }
+
+    @PutMapping("/queryConflict")
+    @Operation(summary = "查询排课是否冲突", description = "根据参数查询排课是否冲突")
+    public JsonResult queryConflict(@RequestBody ConflictDto conflictDto) {
+        Boolean ret = easEduScheduleService.queryConflict(conflictDto);
+        if (ret) {
+            return JsonResult.data("排课没有冲突");
+        }
+        return JsonResult.data("排课有冲突");
+    }
+
+
+}

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

@@ -23,16 +23,16 @@ public class EasSysDepartmentController {
 
 
     @PostMapping("/query")
-    @Operation(summary = "查询部门" ,  description = "根据参数查询基本信息")
+    @Operation(summary = "查询部门", description = "根据参数查询部门表信息")
     public JsonPageResult query(@RequestBody EasSysDepartment department,
-                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PageData ret = easSysDepartmentService.query(department);
         return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")
-    @Operation(summary = "添加部门" ,  description = "添加部门信息")
+    @Operation(summary = "添加部门", description = "添加部门信息")
     public JsonResult add(@RequestBody EasSysDepartment department) {
         Boolean ret = easSysDepartmentService.add(department);
         if (ret) {
@@ -43,7 +43,7 @@ public class EasSysDepartmentController {
 
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除部门" ,  description = "删除部门根据ID")
+    @Operation(summary = "删除部门", description = "删除部门表数据根据ID")
     public JsonResult delete(@RequestParam Long id) {
         Boolean ret = easSysDepartmentService.delete(id);
         if (ret) {
@@ -54,7 +54,7 @@ public class EasSysDepartmentController {
 
 
     @PutMapping("/update")
-    @Operation(summary = "更新部门" ,  description = "更新部门信息根据ID")
+    @Operation(summary = "更新部门", description = "更新部门信息")
     public JsonResult update(@RequestBody EasSysDepartment department) {
         Boolean ret = easSysDepartmentService.update(department);
         if (ret) {

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

@@ -22,39 +22,39 @@ public class EasSysPermissionController {
     EasSysPermissionService easSysPermissionService;
 
     @PostMapping("/query")
-    @Operation(summary = "查询权限" ,  description = "根据参数查询基本权限表信息")
+    @Operation(summary = "查询权限", description = "根据参数查询基本权限表信息")
     public JsonPageResult query(@RequestBody(required = false) EasSysPermission permission,
-                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ){
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PageData ret = easSysPermissionService.query(permission);
         return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")
-    @Operation(summary = "添加权限" ,  description = "录入权限表基本信息")
-    public JsonResult add(@RequestBody EasSysPermission permission){
+    @Operation(summary = "添加权限", description = "录入权限表基本信息")
+    public JsonResult add(@RequestBody EasSysPermission permission) {
         Boolean ret = easSysPermissionService.add(permission);
-        if(ret){
+        if (ret) {
             return JsonResult.ok();
         }
         return JsonResult.fail();
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除权限" ,  description = "删除权限表数据根据ID")
-    public JsonResult delete(@RequestParam Integer id){
+    @Operation(summary = "删除权限", description = "删除权限表数据根据ID")
+    public JsonResult delete(@RequestParam Integer id) {
         Boolean ret = easSysPermissionService.delete(id);
-        if(ret){
+        if (ret) {
             return JsonResult.ok();
         }
         return JsonResult.fail();
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新权限" ,  description = "根据ID 更新权限表信息")
-    public JsonResult update(@RequestBody EasSysPermission permission){
+    @Operation(summary = "更新权限", description = "更新权限表信息")
+    public JsonResult update(@RequestBody EasSysPermission permission) {
         Boolean ret = easSysPermissionService.update(permission);
-        if(ret){
+        if (ret) {
             return JsonResult.ok();
         }
         return JsonResult.fail();

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

@@ -30,7 +30,7 @@ public class EasSysUserInfoController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除用户信息",description = "删除用户信息表数据根据ID")
+    @Operation(summary = "删除用户信息", description = "删除用户信息表数据根据ID")
     public JsonResult delete(@RequestParam Long id) {
         Boolean ret = easSysUserInfoService.delete(id);
         if (ret) {
@@ -40,7 +40,7 @@ public class EasSysUserInfoController {
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新用户信息",description = "更新用户信息表信息")
+    @Operation(summary = "更新用户信息", description = "更新用户信息表信息")
     public JsonResult update(@RequestBody EasSysUserinfo userinfo) {
         Boolean ret = easSysUserInfoService.update(userinfo);
         if (ret) {
@@ -50,7 +50,7 @@ public class EasSysUserInfoController {
     }
 
     @PostMapping("/query")
-    @Operation(summary = "查询用户信息",description = "查询用户信息表信息")
+    @Operation(summary = "查询用户信息", description = "根据参数查询用户信息表信息")
     public JsonResult query(@RequestBody(required = false) EasSysUserinfo userinfo,
                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);

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

@@ -1,30 +0,0 @@
-package com.koobietech.eas.controller;
-
-import com.koobietech.eas.dao.dto.TestDto;
-import com.koobietech.eas.mbg.model.EasEduSubjects;
-import com.koobietech.eas.mbg.model.EasSysStudent;
-import com.koobietech.eas.service.DemoService;
-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;
-import java.util.List;
-
-@RestController
-@Tag(name = "用户控制器")
-public class EasUserController {
-
-    @Resource
-    DemoService demoService;
-
-    @PostMapping("/test")
-    @Operation(summary = "控制器测试用例" , description = "用于演示Swagger配置注解")
-    public List<EasSysStudent> test(@RequestBody EasEduSubjects easEduSubjects){
-
-        return demoService.test( easEduSubjects );
-    }
-
-
-
-}

controller/src/main/resources/application-local.yaml

@@ -4,13 +4,13 @@ spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
     username: root
-    password: 1234
+    password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
     host: localhost
-    database: 9
+    database: 15
     password:
-    port: 26379
+    port: 6379
   security:
     user:
       name: admin

controller/src/main/resources/application.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   profiles:
     active: local
@@ -34,3 +34,20 @@ eas:
   jwt-secret-key: 123456
   jwt-expires-date: 1
   password-sign-key: eas-key-password
+aj:
+  captcha:
+    cache-type: local
+    type: default
+    water-mark: "\u7231\u6263\u9489"
+    slip-offset: 5
+    aes-status: true
+    interference-options: 2
+    font-style: 1
+    font-size: 25
+    history-data-clear-enable: false
+    req-frequency-limit-enable: false
+    req-get-lock-limit: 5
+    req-get-lock-seconds: 360
+    req-get-minute-limit: 30
+    req-check-minute-limit: 60
+    req-verify-minute-limit: 60

dao/src/main/java/com/koobietech/eas/dao/dto/ConflictDto.java

@@ -0,0 +1,18 @@
+package com.koobietech.eas.dao.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ConflictDto {
+    @Schema(description = "课程开始时间")
+    private Date startTime;
+    @Schema(description = "课程结束时间")
+    private Date endTime;
+    @Schema(description = "教室ID")
+    private Integer roomId;
+    @Schema(description = "教师ID")
+    private Integer teacherId;
+}

pom.xml

@@ -36,9 +36,15 @@
         <easypoi.version>4.3.0</easypoi.version>
         <pagehelper.starter.version>1.3.1</pagehelper.starter.version>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
+        <captcha.version>1.3.0</captcha.version>
     </properties>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.anji-plus</groupId>
+                <artifactId>spring-boot-starter-captcha</artifactId>
+                <version>${captcha.version}</version>
+            </dependency>
             <dependency>
                 <groupId>cn.afterturn</groupId>
                 <artifactId>easypoi-spring-boot-starter</artifactId>

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

@@ -57,7 +57,7 @@ public class EasSecurityFilter extends OncePerRequestFilter {
                 ArrayList<SimpleGrantedAuthority> objects = new ArrayList<>();
 
                 // 遍历用户的权限列表
-                for (Permission adminPermission: permission) {
+                for (Permission adminPermission : permission) {
                     // 创建一个 SimpleGrantedAuthority 权限对象，并添加到集合中
                     SimpleGrantedAuthority authority = new SimpleGrantedAuthority(adminPermission.getDescription());
                     objects.add(authority);
@@ -69,10 +69,10 @@ public class EasSecurityFilter extends OncePerRequestFilter {
                 // 将身份验证令牌设置到当前的 SecurityContext 中
                 context.setAuthentication(authenticationToken);
             }
+            //放行
+            filterChain.doFilter(request, response);
         }
-
         filterChain.doFilter(request, response);
     }
 
-
 }

service/pom.xml

@@ -42,6 +42,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.anji-plus</groupId>
+            <artifactId>captcha</artifactId>
+            <version>1.3.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <parent>

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

@@ -1,9 +1,18 @@
 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.adminLoginPojo.UserDetail;
 import com.koobietech.eas.dao.dto.LoginToken;
 
 public interface AdminLoginService {
     LoginToken adminLogin(AdminPojo adminPojo);
+
+    LoginToken refreshToken(String refreshToken);
+
+    //增加一个接口 把ResponseModel 里面的值赋值到JsonResult里面
+    JsonResult verifyToJsonResult(ResponseModel responseModel);
+
+
 }

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

@@ -1,11 +0,0 @@
-package com.koobietech.eas.service;
-
-import com.koobietech.eas.dao.dto.TestDto;
-import com.koobietech.eas.mbg.model.EasEduSubjects;
-import com.koobietech.eas.mbg.model.EasSysStudent;
-
-import java.util.List;
-
-public interface DemoService {
-    List test(EasEduSubjects dto);
-}

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

@@ -0,0 +1,23 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasEduCategory;
+import com.koobietech.eas.mbg.model.EasEduClass;
+
+import java.util.List;
+
+public interface EasEduClassService {
+
+    int addClass(EasEduClass easEduClass);
+
+    int updateClass(EasEduClass easEduClass);
+
+    int deleteClass( Long id );
+
+    EasEduClass selectId( Long id );
+
+    List<EasEduClass> selectTotal();
+
+    PageData selectCondition(EasEduClass easEduClass );
+
+}

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

@@ -0,0 +1,17 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.dao.dto.ConflictDto;
+import com.koobietech.eas.mbg.model.EasEduSchedule;
+
+public interface EasEduScheduleService {
+    Boolean add(EasEduSchedule schedule, int repeatTime);
+
+    Boolean delete(Long id);
+
+    Boolean update(EasEduSchedule schedule);
+
+    PageData query(EasEduSchedule schedule);
+
+    Boolean queryConflict(ConflictDto conflictDto);
+}

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

@@ -7,7 +7,10 @@ import com.koobietech.eas.mbg.model.EasSysDepartment;
 public interface EasSysDepartmentService {
 
     Boolean update(EasSysDepartment department);
+
     Boolean add(EasSysDepartment department);
+
     Boolean delete(Long id);
+
     PageData query(EasSysDepartment department);
 }

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

@@ -6,7 +6,10 @@ import com.koobietech.eas.mbg.model.EasSysPermission;
 public interface EasSysPermissionService {
 
     Boolean update(EasSysPermission permisson);
+
     Boolean add(EasSysPermission permisson);
+
     Boolean delete(Integer id);
+
     PageData query(EasSysPermission permission);
 }

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

@@ -6,7 +6,10 @@ import com.koobietech.eas.mbg.model.EasSysUserinfo;
 public interface EasSysUserInfoService {
 
     Boolean add(EasSysUserinfo userinfo);
+
     Boolean delete(Long id);
+
     Boolean update(EasSysUserinfo userinfo);
+
     PageData query(EasSysUserinfo userinfo);
 }

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

@@ -7,11 +7,13 @@ import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 public interface LoginRedisService {
     UserDetail checkToken(JwtUserDto jwtUserDto);
 
-    UserDetail checkRefreshToken(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/AdminLoginServiceImpl.java

@@ -1,8 +1,10 @@
 package com.koobietech.eas.service.impl;
 
+import com.anji.captcha.model.common.ResponseModel;
 import com.koobietech.eas.common.constant.UserType;
 import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.pojo.JwtUserDto;
+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.Pojo.AdminPojo;
@@ -16,8 +18,10 @@ import com.koobietech.eas.service.AdminLoginService;
 import com.koobietech.eas.service.LoginRedisService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 @Service
@@ -36,10 +40,14 @@ public class AdminLoginServiceImpl implements AdminLoginService {
     @Resource
     private JwtManager jwtManager;
 
+    // token过期时间 单位：s
+    private final Integer token_expires = 30;
+    private final Integer refreshToken_expires = 60;
+
     @Override
     public LoginToken adminLogin(AdminPojo adminPojo) {
         if (adminPojo.getUsername() == null || adminPojo.getPasswd() == null || adminPojo.getUsername().isEmpty() || adminPojo.getPasswd().isEmpty()) {
-            throw new EasException("用户不存在", 509);
+            throw new EasException("用户不存在", 412);
         }
 
         EasSysUserinfo easSysUserinfo = findAdminByUsername(adminPojo.getUsername(), adminPojo.getPasswd());
@@ -55,33 +63,75 @@ public class AdminLoginServiceImpl implements AdminLoginService {
         userDetailInRedis.setPermissions(adminLoginMapper.getUserPermissionsById(id));
         System.out.println("接收后" + userDetailInRedis);
 
-        // 先调用自定义sql查询用户详细信息、部门信息和权限信息
-        UserType userType = UserType.TEACHER;
-        if (userDetailInRedis.getUsername().equals("admin")) {
-            userType = UserType.ADMIN;
+            // 先调用自定义sql查询用户详细信息、部门信息 和 权限信息
+            UserType userType = UserType.TEACHER;
+            if (userDetailInRedis.getUsername().equals("admin")) {
+                userType = UserType.ADMIN;
+            }
+
+            // 生成token
+            JwtUserDto jwtUserDto = new JwtUserDto(userDetailInRedis.getUsername(), userDetailInRedis.getId(), userType);
+            String token = jwtManager.createJwt(jwtUserDto, token_expires);
+            String refreshToken = jwtManager.createJwt(jwtUserDto, refreshToken_expires);
+
+            // 生成redis key
+            String redisTokenKey = loginRedisService.createJwtTokenKey(jwtUserDto);
+            String redisRefreshTokenKey = loginRedisService.createJwtRefreshTokenKey(jwtUserDto);
+
+            // 将token存入redis
+            loginRedisService.loginSaveCache(redisTokenKey, userDetailInRedis, token_expires);
+            loginRedisService.loginSaveCache(redisRefreshTokenKey, userDetailInRedis, refreshToken_expires);
+
+            // 登录成功
+            return new LoginToken(token, refreshToken);
+    }
+
+    @Override
+    public LoginToken refreshToken(String refreshToken) {
+        // 解析refresh token
+        JwtUserDto jwtUserDto = jwtManager.decodeJwt(refreshToken);
+
+        //生成新的 刷新k值 （refresh_token）
+        String newRedisRefreshTokenKey = loginRedisService.createJwtRefreshTokenKey(jwtUserDto);
+
+        //查询redis里面有没有这个k值
+        UserDetail userDetailInRedis = loginRedisService.loginGetCache(newRedisRefreshTokenKey);
+        if (userDetailInRedis == 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);
 
-        // token过期时间
-        Integer token_expires = 30;
-        Integer refreshToken_expires = 60;
+        //生成新的k值 （token）
+        String newRedisTokenKey = loginRedisService.createJwtTokenKey(jwtUserDto);
 
-        // 生成token
-        JwtUserDto jwtUserDto = new JwtUserDto(userDetailInRedis.getUsername(), userDetailInRedis.getId(), userType);
-        String token = jwtManager.createJwt(jwtUserDto, token_expires);
-        String refreshToken = jwtManager.createJwt(jwtUserDto, refreshToken_expires);
+        // 更新Redis中的token和refresh token
+        loginRedisService.loginSaveCache(newRedisTokenKey, userDetailInRedis, token_expires);
+        loginRedisService.loginSaveCache(newRedisRefreshTokenKey, userDetailInRedis, refreshToken_expires);
+        return new LoginToken(newToken, newRefreshToken);
+    }
 
-        // 生成redis key
-        String redisTokenKey = loginRedisService.createJwtTokenKey(jwtUserDto);
-        String redisRefreshTokenKey = loginRedisService.createJwtRefreshTokenKey(jwtUserDto);
 
-        // 将token存入redis
-        loginRedisService.loginSaveCache(redisTokenKey, userDetailInRedis, token_expires);
-        loginRedisService.loginSaveCache(redisRefreshTokenKey, userDetailInRedis, refreshToken_expires);
+    @Override
+    public JsonResult verifyToJsonResult(ResponseModel response) {
+        JsonResult result = new JsonResult();
+
+        if (response != null) {
+            result.setMsg(response.getRepMsg());
+            result.setStatus(response.isSuccess());
+            result.setData(response.getRepData());
+            result.setCode( Integer.parseInt(response.getRepCode()) );
+        }
+        else {
+            throw new EasException("ResponseModel参数为空！",9000);
+        }
 
-        // 登录成功
-        return new LoginToken(token, refreshToken);
+        return result;
     }
 
+
+
     private EasSysUserinfo findAdminByUsername(String username, String password)  {
         EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
         easSysUserinfoExample.createCriteria().andUsernameEqualTo(username);
@@ -98,11 +148,14 @@ public class AdminLoginServiceImpl implements AdminLoginService {
         }
 
         EasSysUserinfo easSysUserinfo = optionalAdmin.get();
+
+        // 验证密码 这个方法里面有解密 如果解密失败会抛出异常
         validatePassword(password, easSysUserinfo.getPasswd());
 
         return easSysUserinfo;
     }
 
+
     private void validatePassword(String inputPassword, String encryptedPassword){
         String decryptedPassword = passwordManager.decryptPassword(inputPassword);
         System.out.println("前端解密来的decryptedPassword: " + decryptedPassword);

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

@@ -1,35 +0,0 @@
-package com.koobietech.eas.service.impl;
-
-import com.koobietech.eas.dao.dto.TestDto;
-import com.koobietech.eas.mbg.mapper.EasEduSubjectsMapper;
-import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
-import com.koobietech.eas.mbg.model.EasEduSubjects;
-import com.koobietech.eas.mbg.model.EasSysStudent;
-import com.koobietech.eas.mbg.model.EasSysStudentExample;
-import com.koobietech.eas.service.DemoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
-
-@Service
-public class DemoServiceImpl implements DemoService {
-
-    @Resource
-    EasSysStudentMapper easSysStudentMapper;
-
-    @Resource
-    EasEduSubjectsMapper easEduSubjectsMapper;
-
-    @Override
-    public List test(EasEduSubjects dto) {
-
-        easEduSubjectsMapper.insert(dto);
-
-        List list = easEduSubjectsMapper.selectByExample(null);
-        return list;
-    }
-}

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

@@ -0,0 +1,125 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+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;
+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;
+
+@Service
+public class EasEduClassServiceImpl implements EasEduClassService {
+
+    @Resource
+    EasEduClassMapper easEduClassMapper;
+    @Override
+    public int addClass(EasEduClass easEduClass) {
+        easEduClass.setCreateTime(new Date());
+        easEduClass.setModifyTime(new Date());
+        return easEduClassMapper.insert(easEduClass);
+    }
+
+    @Override
+    public int updateClass(EasEduClass easEduClass) {
+        return easEduClassMapper.updateByPrimaryKey( easEduClass );
+    }
+
+    @Override
+    public int deleteClass(Long id) {
+        return  easEduClassMapper.deleteByPrimaryKey( id );
+    }
+
+    @Override
+    public EasEduClass selectId(Long id) {
+        System.out.println("Id" + id);
+        return easEduClassMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<EasEduClass> selectTotal() {
+        return easEduClassMapper.selectByExample(null);
+    }
+
+    @Override
+    public PageData selectCondition(EasEduClass easEduClass) {
+        EasEduClassExample easEduClassExample = new EasEduClassExample();
+        EasEduClassExample.Criteria criteria = easEduClassExample.createCriteria();
+        if ( Objects.nonNull(easEduClass) ) {
+            if (Objects.nonNull(easEduClass.getId())) {
+                criteria.andIdEqualTo(easEduClass.getId());
+            }
+            if (StringUtils.hasText(easEduClass.getName())) {
+                criteria.andNameLike("%" + easEduClass.getName() + "%");
+            }
+            if (Objects.nonNull(easEduClass.getManageId()) && easEduClass.getManageId() > 0){
+                criteria.andManageIdEqualTo(easEduClass.getManageId());
+            }
+            if (Objects.nonNull(easEduClass.getAssistantId()) && easEduClass.getAssistantId() > 0){
+                criteria.andAssistantIdEqualTo(easEduClass.getAssistantId());
+            }
+            if (Objects.nonNull(easEduClass.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(easEduClass.getCreateTime());
+            }
+            if (Objects.nonNull(easEduClass.getModifyTime())) {
+                criteria.andCreateTimeGreaterThan(easEduClass.getModifyTime());
+            }
+            if (Objects.nonNull(easEduClass.getCreateUid()) && easEduClass.getCreateUid() > 0) {
+                criteria.andCreateUidEqualTo(easEduClass.getCreateUid());
+            }
+            if (StringUtils.hasText(easEduClass.getDisabled())) {
+                criteria.andDisabledEqualTo(easEduClass.getDisabled());
+            }
+        }
+        List<EasEduClass> easEduClasses = easEduClassMapper.selectByExample(easEduClassExample);
+        long l = easEduClassMapper.countByExample(easEduClassExample);
+        return PageData.init(easEduClasses,l);
+    }
+
+//    @Override
+//    public PageData selectCondition(EasEduClass easEduClass) {
+//        EasEduClassExample easEduClassExample = new EasEduClassExample();
+//        EasEduClassExample.Criteria criteria = easEduClassExample.createCriteria();
+//        if (Objects.nonNull(easEduClass)){
+//            if (Objects.nonNull(easEduClass.getId())){
+//                criteria.andIdEqualTo(easEduClass.getId());
+//            }
+//            if (StringUtils.hasText((easEduClass.getName()))){
+//                criteria.andNameLike("%" + easEduClass.getName() + "%");
+//            }
+//            if (Objects.nonNull(easEduClass.getManageId())){
+//                criteria.andManageIdEqualTo(easEduClass.getManageId());
+//            }
+//            if (Objects.nonNull(easEduClass.getAssistantId())){
+//                criteria.andManageIdEqualTo(easEduClass.getManageId());
+//            }
+//            if (Objects.nonNull(easEduClass.getCreateTime())){
+//                criteria.andCreateTimeGreaterThan(easEduClass.getCreateTime());
+//            }
+//            if (Objects.nonNull(easEduClass.getModifyTime())){
+//                criteria.andModifyTimeGreaterThan(easEduClass.getModifyTime());
+//            }
+//            if (Objects.nonNull(easEduClass.getCreateUid())){
+//                criteria.andCreateUidEqualTo(easEduClass.getCreateUid());
+//            }
+//            if (StringUtils.hasText(easEduClass.getDisabled())){
+//                criteria.andDisabledEqualTo(easEduClass.getDisabled());
+//            }
+//        }
+//        List<EasEduClass> easEduClasses = easEduClassMapper.selectByExample(easEduClassExample);
+//        long l = easEduClassMapper.countByExample(easEduClassExample);
+//        PageData ret = new PageData();
+//        ret.setData(easEduClasses);
+//        ret.setTotal(l);
+//        return ret;
+//    }
+
+}

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

@@ -43,7 +43,7 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
         EasEduClassroomExample.Criteria criteria = easEduClassroomExample.createCriteria();
         if (Objects.nonNull(classroom)) {
 
-            if (Objects.nonNull(classroom.getId())) {
+            if (Objects.nonNull(classroom.getId()) && classroom.getId() != 0) {
                 criteria.andIdEqualTo(classroom.getId());
             }
 
@@ -55,7 +55,7 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
                 criteria.andAddressLike("%" + classroom.getAddress() + "%");
             }
 
-            if (Objects.nonNull(classroom.getManagerId())) {
+            if (Objects.nonNull(classroom.getManagerId()) && classroom.getManagerId() != 0) {
                 criteria.andManagerLike("%" + classroom.getManagerId() + "%");
             }
 
@@ -63,10 +63,10 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
                 criteria.andManagerLike("%" + classroom.getManager() + "%");
             }
 
-            if (Objects.nonNull(classroom.getFloor())) {
-                criteria.andFloorEqualTo(classroom.getFloor() );
+            if (Objects.nonNull(classroom.getFloor()) && classroom.getFloor() != 0) {
+                criteria.andFloorEqualTo(classroom.getFloor());
             }
-            if (Objects.nonNull(classroom.getCapacity())) {
+            if (Objects.nonNull(classroom.getCapacity()) && classroom.getCapacity() != 0) {
                 criteria.andCapacityEqualTo(classroom.getCapacity());
             }
 
@@ -75,7 +75,19 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
             }
 
             if (Objects.nonNull(classroom.getCreateTime())) {
-                criteria.andCreateTimeGreaterThan(classroom.getCreateTime());
+                criteria.andCreateTimeGreaterThanOrEqualTo(classroom.getCreateTime());
+            }
+
+            if (Objects.nonNull(classroom.getModifyTime())) {
+                criteria.andModifyTimeGreaterThanOrEqualTo(classroom.getModifyTime());
+            }
+
+            if (Objects.nonNull(classroom.getCreateUid()) && classroom.getCreateUid() != 0) {
+                criteria.andCreateUidEqualTo(classroom.getCreateUid());
+            }
+
+            if (StringUtils.hasText(classroom.getDisabled())) {
+                criteria.andDisabledEqualTo(classroom.getDisabled());
             }
 
 
@@ -88,4 +100,5 @@ public class EasEduClassroomServiceImpl implements EasEduClassroomService {
         ret.setTotal(l);
         return ret;
     }
+
 }

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

@@ -0,0 +1,180 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.dao.dto.ConflictDto;
+import com.koobietech.eas.mbg.mapper.EasEduClassroomMapper;
+import com.koobietech.eas.mbg.mapper.EasEduScheduleMapper;
+import com.koobietech.eas.mbg.model.EasEduClassroomExample;
+import com.koobietech.eas.mbg.model.EasEduSchedule;
+import com.koobietech.eas.mbg.model.EasEduScheduleExample;
+import com.koobietech.eas.service.EasEduScheduleService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+
+public class EasEduScheduleServiceImpl implements EasEduScheduleService {
+    @Resource
+    EasEduScheduleMapper easEduScheduleMapper;
+
+    @Resource
+    EasEduClassroomMapper easEduClassroomMapper;
+
+    @Override
+    public Boolean update(EasEduSchedule schedule) {
+        schedule.setModifyTime(new Date());
+        return easEduScheduleMapper.updateByPrimaryKey(schedule) == 1;
+    }
+
+    @Override
+    public Boolean add(EasEduSchedule schedule, int repeatTime) {
+        Calendar startCalender = Calendar.getInstance();
+        Calendar endCalender = Calendar.getInstance();
+
+        startCalender.setTime(schedule.getStartTime());
+        endCalender.setTime(schedule.getEndTime());
+
+        schedule.setCreateTime(new Date());
+        schedule.setModifyTime(new Date());
+
+        for (int re = 0; re < repeatTime; re++) {
+            if (re != 0) {
+                startCalender.add(Calendar.DATE, 1);
+                endCalender.add(Calendar.DATE, 1);
+            }
+            schedule.setStartTime(startCalender.getTime());
+            schedule.setEndTime(endCalender.getTime());
+            if ((schedule.getWeek() + 1) != 7) {
+                schedule.setWeek((schedule.getWeek() + 1) % 7);
+            } else {
+                schedule.setWeek(7);
+            }
+            if (easEduScheduleMapper.insert(schedule) == 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean delete(Long id) {
+        return easEduScheduleMapper.deleteByPrimaryKey(id) == 1;
+    }
+
+    @Override
+    public PageData query(EasEduSchedule schedule) {
+
+        EasEduScheduleExample easEduScheduleExample = new EasEduScheduleExample();
+        EasEduScheduleExample.Criteria criteria = easEduScheduleExample.createCriteria();
+        if (Objects.nonNull(schedule)) {
+
+            if (Objects.nonNull(schedule.getId()) && schedule.getId() != 0) {
+                criteria.andIdEqualTo(schedule.getId());
+            }
+
+            if (Objects.nonNull(schedule.getWeek()) && schedule.getWeek() != 0) {
+                criteria.andWeekEqualTo(schedule.getWeek());
+            }
+
+            if (Objects.nonNull(schedule.getStartTime())) {
+                criteria.andStartTimeGreaterThanOrEqualTo(schedule.getStartTime());
+            }
+
+            if (Objects.nonNull(schedule.getEndTime())) {
+                criteria.andEndTimeLessThanOrEqualTo(schedule.getEndTime());
+            }
+
+            if (Objects.nonNull(schedule.getRoomId()) && schedule.getRoomId() != 0) {
+                criteria.andRoomIdEqualTo(schedule.getRoomId());
+            }
+
+            if (Objects.nonNull(schedule.getClassId()) && schedule.getClassId() != 0) {
+                criteria.andClassIdEqualTo(schedule.getClassId());
+            }
+
+            if (Objects.nonNull(schedule.getAssistantId()) && schedule.getAssistantId() != 0) {
+                criteria.andAssistantIdEqualTo(schedule.getAssistantId());
+            }
+
+            if (Objects.nonNull(schedule.getTeacherId()) && schedule.getTeacherId() != 0) {
+                criteria.andTeacherIdEqualTo(schedule.getTeacherId());
+            }
+
+            if (Objects.nonNull(schedule.getCategoryId()) && schedule.getCategoryId() != 0) {
+                criteria.andCategoryIdEqualTo(schedule.getCategoryId());
+            }
+
+            if (Objects.nonNull(schedule.getSubjectsId()) && schedule.getSubjectsId() != 0) {
+                criteria.andSubjectsIdEqualTo(schedule.getSubjectsId());
+            }
+
+            if (Objects.nonNull(schedule.getCreateTime())) {
+                criteria.andCreateTimeGreaterThanOrEqualTo(schedule.getCreateTime());
+            }
+
+            if (Objects.nonNull(schedule.getModifyTime())) {
+                criteria.andModifyTimeGreaterThanOrEqualTo(schedule.getModifyTime());
+            }
+
+            if (Objects.nonNull(schedule.getCreateUid()) && schedule.getCreateUid() != 0) {
+                criteria.andCreateUidEqualTo(schedule.getCreateUid());
+            }
+
+            if (StringUtils.hasText(schedule.getDisabled())) {
+                criteria.andDisabledEqualTo(schedule.getDisabled());
+            }
+
+        }
+        List<EasEduSchedule> schedules =
+                easEduScheduleMapper.selectByExample(easEduScheduleExample);
+        long l = easEduScheduleMapper.countByExample(easEduScheduleExample);
+        PageData ret = new PageData();
+        ret.setData(schedules);
+        ret.setTotal(l);
+        return ret;
+    }
+
+    @Override
+    public Boolean queryConflict(ConflictDto conflictDto) {
+
+        Boolean ret = false;
+
+        EasEduScheduleExample easEduScheduleExample = new EasEduScheduleExample();
+        EasEduScheduleExample.Criteria criteria = easEduScheduleExample.createCriteria();
+
+        EasEduClassroomExample easEduClassroomExample = new EasEduClassroomExample();
+        EasEduClassroomExample.Criteria classroomCriteria = easEduClassroomExample.createCriteria();
+        classroomCriteria.andDisabledEqualTo("Y");
+
+        if (Objects.nonNull(conflictDto)) {
+
+            if (Objects.nonNull(conflictDto.getStartTime())
+                    && Objects.nonNull(conflictDto.getEndTime())) {
+                criteria.andStartTimeBetween(conflictDto.getStartTime(), conflictDto.getEndTime());
+            }
+
+            if (Objects.nonNull(conflictDto.getTeacherId()) && conflictDto.getTeacherId() != 0) {
+                criteria.andTeacherIdEqualTo(conflictDto.getTeacherId());
+            }
+
+            if (Objects.nonNull(conflictDto.getRoomId()) && conflictDto.getRoomId() != 0) {
+                criteria.andRoomIdEqualTo(conflictDto.getRoomId());
+            }
+            criteria.andDisabledEqualTo("N");
+
+        }
+
+        if (easEduScheduleMapper.countByExample(easEduScheduleExample) == 0 &&
+                easEduClassroomMapper.countByExample(easEduClassroomExample) == 0) {
+            ret = true;
+        }
+        return ret;
+
+    }
+}

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

@@ -45,7 +45,7 @@ public class EasSysDepartmentServiceImpl implements EasSysDepartmentService {
         EasSysDepartmentExample.Criteria criteria = departmentExample.createCriteria();
         if (Objects.nonNull(department)) {
 
-            if (Objects.nonNull(department.getId())) {
+            if (Objects.nonNull(department.getId()) && department.getId() != 0) {
                 criteria.andIdEqualTo(department.getId());
             }
 
@@ -70,7 +70,19 @@ public class EasSysDepartmentServiceImpl implements EasSysDepartmentService {
             }
 
             if (Objects.nonNull(department.getCreateTime())) {
-                criteria.andCreateTimeGreaterThan(department.getCreateTime());
+                criteria.andCreateTimeGreaterThanOrEqualTo(department.getCreateTime());
+            }
+
+            if (Objects.nonNull(department.getModifyTime())) {
+                criteria.andModifyTimeGreaterThanOrEqualTo(department.getModifyTime());
+            }
+
+            if (Objects.nonNull(department.getCreateUid()) && department.getCreateUid() != 0) {
+                criteria.andCreateUidEqualTo(department.getCreateUid());
+            }
+
+            if (StringUtils.hasText(department.getDisabled())) {
+                criteria.andDisabledEqualTo(department.getDisabled());
             }
         }
         List<EasSysDepartment> departments =

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

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-public class EasSysSysPermissionServiceImpl implements EasSysPermissionService {
+public class EasSysPermissionServiceImpl implements EasSysPermissionService {
 
     @Resource
     EasSysPermissionMapper easSysPermissionMapper;
@@ -41,26 +41,34 @@ public class EasSysSysPermissionServiceImpl implements EasSysPermissionService {
     public PageData query(EasSysPermission permission) {
         EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
         EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
-        if ( Objects.nonNull(permission) ) {
+        if (Objects.nonNull(permission)) {
 
-            if (Objects.nonNull(permission.getId())) {
+            if (Objects.nonNull(permission.getId()) && permission.getId() != 0) {
                 criteria.andIdEqualTo(permission.getId());
             }
 
-            if (Objects.nonNull(permission.getIsActive())) {
+            if (Objects.nonNull(permission.getIsActive()) && permission.getIsActive() != 0) {
                 criteria.andIsActiveEqualTo(permission.getIsActive());
             }
 
-            if (StringUtils.hasText(permission.getDisabled())) {
-                criteria.andDisabledEqualTo(permission.getDisabled());
-            }
-
             if (StringUtils.hasText(permission.getName())) {
                 criteria.andNameLike("%" + permission.getName() + "%");
             }
 
             if (Objects.nonNull(permission.getCreateTime())) {
-                criteria.andCreateTimeGreaterThan(permission.getCreateTime());
+                criteria.andCreateTimeGreaterThanOrEqualTo(permission.getCreateTime());
+            }
+
+            if (Objects.nonNull(permission.getModifyTime())) {
+                criteria.andModifyTimeGreaterThanOrEqualTo(permission.getModifyTime());
+            }
+
+            if (Objects.nonNull(permission.getCreateUid()) && permission.getCreateUid() != 0) {
+                criteria.andCreateUidEqualTo(permission.getCreateUid());
+            }
+
+            if (StringUtils.hasText(permission.getDisabled())) {
+                criteria.andDisabledEqualTo(permission.getDisabled());
             }
         }
         List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);

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

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-public class EasSysSysUserInfoServiceImpl implements EasSysUserInfoService {
+public class EasSysUserInfoServiceImpl implements EasSysUserInfoService {
 
     @Resource
     EasSysUserinfoMapper easSysUserinfoMapper;
@@ -62,7 +62,7 @@ public class EasSysSysUserInfoServiceImpl implements EasSysUserInfoService {
         EasSysUserinfoExample.Criteria criteria = easSysUserinfoExample.createCriteria();
         if (Objects.nonNull(userinfo)) {
 
-            if (Objects.nonNull(userinfo.getId())) {
+            if (Objects.nonNull(userinfo.getId()) && userinfo.getId() != 0) {
                 criteria.andIdEqualTo(userinfo.getId());
             }
 
@@ -91,7 +91,19 @@ public class EasSysSysUserInfoServiceImpl implements EasSysUserInfoService {
             }
 
             if (Objects.nonNull(userinfo.getCreateTime())) {
-                criteria.andCreateTimeGreaterThan(userinfo.getCreateTime());
+                criteria.andCreateTimeGreaterThanOrEqualTo(userinfo.getCreateTime());
+            }
+
+            if (Objects.nonNull(userinfo.getModifyTime())) {
+                criteria.andModifyTimeGreaterThanOrEqualTo(userinfo.getModifyTime());
+            }
+
+            if (Objects.nonNull(userinfo.getCreateUid()) && userinfo.getCreateUid() != 0) {
+                criteria.andCreateUidEqualTo(userinfo.getCreateUid());
+            }
+
+            if (StringUtils.hasText(userinfo.getDisabled())) {
+                criteria.andDisabledEqualTo(userinfo.getDisabled());
             }
 
         }

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

@@ -6,13 +6,16 @@ import com.koobietech.eas.common.service.RedisService;
 import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 import com.koobietech.eas.service.LoginRedisService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 @Service
 public class LoginRedisServiceImpl implements LoginRedisService {
 
-    @Autowired
-    RedisService redisService;
+    @Resource
+    private RedisService redisService;
 
 
     @Override
@@ -26,15 +29,19 @@ public class LoginRedisServiceImpl implements LoginRedisService {
     }
 
     @Override
-    public UserDetail checkRefreshToken(JwtUserDto jwtUserDto) {
-        String jwtKey = createJwtTokenKey(jwtUserDto);
-
-        return (UserDetail) redisService.get(jwtKey);
+    public void loginSaveCache(String redisTokenKey, UserDetail userDetailInRedis, Integer token_expires) {
+        redisService.set(redisTokenKey, userDetailInRedis, token_expires);
     }
 
+
     @Override
-    public void loginSaveCache(String redisTokenKey, UserDetail userDetailInRedis, Integer token_expires) {
-        redisService.set(redisTokenKey, userDetailInRedis, token_expires);
+    public UserDetail loginGetCache(String newRedisTokenKey) {
+        //看看redis里面有没有这个key
+        if (redisService.hasKey(newRedisTokenKey)) {
+            //有的话，就从redis里面取出来
+            return (UserDetail) redisService.get(newRedisTokenKey);
+        }
+        return null;
     }
 
     @Override
@@ -48,4 +55,9 @@ public class LoginRedisServiceImpl implements LoginRedisService {
         //根据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);
+    }
 }