Merge branch 'cuidi' into wheng

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

@@ -0,0 +1,65 @@
+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.mbg.model.EasEduClassroom;
+import com.koobietech.eas.service.EasEduClassroomService;
+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("/classroom")
+public class EasEduClassroomController {
+    @Resource
+    EasEduClassroomService easEduClassroomService;
+
+
+    @PostMapping("/query")
+    @Operation(summary = "查询教室", description = "根据参数查询教室表信息")
+    public JsonPageResult query(@RequestBody EasEduClassroom classroom,
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easEduClassroomService.query(classroom);
+        return JsonPageResult.data(ret);
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "添加教室", description = "用于添加教室信息")
+    public JsonResult add(@RequestBody EasEduClassroom classroom) {
+        Boolean ret = easEduClassroomService.add(classroom);
+        if (ret) {
+            return JsonResult.data(ret);
+        }
+        return JsonResult.fail();
+    }
+
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除教室", description = "删除教室信息表数据根据ID")
+    public JsonResult delete(@RequestParam Integer id) {
+        Boolean ret = easEduClassroomService.delete(id);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+
+    @PutMapping("/update")
+    @Operation(summary = "更新教室", description = "更新教室信息")
+    public JsonResult update(@RequestBody EasEduClassroom classroom) {
+        Boolean ret = easEduClassroomService.update(classroom);
+        if (ret) {
+            return JsonResult.ok();
+        }
+        return JsonResult.fail();
+    }
+
+
+}

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/EasDepartmentController.java → controller/src/main/java/com/koobietech/eas/controller/EasSysDepartmentController.java

@@ -5,7 +5,7 @@ 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.EasSysDepartment;
-import com.koobietech.eas.service.EasDepartmentService;
+import com.koobietech.eas.service.EasSysDepartmentService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -16,25 +16,25 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "部门模块")
 @RequestMapping("/department")
-public class EasDepartmentController {
+public class EasSysDepartmentController {
 
     @Resource
-    EasDepartmentService easDepartmentService;
+    EasSysDepartmentService easSysDepartmentService;
 
 
     @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 = easDepartmentService.query(department);
+        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 = easDepartmentService.add(department);
+        Boolean ret = easSysDepartmentService.add(department);
         if (ret) {
             return JsonResult.data(ret);
         }
@@ -42,10 +42,10 @@ public class EasDepartmentController {
     }
 
 
-    @DeleteMapping("/delete/{id}")
-    @Operation(summary = "删除部门" ,  description = "删除部门根据ID")
-    public JsonResult delete(@PathVariable(name="id") Long id) {
-        Boolean ret = easDepartmentService.delete(id);
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除部门", description = "删除部门表数据根据ID")
+    public JsonResult delete(@RequestParam Long id) {
+        Boolean ret = easSysDepartmentService.delete(id);
         if (ret) {
             return JsonResult.ok();
         }
@@ -54,9 +54,9 @@ public class EasDepartmentController {
 
 
     @PutMapping("/update")
-    @Operation(summary = "更新部门" ,  description = "更新部门信息根据ID")
+    @Operation(summary = "更新部门", description = "更新部门信息")
     public JsonResult update(@RequestBody EasSysDepartment department) {
-        Boolean ret = easDepartmentService.update(department);
+        Boolean ret = easSysDepartmentService.update(department);
         if (ret) {
             return JsonResult.ok();
         }

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

@@ -5,7 +5,7 @@ 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.EasSysPermission;
-import com.koobietech.eas.service.EasPermissionService;
+import com.koobietech.eas.service.EasSysPermissionService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -16,45 +16,45 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "权限模块")
 @RequestMapping("/permission")
-public class EasPermissionController {
+public class EasSysPermissionController {
 
     @Resource
-    EasPermissionService easPermissionService;
+    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 = easPermissionService.query(permission);
+        PageData ret = easSysPermissionService.query(permission);
         return JsonPageResult.data(ret);
     }
 
     @PostMapping("/add")
-    @Operation(summary = "添加权限" ,  description = "录入权限表基本信息")
-    public JsonResult add(@RequestBody EasSysPermission permission){
-        Boolean ret = easPermissionService.add(permission);
-        if(ret){
+    @Operation(summary = "添加权限", description = "录入权限表基本信息")
+    public JsonResult add(@RequestBody EasSysPermission permission) {
+        Boolean ret = easSysPermissionService.add(permission);
+        if (ret) {
             return JsonResult.ok();
         }
         return JsonResult.fail();
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除权限" ,  description = "删除权限表数据根据ID")
-    public JsonResult delete(@RequestParam Integer id){
-        Boolean ret = easPermissionService.delete(id);
-        if(ret){
+    @Operation(summary = "删除权限", description = "删除权限表数据根据ID")
+    public JsonResult delete(@RequestParam Integer id) {
+        Boolean ret = easSysPermissionService.delete(id);
+        if (ret) {
             return JsonResult.ok();
         }
         return JsonResult.fail();
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新权限" ,  description = "根据ID 更新权限表信息")
-    public JsonResult update(@RequestBody EasSysPermission permission){
-        Boolean ret = easPermissionService.update(permission);
-        if(ret){
+    @Operation(summary = "更新权限", description = "更新权限表信息")
+    public JsonResult update(@RequestBody EasSysPermission permission) {
+        Boolean ret = easSysPermissionService.update(permission);
+        if (ret) {
             return JsonResult.ok();
         }
         return JsonResult.fail();

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

@@ -4,7 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
-import com.koobietech.eas.service.EasUserInfoService;
+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.*;
@@ -14,15 +14,15 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "用户信息模块")
 @RequestMapping("/userinfo")
-public class EasUserInfoController {
+public class EasSysUserInfoController {
 
     @Resource
-    EasUserInfoService easUserInfoService;
+    EasSysUserInfoService easSysUserInfoService;
 
     @PostMapping("/add")
     @Operation(summary = "添加用户信息", description = "录入基本用户信息")
     public JsonResult add(@RequestBody EasSysUserinfo userinfo) {
-        Boolean ret = easUserInfoService.add(userinfo);
+        Boolean ret = easSysUserInfoService.add(userinfo);
         if (ret) {
             return JsonResult.ok();
         }
@@ -30,9 +30,9 @@ public class EasUserInfoController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除用户信息",description = "删除用户信息表数据根据ID")
+    @Operation(summary = "删除用户信息", description = "删除用户信息表数据根据ID")
     public JsonResult delete(@RequestParam Long id) {
-        Boolean ret = easUserInfoService.delete(id);
+        Boolean ret = easSysUserInfoService.delete(id);
         if (ret) {
             return JsonResult.ok();
         }
@@ -40,9 +40,9 @@ public class EasUserInfoController {
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新用户信息",description = "更新用户信息表信息")
+    @Operation(summary = "更新用户信息", description = "更新用户信息表信息")
     public JsonResult update(@RequestBody EasSysUserinfo userinfo) {
-        Boolean ret = easUserInfoService.update(userinfo);
+        Boolean ret = easSysUserInfoService.update(userinfo);
         if (ret) {
             return JsonResult.ok();
         }
@@ -50,11 +50,11 @@ public class EasUserInfoController {
     }
 
     @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);
-        PageData ret = easUserInfoService.query(userinfo);
+        PageData ret = easSysUserInfoService.query(userinfo);
         return JsonResult.data(ret);
     }
 }

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

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false

controller/src/main/resources/application.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 spring:
   profiles:
     active: local

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;
+}

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

@@ -0,0 +1,14 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasEduClassroom;
+
+public interface EasEduClassroomService {
+    PageData query(EasEduClassroom classroom);
+
+    Boolean add(EasEduClassroom classroom);
+
+    Boolean delete(Integer id);
+
+    Boolean update(EasEduClassroom classroom);
+}

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/EasDepartmentService.java → service/src/main/java/com/koobietech/eas/service/EasSysDepartmentService.java

@@ -4,10 +4,13 @@ import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 
 
-public interface EasDepartmentService {
+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/EasPermissionService.java → service/src/main/java/com/koobietech/eas/service/EasSysPermissionService.java

@@ -3,10 +3,13 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 
-public interface EasPermissionService {
+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/EasUserInfoService.java → service/src/main/java/com/koobietech/eas/service/EasSysUserInfoService.java

@@ -3,7 +3,7 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 
-public interface EasUserInfoService {
+public interface EasSysUserInfoService {
 
     Boolean add(EasSysUserinfo userinfo);
 

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

@@ -0,0 +1,104 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasEduClassroomMapper;
+import com.koobietech.eas.mbg.model.EasEduClassroom;
+import com.koobietech.eas.mbg.model.EasEduClassroomExample;
+import com.koobietech.eas.service.EasEduClassroomService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class EasEduClassroomServiceImpl implements EasEduClassroomService {
+    @Resource
+    EasEduClassroomMapper easEduClassroomMapper;
+
+    @Override
+    public Boolean update(EasEduClassroom classroom) {
+        classroom.setModifyTime(new Date());
+        return easEduClassroomMapper.updateByPrimaryKey(classroom) == 1;
+    }
+
+    @Override
+    public Boolean add(EasEduClassroom classroom) {
+        classroom.setCreateTime(new Date());
+        classroom.setModifyTime(new Date());
+        return easEduClassroomMapper.insert(classroom) == 1;
+    }
+
+    @Override
+    public Boolean delete(Integer id) {
+        return easEduClassroomMapper.deleteByPrimaryKey(id) == 1;
+    }
+
+    @Override
+    public PageData query(EasEduClassroom classroom) {
+
+        EasEduClassroomExample easEduClassroomExample = new EasEduClassroomExample();
+        EasEduClassroomExample.Criteria criteria = easEduClassroomExample.createCriteria();
+        if (Objects.nonNull(classroom)) {
+
+            if (Objects.nonNull(classroom.getId()) && classroom.getId() != 0) {
+                criteria.andIdEqualTo(classroom.getId());
+            }
+
+            if (StringUtils.hasText(classroom.getName())) {
+                criteria.andAddressLike("%" + classroom.getName() + "%");
+            }
+
+            if (StringUtils.hasText(classroom.getAddress())) {
+                criteria.andAddressLike("%" + classroom.getAddress() + "%");
+            }
+
+            if (Objects.nonNull(classroom.getManagerId()) && classroom.getManagerId() != 0) {
+                criteria.andManagerLike("%" + classroom.getManagerId() + "%");
+            }
+
+            if (StringUtils.hasText(classroom.getManager())) {
+                criteria.andManagerLike("%" + classroom.getManager() + "%");
+            }
+
+            if (Objects.nonNull(classroom.getFloor()) && classroom.getFloor() != 0) {
+                criteria.andFloorEqualTo(classroom.getFloor());
+            }
+            if (Objects.nonNull(classroom.getCapacity()) && classroom.getCapacity() != 0) {
+                criteria.andCapacityEqualTo(classroom.getCapacity());
+            }
+
+            if (StringUtils.hasText(classroom.getComment())) {
+                criteria.andCommentLike("%" + classroom.getComment() + "%");
+            }
+
+            if (Objects.nonNull(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());
+            }
+
+
+        }
+        List<EasEduClassroom> classrooms =
+                easEduClassroomMapper.selectByExample(easEduClassroomExample);
+        long l = easEduClassroomMapper.countByExample(easEduClassroomExample);
+        PageData ret = new PageData();
+        ret.setData(classrooms);
+        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/EasDepartmentServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasSysDepartmentServiceImpl.java

@@ -4,7 +4,7 @@ import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.mapper.EasSysDepartmentMapper;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.mbg.model.EasSysDepartmentExample;
-import com.koobietech.eas.service.EasDepartmentService;
+import com.koobietech.eas.service.EasSysDepartmentService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -15,7 +15,7 @@ import java.util.Objects;
 
 
 @Service
-public class EasDepartmentServiceImpl implements EasDepartmentService {
+public class EasSysDepartmentServiceImpl implements EasSysDepartmentService {
 
     @Resource
     EasSysDepartmentMapper easSysDepartmentMapper;
@@ -44,30 +44,49 @@ public class EasDepartmentServiceImpl implements EasDepartmentService {
         EasSysDepartmentExample departmentExample = new EasSysDepartmentExample();
         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());
             }
+
             if (StringUtils.hasText(department.getAddress())) {
                 criteria.andAddressLike("%" + department.getAddress() + "%");
             }
+
             if (StringUtils.hasText(department.getDepname())) {
                 criteria.andDepnameLike("%" + department.getDepname() + "%");
             }
+
             if (StringUtils.hasText(department.getEmail())) {
                 criteria.andEmailLike("%" + department.getEmail() + "%");
             }
+
             if (StringUtils.hasText(department.getManager())) {
                 criteria.andManagerLike("%" + department.getManager() + "%");
             }
+
             if (StringUtils.hasText(department.getPhone())) {
                 criteria.andPhoneLike("%" + department.getPhone() + "%");
             }
+
             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 =
-                 easSysDepartmentMapper.selectByExample(departmentExample);
+                easSysDepartmentMapper.selectByExample(departmentExample);
         long l = easSysDepartmentMapper.countByExample(departmentExample);
         PageData ret = new PageData();
         ret.setData(departments);

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

@@ -4,7 +4,7 @@ import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.mapper.EasSysPermissionMapper;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.mbg.model.EasSysPermissionExample;
-import com.koobietech.eas.service.EasPermissionService;
+import com.koobietech.eas.service.EasSysPermissionService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-public class EasPermissionServiceImpl implements EasPermissionService {
+public class EasSysPermissionServiceImpl implements EasSysPermissionService {
 
     @Resource
     EasSysPermissionMapper easSysPermissionMapper;
@@ -41,21 +41,34 @@ public class EasPermissionServiceImpl implements EasPermissionService {
     public PageData query(EasSysPermission permission) {
         EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
         EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
-        if ( Objects.nonNull(permission) ) {
-            if (Objects.nonNull(permission.getId())) {
+        if (Objects.nonNull(permission)) {
+
+            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/EasUserInfoServiceImpl.java → service/src/main/java/com/koobietech/eas/service/impl/EasSysUserInfoServiceImpl.java

@@ -4,22 +4,23 @@ import com.koobietech.eas.common.result.PageData;
 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.EasUserInfoService;
+import com.koobietech.eas.service.EasSysUserInfoService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
 @Service
-public class EasUserInfoServiceImpl implements EasUserInfoService {
+public class EasSysUserInfoServiceImpl implements EasSysUserInfoService {
 
     @Resource
     EasSysUserinfoMapper easSysUserinfoMapper;
 
     final String userInfoName = "admin";
+
     @Override
     public Boolean add(EasSysUserinfo userinfo) {
         //给用户信息设置默认密码
@@ -29,7 +30,7 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
         return easSysUserinfoMapper.insert(userinfo) == 1;
     }
 
-    public EasSysUserinfo getUserById(Long id){
+    public EasSysUserinfo getUserById(Long id) {
         return easSysUserinfoMapper.selectByPrimaryKey(id);
     }
 
@@ -37,7 +38,7 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
     public Boolean delete(Long id) {
         //判断是否为admin用户信息，admin用户信息禁止删除
         EasSysUserinfo userinfo = getUserById(id);
-        if ( userinfo.getUsername().equals(userInfoName) ) {
+        if (userinfo.getUsername().equals(userInfoName)) {
             return false;
         }
         return easSysUserinfoMapper.deleteByPrimaryKey(id) == 1;
@@ -47,8 +48,8 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
     public Boolean update(EasSysUserinfo userinfo) {
         //判断是否为admin用户信息，admin用户信息中的Username禁止修改
         EasSysUserinfo user = getUserById(userinfo.getId());
-        if ( user.getUsername().equals(userInfoName) ) {
-            userinfo.setUsername( user.getUsername() );
+        if (user.getUsername().equals(userInfoName)) {
+            userinfo.setUsername(user.getUsername());
         }
         userinfo.setModifyTime(new Date());
         return easSysUserinfoMapper.updateByPrimaryKey(userinfo) == 1;
@@ -59,37 +60,50 @@ public class EasUserInfoServiceImpl implements EasUserInfoService {
 
         EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
         EasSysUserinfoExample.Criteria criteria = easSysUserinfoExample.createCriteria();
-        if(Objects.nonNull(userinfo)) {
-            if(Objects.nonNull(userinfo.getId())){
+        if (Objects.nonNull(userinfo)) {
+
+            if (Objects.nonNull(userinfo.getId()) && userinfo.getId() != 0) {
                 criteria.andIdEqualTo(userinfo.getId());
             }
 
-            if(Objects.nonNull(userinfo.getPhone())){
-                criteria.andPhoneEqualTo(userinfo.getPhone());
+            if (StringUtils.hasText(userinfo.getPhone())) {
+                criteria.andPhoneLike("%" + userinfo.getPhone() + "%");
+            }
+
+            if (StringUtils.hasText(userinfo.getPasswd())) {
+                criteria.andPasswdLike("%" + userinfo.getPasswd() + "%");
+            }
+
+            if (StringUtils.hasText(userinfo.getEmail())) {
+                criteria.andEmailLike("%" + userinfo.getEmail() + "%");
+            }
+
+            if (StringUtils.hasText(userinfo.getRelname())) {
+                criteria.andRelnameLike("%" + userinfo.getRelname() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getPasswd())){
-                criteria.andPasswdEqualTo(userinfo.getPasswd());
+            if (StringUtils.hasText(userinfo.getUsername())) {
+                criteria.andUsernameLike("%" + userinfo.getUsername() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getEmail())){
-                criteria.andEmailEqualTo(userinfo.getEmail());
+            if (StringUtils.hasText(userinfo.getAddress())) {
+                criteria.andAddressLike("%" + userinfo.getAddress() + "%");
             }
 
-            if(Objects.nonNull(userinfo.getRelname())){
-                criteria.andRelnameEqualTo(userinfo.getRelname());
+            if (Objects.nonNull(userinfo.getCreateTime())) {
+                criteria.andCreateTimeGreaterThanOrEqualTo(userinfo.getCreateTime());
             }
 
-            if(Objects.nonNull(userinfo.getUsername())){
-                criteria.andUsernameEqualTo(userinfo.getUsername());
+            if (Objects.nonNull(userinfo.getModifyTime())) {
+                criteria.andModifyTimeGreaterThanOrEqualTo(userinfo.getModifyTime());
             }
 
-            if(Objects.nonNull(userinfo.getAddress())){
-                criteria.andAddressEqualTo(userinfo.getAddress());
+            if (Objects.nonNull(userinfo.getCreateUid()) && userinfo.getCreateUid() != 0) {
+                criteria.andCreateUidEqualTo(userinfo.getCreateUid());
             }
 
-            if(Objects.nonNull(userinfo.getCreateTime())){
-                criteria.andCreateTimeEqualTo(userinfo.getCreateTime());
+            if (StringUtils.hasText(userinfo.getDisabled())) {
+                criteria.andDisabledEqualTo(userinfo.getDisabled());
             }
 
         }