修改冲突拉最新master

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

@@ -25,9 +25,10 @@ public class AdminLoginController {
     private CaptchaService captchaService;
 
 
-    @RequestMapping("/adminLogin")
-    @Operation(summary = "管理员登录", description = "用户名和密码为请求载荷，若登录成功，返回两token")
-    public JsonResult adminLogin(@RequestBody AdminPojo adminPojo) {
+
+    @PostMapping("/adminLogin")
+    @Operation(summary = "管理员登录",  description = "用户名和密码为请求载荷，若登录成功，返回两token")
+    public JsonResult adminLogin(@RequestBody AdminPojo adminPojo){
 
         LoginToken result = adminLoginService.adminLogin(adminPojo);
 

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/EasUserController.java

@@ -21,7 +21,6 @@ public class EasUserController {
     @PostMapping("/test")
     @Operation(summary = "控制器测试用例" , description = "用于演示Swagger配置注解")
     public List<EasSysStudent> test(@RequestBody EasEduSubjects easEduSubjects){
-
         return demoService.test( easEduSubjects );
     }
 

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

@@ -1,25 +1,21 @@
 package com.koobietech.eas.security.filter;
 
 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.dao.adminLoginPojo.Permission;
 import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 import com.koobietech.eas.service.LoginRedisService;
-import org.springframework.http.*;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.FilterChain;
@@ -73,7 +69,6 @@ public class EasSecurityFilter extends OncePerRequestFilter {
                 // 将身份验证令牌设置到当前的 SecurityContext 中
                 context.setAuthentication(authenticationToken);
             }
-
             //放行
             filterChain.doFilter(request, response);
         }

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/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/LoginRedisServiceImpl.java

@@ -6,6 +6,7 @@ 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;
@@ -13,7 +14,7 @@ import javax.annotation.Resource;
 @Service
 public class LoginRedisServiceImpl implements LoginRedisService {
 
-    @Autowired
+    @Resource
     private RedisService redisService;