合并代码

common/src/main/java/com/koobietech/eas/common/constant/Disabled.java

@@ -0,0 +1,6 @@
+package com.koobietech.eas.common.constant;
+
+public enum Disabled {
+        N,
+        Y
+}

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

@@ -70,7 +70,7 @@ public class JwtManager {
             jwtUserDto.setUsername(verify.getClaim("user").asString());
             jwtUserDto.setType(UserType.valueOf(verify.getClaim("type").asString()));
         } catch ( JWTVerificationException e){
-            throw new EasException("token 不正确!");
+            //throw new EasException("token 不正确!");
         }
         return jwtUserDto;
     }

controller/pom.xml

@@ -14,6 +14,10 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-spring-boot-starter</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>

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

@@ -0,0 +1,115 @@
+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.EasEduCategory;
+import com.koobietech.eas.service.EasEduCategoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@Tag(name = "课程分类控制器")
+public class EasEduCategoryController {
+
+    @Resource
+    EasEduCategoryService easEduCategoryService;
+
+    /**
+     * 添加类别
+     * @param easEduCategory
+     * @return
+     */
+    @PostMapping(value = "/addEasEduCategory")
+    @Operation(summary = "添加课程类别" , description = "用于添加课程类别")
+    public JsonResult addEasEduCategory(@RequestBody EasEduCategory easEduCategory ){
+        int add = easEduCategoryService.addEasEduCategory( easEduCategory );
+        System.out.println( add );
+        return JsonResult.ok("添加成功");
+    }
+
+    /**
+     * 更新
+     * @param easEduCategory
+     * @return
+     */
+    @PostMapping(value = "/updateEasEduCategory")
+    @Operation(summary = "课程类别更新" , description = "用于课程类别更新")
+    public JsonResult updateEasEduCategory(@RequestBody EasEduCategory easEduCategory){
+        int i = easEduCategoryService.updateEasEduCategory( easEduCategory );
+        if (i > 0){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+
+    /**
+     * 根据 Id 删除
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/deleteById/{id}")
+    @Operation(summary = "根据Id删除课程类别" , description = "用于根据Id删除课程类别")
+    public JsonResult deleteById(@PathVariable Integer id){
+        int i = easEduCategoryService.deleteById(id);
+        if (i > 0){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+
+    /**
+     * id 查询
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/selectById")
+    @Operation(summary = "根据Id查询对应课程类别" , description = "用于根据Id查询课程类别")
+    public JsonResult selectById(Integer id){
+        EasEduCategory easEduCategory = easEduCategoryService.selectById(id);
+        System.out.println(
+                Disabled.valueOf(easEduCategory.getDisabled())
+        );
+        return JsonResult.data( easEduCategory );
+    }
+
+    /**
+     * 查询全部课程
+     * @return
+     */
+    @GetMapping(value = "/selectAll")
+    @Operation(summary = "查询全部课程类别" , description = "用于查询全部课程类别")
+    public JsonResult selectAll(){
+        List<EasEduCategory> easEduCategories = easEduCategoryService.selectAll();
+        return JsonResult.data( easEduCategories );
+    }
+
+    /**
+     * 通过条件查询课程
+     * @param easEduCategory
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping(value = "/selectByCondition")
+    @Operation(summary = "根据条件进行查询课程类别", description = "用于根据条件查询课程类别")
+    public JsonPageResult selectByCondition(@RequestBody EasEduCategory easEduCategory,
+                                            @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData pageData = easEduCategoryService.selectByCondition(easEduCategory);
+        return JsonPageResult.data( pageData );
+    }
+}

controller/src/main/java/com/koobietech/eas/controller/EasEduSubjectsController.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.EasEduCategory;
+import com.koobietech.eas.mbg.model.EasEduSubjects;
+import com.koobietech.eas.service.EasEduSubjectsService;
+import io.swagger.v3.core.util.Json;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Tag(name = "课程控制器")
+@RequestMapping("/subject")
+public class EasEduSubjectsController {
+
+    @Resource
+    EasEduSubjectsService easEduSubjectsService;
+
+    /**
+     * 添加课程
+     * @param easEduSubjects
+     * @return
+     */
+    @PostMapping(value = "/addSubject")
+    @Operation(summary = "添加课程" , description = "用于添加课程")
+    public JsonResult addSubject( @RequestBody EasEduSubjects easEduSubjects){
+        int addSubject = easEduSubjectsService.addSubject(easEduSubjects);
+        System.out.println(addSubject);
+        return JsonResult.ok("添加成功!");
+    }
+
+    /**
+     * 修改课程
+     * @param easEduSubjects
+     * @return
+     */
+    @PostMapping(value = "/updateSubjects")
+    @Operation(summary = "修改课程" , description = "用于修改课程")
+    public JsonResult updateSubjects( @RequestBody EasEduSubjects easEduSubjects){
+        int update_i = easEduSubjectsService.updateSubjects(easEduSubjects);
+        if (update_i > 0){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+
+    /**
+     * 删除课程
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/deleteSubjects/{id}")
+    @Operation(summary = "删除课程",description = "用于删除课程")
+    public JsonResult deleteSubjects(@PathVariable Integer id){
+        int delete_i = easEduSubjectsService.deleteSubjects(id);
+        if (delete_i > 0){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+
+    /**
+     * 根据 id 进行查询
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/selectById")
+    @Operation(summary = "id查询课程" ,description = "根据id查询课程")
+    public JsonResult selectById(Integer id){
+        EasEduSubjects easEduSubjects = easEduSubjectsService.selectById(id);
+        System.out.println(
+                Disabled.valueOf(easEduSubjects.getDisabled())
+        );
+        return JsonResult.data( easEduSubjects );
+    }
+
+    /**
+     * 查询所有课程及其信息
+     * @return
+     */
+    @GetMapping(value = "/selectAll")
+    @Operation(summary = "查询所有课程",description = "用于查询所有课程")
+    public JsonResult selectAll(){
+        List<EasEduSubjects> easEduSubjects = easEduSubjectsService.selectAll();
+        return JsonResult.data( easEduSubjects );
+    }
+
+    /**
+     * 通过条件查询课程
+     * @param easEduSubjects
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping(value = "/selectByCondition")
+    @Operation(summary = "根据条件进行查询课程", description = "用于根据条件查询课程")
+    public JsonPageResult selectByCondition(@RequestBody EasEduSubjects easEduSubjects,
+                                            @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData pageData = easEduSubjectsService.selectByCondition(easEduSubjects);
+        return JsonPageResult.data( pageData );
+    }
+}

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

@@ -1,10 +1,10 @@
 server:
-  port: 8081
+  port: 8080
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+    url: jdbc:mysql://127.0.0.1:13306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
     username: root
-    password: 1234
+    password: 0JZBdtlYoiOepddh
     driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
     host: localhost

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

@@ -1,38 +1,64 @@
 package com.koobietech.eas.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.handler.inter.IWriter;
 import com.koobietech.eas.common.constant.UserType;
 import com.koobietech.eas.common.pojo.JwtUserDto;
 import com.koobietech.eas.common.service.RedisService;
 import com.koobietech.eas.common.utils.JwtManager;
 import com.koobietech.eas.common.utils.PasswordManager;
+import com.koobietech.eas.mbg.model.EasSysLogs;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.*;
 
 
 @SpringBootTest
 class ControllerApplicationTests {
 
-    @Resource
-    RedisService redisService;
-
-    @Resource
-    JwtManager jwtManager;
-
     @Test
-    void contextLoads() {
-
-        JwtUserDto jwtUserDto = new JwtUserDto();
-
-        jwtUserDto.setType(UserType.TEACHER);
-        jwtUserDto.setId(12L);
-        jwtUserDto.setUsername("李四");
-
-        String jwt = jwtManager.createJwt(jwtUserDto);
-        redisService.set("jwttoken", jwt);
-
+    void contextLoads() throws IOException {
+//        List<Map> list = new ArrayList<>();
+//        Workbook workbook = null;
+//        ExportParams params = new ExportParams("大数据测试", "测试");
+//
+//        List<ExcelExportEntity> entity = new ArrayList<ExcelExportEntity>();
+//        entity.add(new ExcelExportEntity("ID", "id"));
+//        entity.add(new ExcelExportEntity("级别", "level"));
+//        entity.add(new ExcelExportEntity("日志", "logger"));
+//        entity.add(new ExcelExportEntity("消息", "message"));
+//        entity.add(new ExcelExportEntity("时间", "timestamp"));
+//        entity.add(new ExcelExportEntity("异常", "exception"));
+//
+//        Map<String, Object> map = new HashMap<>();
+//        for (int i = 0; i < 10000; i++) {
+//            map.put("id", i);
+//            map.put("level", "ERROR");
+//            map.put("logger", "发生错误" + i);
+//            map.put("message", "这里是消息");
+//            map.put("timestamp", new Date());
+//            map.put("exception", "异常信息");
+//            list.add(map);
+//        }
+//        workbook = ExcelExportUtil.exportExcel(params, entity, list);
+//        list.clear();
+//        File savefile = new File("C:/Users/lc/Desktop");
+//        if (!savefile.exists()) {
+//            savefile.mkdirs();
+//        }
+//        FileOutputStream fos = new FileOutputStream("C:/Users/lc/Desktop/bigDataExport.xlsx");
+//        workbook.write(fos);
+//        fos.close();
 
 
     }

pom.xml

@@ -33,11 +33,22 @@
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <spring-data-redis.version>2.7.3</spring-data-redis.version>
         <knife4j.version>4.1.0</knife4j.version>
+        <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>
     </properties>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-spring-boot-starter</artifactId>
+                <version>${easypoi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-security</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>

security/pom.xml

@@ -25,7 +25,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>com.koobietech.eas</groupId>

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

@@ -41,12 +41,11 @@ public class EasSecurityFilter extends OncePerRequestFilter {
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        //在这里添加Token判断
-        System.out.println("EasSecurityFilter");
+
         //从请求里面拿到token
         String token = request.getHeader("Authorization");
         //判断token是否存在
-        if (StringUtils.hasText(token)) {
+        if (StringUtils.hasText(token) && false) {
             //解析token成JwtUserDto
             JwtUserDto jwtUserDto = jwtManager.decodeJwt(token);
             //判断token是否有效

service/pom.xml

@@ -39,10 +39,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-crypto</artifactId>
-            <version>5.6.1</version>
-            <scope>compile</scope>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
     </dependencies>
 

service/src/main/java/com/koobietech/eas/service/EasEduCategoryService.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 org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface EasEduCategoryService {
+
+    int addEasEduCategory( EasEduCategory easEduCategory );
+
+    int updateEasEduCategory( EasEduCategory easEduCategory );
+
+    int deleteById(int id);
+
+    EasEduCategory selectById( Integer id );
+
+    List<EasEduCategory> selectAll();
+
+    PageData selectByCondition(EasEduCategory easEduCategory );
+
+}

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

@@ -0,0 +1,21 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasEduSubjects;
+
+import java.util.List;
+
+public interface EasEduSubjectsService {
+
+    int addSubject(EasEduSubjects easEduSubjects);
+
+    int updateSubjects(EasEduSubjects easEduSubjects);
+
+    int deleteSubjects( int id );
+
+    EasEduSubjects selectById( Integer id );
+
+    List<EasEduSubjects> selectAll();
+
+    PageData selectByCondition(EasEduSubjects easEduSubjects);
+}

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

@@ -47,19 +47,18 @@ public class AdminLoginServiceImpl implements AdminLoginService {
             throw new EasException("用户不存在", 412);
         }
 
-        try {
-            EasSysUserinfo easSysUserinfo = findAdminByUsername(adminPojo.getUsername(), adminPojo.getPasswd());
-
-            // 接收到对象，根据这个信息去查询数据库，然后自定义sql查用户信息，存在redis里面当做token
-            System.out.println(easSysUserinfo);
-            //先获取id，进行枚举判断
-            Long id = easSysUserinfo.getId();
-            //先调用自定义sql查询detail类中的数据 最后把这个类封装到redis里面
-            UserDetail userDetailInRedis = adminLoginMapper.getUserDetailById(id);
-            System.out.println("接收前" + userDetailInRedis);
-            userDetailInRedis.setDepartments(adminLoginMapper.getUserDepartmentsById(id));
-            userDetailInRedis.setPermissions(adminLoginMapper.getUserPermissionsById(id));
-            System.out.println("接收后" + userDetailInRedis);
+        EasSysUserinfo easSysUserinfo = findAdminByUsername(adminPojo.getUsername(), adminPojo.getPasswd());
+
+        // 接收到对象，根据这个信息去查询数据库，然后自定义sql查用户信息，存在redis里面当做token
+        System.out.println(easSysUserinfo);
+        //先获取id，进行枚举判断
+        Long id = easSysUserinfo.getId();
+        //先调用自定义sql查询detail类中的数据 最后把这个类封装到redis里面
+        UserDetail userDetailInRedis = adminLoginMapper.getUserDetailById(id);
+        System.out.println("接收前" + userDetailInRedis);
+        userDetailInRedis.setDepartments(adminLoginMapper.getUserDepartmentsById(id));
+        userDetailInRedis.setPermissions(adminLoginMapper.getUserPermissionsById(id));
+        System.out.println("接收后" + userDetailInRedis);
 
             // 先调用自定义sql查询用户详细信息、部门信息 和 权限信息
             UserType userType = UserType.TEACHER;
@@ -82,9 +81,6 @@ public class AdminLoginServiceImpl implements AdminLoginService {
 
             // 登录成功
             return new LoginToken(token, refreshToken);
-        } catch (EasException e) {
-            throw new EasException("登录失败", 500);
-        }
     }
 
     @Override
@@ -116,7 +112,7 @@ public class AdminLoginServiceImpl implements AdminLoginService {
 
 
 
-    private EasSysUserinfo findAdminByUsername(String username, String password) throws EasException {
+    private EasSysUserinfo findAdminByUsername(String username, String password)  {
         EasSysUserinfoExample easSysUserinfoExample = new EasSysUserinfoExample();
         easSysUserinfoExample.createCriteria().andUsernameEqualTo(username);
         List<EasSysUserinfo> adminList = easSysUserinfoMapper.selectByExample(easSysUserinfoExample);
@@ -125,10 +121,10 @@ public class AdminLoginServiceImpl implements AdminLoginService {
         Optional<EasSysUserinfo> optionalAdmin = adminList.stream().findFirst();
 
         if (optionalAdmin.isEmpty()) {
-            throw new EasException("用户不存在", 409);
+            throw new EasException("用户不存在", 9902);
         }
         if (adminList.size() > 1) {
-            throw new EasException("用户不唯一", 410);
+            throw new EasException("用户数据异常", 9902);
         }
 
         EasSysUserinfo easSysUserinfo = optionalAdmin.get();
@@ -139,12 +135,13 @@ public class AdminLoginServiceImpl implements AdminLoginService {
         return easSysUserinfo;
     }
 
-    private void validatePassword(String inputPassword, String encryptedPassword) throws EasException {
+
+    private void validatePassword(String inputPassword, String encryptedPassword){
         String decryptedPassword = passwordManager.decryptPassword(inputPassword);
         System.out.println("前端解密来的decryptedPassword: " + decryptedPassword);
         System.out.println("数据库查到的密码easSysUserinfo.getPasswd(): " + encryptedPassword);
         if (!passwordEncoder.matches(decryptedPassword, encryptedPassword)) {
-            throw new EasException("密码错误", 411);
+            throw new EasException("密码不正确", 9901);
         }
     }
 }

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

@@ -0,0 +1,81 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasEduCategoryMapper;
+import com.koobietech.eas.mbg.model.EasEduCategory;
+import com.koobietech.eas.mbg.model.EasEduCategoryExample;
+import com.koobietech.eas.service.EasEduCategoryService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.Objects;
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class EasEduCategoryServiceImpl implements EasEduCategoryService {
+
+    @Resource
+    EasEduCategoryMapper easEduCategoryMapper;
+
+    @Override
+    public int addEasEduCategory(EasEduCategory easEduCategory) {
+        easEduCategory.setCreateTime(new Date());
+        easEduCategory.setModifyTime(new Date());
+       return  easEduCategoryMapper.insert(easEduCategory);
+    }
+
+    @Override
+    public int updateEasEduCategory(EasEduCategory easEduCategory) {
+        return easEduCategoryMapper.updateByPrimaryKey( easEduCategory );
+    }
+
+    @Override
+    public int deleteById(int id) {
+        return easEduCategoryMapper.deleteByPrimaryKey( id );
+    }
+
+    @Override
+    public EasEduCategory selectById(Integer id) {
+        System.out.println( "ID:" + id );
+        return easEduCategoryMapper.selectByPrimaryKey( id );
+    }
+
+    @Override
+    public List<EasEduCategory> selectAll() {
+        return easEduCategoryMapper.selectByExample(null);
+    }
+
+    @Override
+    public PageData selectByCondition(EasEduCategory easEduCategory) {
+        EasEduCategoryExample easEduCategoryExample = new EasEduCategoryExample();
+        EasEduCategoryExample.Criteria criteria = easEduCategoryExample.createCriteria();
+        if ( Objects.nonNull(easEduCategory) ) {
+            if (Objects.nonNull(easEduCategory.getId())) {
+                criteria.andIdEqualTo(easEduCategory.getId());
+            }
+            if (StringUtils.hasText(easEduCategory.getName())) {
+                criteria.andNameLike("%" + easEduCategory.getName() + "%");
+            }
+            if (StringUtils.hasText(easEduCategory.getDescription())) {
+                criteria.andDescriptionLike("%" + easEduCategory.getDescription() + "%");
+            }
+            if (Objects.nonNull(easEduCategory.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(easEduCategory.getCreateTime());
+            }
+            if (Objects.nonNull(easEduCategory.getModifyTime())) {
+                criteria.andCreateTimeGreaterThan(easEduCategory.getModifyTime());
+            }
+            if (Objects.nonNull(easEduCategory.getCreateUid())) {
+                criteria.andCreateUidEqualTo(easEduCategory.getCreateUid());
+            }
+            if (StringUtils.hasText(easEduCategory.getDisabled())) {
+                criteria.andDisabledEqualTo(easEduCategory.getDisabled());
+            }
+        }
+        List<EasEduCategory> easEduCategories = easEduCategoryMapper.selectByExample(easEduCategoryExample);
+        long l = easEduCategoryMapper.countByExample(easEduCategoryExample);
+        return PageData.init( easEduCategories, l );
+    }
+}

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

@@ -0,0 +1,86 @@
+package com.koobietech.eas.service.impl;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasEduSubjectsMapper;
+import com.koobietech.eas.mbg.model.EasEduCategoryExample;
+import com.koobietech.eas.mbg.model.EasEduSubjects;
+import com.koobietech.eas.mbg.model.EasEduSubjectsExample;
+import com.koobietech.eas.service.EasEduSubjectsService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import javax.xml.crypto.Data;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class EasEduSubjectsServiceImpl implements EasEduSubjectsService {
+
+    @Resource
+    EasEduSubjectsMapper easEduSubjectsMapper;
+
+
+    @Override
+    public int addSubject(EasEduSubjects easEduSubjects) {
+        easEduSubjects.setCreateTime(new Date());
+        easEduSubjects.setModifyTime(new Date());
+        return easEduSubjectsMapper.insert(easEduSubjects);
+    }
+
+    @Override
+    public int updateSubjects(EasEduSubjects easEduSubjects) {
+        return easEduSubjectsMapper.updateByPrimaryKey(easEduSubjects);
+    }
+
+    @Override
+    public int deleteSubjects(int id) {
+        return easEduSubjectsMapper.deleteByPrimaryKey( id );
+    }
+
+    @Override
+    public EasEduSubjects selectById(Integer id) {
+        System.out.println("Id" + id);
+        return easEduSubjectsMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<EasEduSubjects> selectAll() {
+        return easEduSubjectsMapper.selectByExample(null);
+    }
+
+    @Override
+    public PageData selectByCondition(EasEduSubjects easEduSubjects) {
+        EasEduSubjectsExample easEduSubjectsExample = new EasEduSubjectsExample();
+        EasEduSubjectsExample.Criteria criteria = easEduSubjectsExample.createCriteria();
+        if ( Objects.nonNull(easEduSubjects) ) {
+            if (Objects.nonNull(easEduSubjects.getId())) {
+                criteria.andIdEqualTo(easEduSubjects.getId());
+            }
+            if (StringUtils.hasText(easEduSubjects.getName())) {
+                criteria.andNameLike("%" + easEduSubjects.getName() + "%");
+            }
+//            if (StringUtils.hasText(easEduSubjects.getDescription())) {
+//                criteria.andDescriptionLike("%" + easEduSubjects.getDescription() + "%");
+//            }
+            if (Objects.nonNull(easEduSubjects.getCategoryId())){
+                criteria.andCategoryIdEqualTo(easEduSubjects.getCategoryId());
+            }
+            if (Objects.nonNull(easEduSubjects.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(easEduSubjects.getCreateTime());
+            }
+            if (Objects.nonNull(easEduSubjects.getModifyTime())) {
+                criteria.andCreateTimeGreaterThan(easEduSubjects.getModifyTime());
+            }
+            if (Objects.nonNull(easEduSubjects.getCreateUid())) {
+                criteria.andCreateUidEqualTo(easEduSubjects.getCreateUid());
+            }
+            if (StringUtils.hasText(easEduSubjects.getDisabled())) {
+                criteria.andDisabledEqualTo(easEduSubjects.getDisabled());
+            }
+        }
+        List<EasEduSubjects> easEduSubjects1 = easEduSubjectsMapper.selectByExample(easEduSubjectsExample);
+        long l = easEduSubjectsMapper.countByExample(easEduSubjectsExample);
+        return PageData.init(easEduSubjects1,l);
+    }
+}