Merge branch 'master' into superb

common/pom.xml

@@ -14,6 +14,10 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>

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

@@ -31,6 +31,13 @@ public class AdminLoginController {
     @Operation(summary = "管理员登录",  description = "用户名和密码为请求载荷，若登录成功，返回两token")
     public JsonResult adminLogin(@RequestBody AdminPojo adminPojo){
 
+        CaptchaVO captchaVO = new CaptchaVO();
+        captchaVO.setCaptchaVerification( adminPojo.getCaptchaVerification() );
+        ResponseModel response = captchaService.verification(captchaVO);
+        if (!response.isSuccess()) {
+            throw new EasException( response.getRepMsg() , Integer.parseInt(response.getRepCode()));
+        }
+
         LoginToken result = adminLoginService.adminLogin(adminPojo);
 
         return JsonResult.data(result);
@@ -61,16 +68,4 @@ public class AdminLoginController {
         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/EasDepartmentController.java

@@ -1,67 +0,0 @@
-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.EasSysDepartment;
-import com.koobietech.eas.service.EasDepartmentService;
-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("/department")
-public class EasDepartmentController {
-
-    @Resource
-    EasDepartmentService easDepartmentService;
-
-
-    @PostMapping("/query")
-    @Operation(summary = "查询部门" ,  description = "根据参数查询基本信息")
-    public JsonPageResult query(@RequestBody EasSysDepartment department,
-                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ) {
-        PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easDepartmentService.query(department);
-        return JsonPageResult.data(ret);
-    }
-
-    @PostMapping("/add")
-    @Operation(summary = "添加部门" ,  description = "添加部门信息")
-    public JsonResult add(@RequestBody EasSysDepartment department) {
-        Boolean ret = easDepartmentService.add(department);
-        if (ret) {
-            return JsonResult.data(ret);
-        }
-        return JsonResult.fail();
-    }
-
-
-    @DeleteMapping("/delete/{id}")
-    @Operation(summary = "删除部门" ,  description = "删除部门根据ID")
-    public JsonResult delete(@PathVariable(name="id") Long id) {
-        Boolean ret = easDepartmentService.delete(id);
-        if (ret) {
-            return JsonResult.ok();
-        }
-        return JsonResult.fail();
-    }
-
-
-    @PutMapping("/update")
-    @Operation(summary = "更新部门" ,  description = "更新部门信息根据ID")
-    public JsonResult update(@RequestBody EasSysDepartment department) {
-        Boolean ret = easDepartmentService.update(department);
-        if (ret) {
-            return JsonResult.ok();
-        }
-        return JsonResult.fail();
-    }
-
-
-}

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

@@ -1,62 +0,0 @@
-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.EasSysPermission;
-import com.koobietech.eas.service.EasPermissionService;
-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("/permission")
-public class EasPermissionController {
-
-    @Resource
-    EasPermissionService easPermissionService;
-
-    @PostMapping("/query")
-    @Operation(summary = "查询权限" ,  description = "根据参数查询基本权限表信息")
-    public JsonPageResult query(@RequestBody(required = false) EasSysPermission permission,
-                                @RequestParam Integer pageNum, @RequestParam Integer pageSize ){
-        PageHelper.startPage(pageNum, pageSize);
-        PageData ret = easPermissionService.query(permission);
-        return JsonPageResult.data(ret);
-    }
-
-    @PostMapping("/add")
-    @Operation(summary = "添加权限" ,  description = "录入权限表基本信息")
-    public JsonResult add(@RequestBody EasSysPermission permission){
-        Boolean ret = easPermissionService.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){
-            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){
-            return JsonResult.ok();
-        }
-        return JsonResult.fail();
-    }
-}

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/Pojo/AdminPojo.java

@@ -6,5 +6,5 @@ import lombok.Data;
 public class AdminPojo {
     private String username;
     private String passwd;
-
+    private String captchaVerification;
 }

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClass.java

@@ -6,11 +6,11 @@ import java.util.Date;
 
 public class EasEduClass implements Serializable {
     /**
-     * 学员ID
+     * 班级ID
      *
      * @mbg.generated
      */
-    @Schema(description = "学员ID")
+    @Schema(description = "班级ID")
     private Long id;
 
     /**

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

@@ -1,13 +0,0 @@
-package com.koobietech.eas.service;
-
-import com.koobietech.eas.common.result.PageData;
-import com.koobietech.eas.mbg.model.EasSysDepartment;
-
-
-public interface EasDepartmentService {
-
-    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

@@ -1,12 +0,0 @@
-package com.koobietech.eas.service;
-
-import com.koobietech.eas.common.result.PageData;
-import com.koobietech.eas.mbg.model.EasSysPermission;
-
-public interface EasPermissionService {
-
-    Boolean update(EasSysPermission record);
-    Boolean add(EasSysPermission record);
-    Boolean delete(Integer id);
-    PageData query(EasSysPermission permission);
-}

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

@@ -1,77 +0,0 @@
-package com.koobietech.eas.service.impl;
-
-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 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 EasDepartmentServiceImpl implements EasDepartmentService {
-
-    @Resource
-    EasSysDepartmentMapper easSysDepartmentMapper;
-
-    @Override
-    public Boolean update(EasSysDepartment department) {
-        department.setModifyTime(new Date());
-        return easSysDepartmentMapper.updateByPrimaryKey(department) == 1;
-    }
-
-    @Override
-    public Boolean add(EasSysDepartment department) {
-        department.setCreateTime(new Date());
-        department.setModifyTime(new Date());
-        return easSysDepartmentMapper.insert(department) == 1;
-    }
-
-    @Override
-    public Boolean delete(Long id) {
-        return easSysDepartmentMapper.deleteByPrimaryKey(id) == 1;
-    }
-
-    @Override
-    public PageData query(EasSysDepartment department) {
-
-        EasSysDepartmentExample departmentExample = new EasSysDepartmentExample();
-        EasSysDepartmentExample.Criteria criteria = departmentExample.createCriteria();
-        if (Objects.nonNull(department)) {
-            if (Objects.nonNull(department.getId())) {
-                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());
-            }
-        }
-        List<EasSysDepartment> departments =
-                 easSysDepartmentMapper.selectByExample(departmentExample);
-        long l = easSysDepartmentMapper.countByExample(departmentExample);
-        PageData ret = new PageData();
-        ret.setData(departments);
-        ret.setTotal(l);
-        return ret;
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.koobietech.eas.service.impl;
-
-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 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 EasPermissionServiceImpl implements EasPermissionService {
-
-    @Resource
-    EasSysPermissionMapper easSysPermissionMapper;
-
-    @Override
-    public Boolean update(EasSysPermission permission) {
-        permission.setModifyTime(new Date());
-        return easSysPermissionMapper.updateByPrimaryKey(permission) == 1;
-    }
-
-    @Override
-    public Boolean add(EasSysPermission permission) {
-        permission.setCreateTime(new Date());
-        permission.setModifyTime(new Date());
-        return easSysPermissionMapper.insert(permission) == 1;
-    }
-
-    @Override
-    public Boolean delete(Integer id) {
-        return easSysPermissionMapper.deleteByPrimaryKey(id) == 1;
-    }
-
-    @Override
-    public PageData query(EasSysPermission permission) {
-        EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
-        EasSysPermissionExample.Criteria criteria = easSysPermissionExample.createCriteria();
-        if ( Objects.nonNull(permission) ) {
-            if (Objects.nonNull(permission.getId())) {
-                criteria.andIdEqualTo(permission.getId());
-            }
-            if (Objects.nonNull(permission.getIsActive())) {
-                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());
-            }
-        }
-        List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
-        long l = easSysPermissionMapper.countByExample(easSysPermissionExample);
-        PageData ret = new PageData();
-        ret.setData(easSysPermissions);
-        ret.setTotal(l);
-        return ret;
-    }
-}