Merge branch 'wheng' of wuheng/eas-system into master

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

@@ -23,11 +23,11 @@ public class ExceptionAdviceConfiguration {
     @ExceptionHandler(Exception.class)
     public JsonResult exceptionHandler(Exception e){
         StackTraceElement[] stackTrace = e.getStackTrace();
-        logger.error("<<<<<<<<<<<<<");
+        logger.error("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
         for (StackTraceElement element : stackTrace) {
             logger.error(element.toString());
         }
-        logger.error(">>>>>>>>>>>>>>");
+        logger.error(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
         return JsonResult.fail(e.getMessage(), 500);
     }
 
@@ -36,11 +36,11 @@ public class ExceptionAdviceConfiguration {
     @ExceptionHandler(EasException.class)
     public JsonResult exceptionHandler(EasException e){
         StackTraceElement[] stackTrace = e.getStackTrace();
-        logger.error("||||||||||||||||");
+        logger.error("||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||");
         for (StackTraceElement element : stackTrace) {
             logger.error(element.toString());
         }
-        logger.error("&&&&&&&&&&&&&&&&&");
+        logger.error("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&");
         return JsonResult.fail(e.getMessage(), e.getCode());
     }
 }

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

@@ -24,7 +24,7 @@ public class SwaggerConfiguration {
 
     @Bean
     public OpenAPI baseApi(@Value("${springdoc.version}") String appVersion){
-        OpenAPI openAPI = new OpenAPI();
+        OpenAPI openApi = new OpenAPI();
         //基本信息
         Info info = new Info().title("爱扣钉教务接口")
             .description("爱扣钉教务接口API文档，openapi3.0 接口，用于前端对接")
@@ -32,7 +32,7 @@ public class SwaggerConfiguration {
             .contact(new Contact().name("王雁"))
             .license(new License().name("使用请遵守 Apache 2.0 授权协议")
             .url("http://edu.koobietech.com"));
-        openAPI.info(info);
+        openApi.info(info);
         //授权信息
         SecurityScheme securityToken = new SecurityScheme()
                 .type(SecurityScheme.Type.HTTP)
@@ -40,11 +40,11 @@ public class SwaggerConfiguration {
                 .bearerFormat("JWT")
                 .in(SecurityScheme.In.HEADER)
                 .name("Authorization");
-        openAPI.components(new Components().securitySchemes(new HashMap<>(){{
-            put("Authorization", securityToken);
-        }}));
-        openAPI.addSecurityItem(new SecurityRequirement().addList("Authorization"));
-        return openAPI;
+        HashMap<String, SecurityScheme> authToken = new HashMap<>();
+        authToken.put("Authorization", securityToken);
+        openApi.components(new Components().securitySchemes(authToken));
+        openApi.addSecurityItem(new SecurityRequirement().addList("Authorization"));
+        return openApi;
     }
 
     @Bean

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

@@ -5,6 +5,7 @@ import com.koobietech.eas.service.EasArchiveFileDownloadService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,12 +17,13 @@ import javax.servlet.http.HttpServletResponse;
  */
 @Tag(name = "下载文件模块")
 @RestController
+@RequestMapping("/file")
 public class EasArcTlsFileDownloadController {
 
     @Resource
     EasArchiveFileDownloadService easArchiveFileDownloadService;
 
-    @GetMapping("/getArchiveFile")
+    @GetMapping("/getTokenById")
     @Operation(summary = "获取下载token", description = "前端传入archiveId，后端返回下载token")
     public JsonResult getFile(Integer archiveId) {
 

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

@@ -14,11 +14,11 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.List;
 import java.util.Objects;
 
 @RestController
 @Tag(name = "成绩控制器")
+@RequestMapping("/scores")
 public class EasArcTlsScoresController {
 
     @Resource
@@ -29,7 +29,7 @@ public class EasArcTlsScoresController {
      * @param easArcTlsScores
      * @return
      */
-    @PostMapping(value = "/addStudentScore")
+    @PostMapping(value = "/add")
     @Operation(summary = "添加学生成绩信息",description = "用于添加学生成绩信息")
     public JsonResult addStudentScore(@RequestBody EasArcTlsScores easArcTlsScores) {
         int i = easArcTlsScoresService.addStudentScore(easArcTlsScores);
@@ -42,7 +42,7 @@ public class EasArcTlsScoresController {
      * @param easArcTlsScores
      * @return
      */
-    @PutMapping(value = "/updateStudentScore")
+    @PutMapping(value = "/update")
     @Operation(summary = "修改学生成绩信息",description = "用于修改学生成绩信息")
     public JsonResult updateStudentScore(@RequestBody EasArcTlsScores easArcTlsScores) {
         int i = easArcTlsScoresService.updateStudentScore(easArcTlsScores);
@@ -53,17 +53,6 @@ public class EasArcTlsScoresController {
         }
     }
 
-    /**
-     * 查询所有学生成绩信息
-     * @return
-     */
-    @GetMapping(value = "/selectAllStudentScores")
-    @Operation(summary = "查询所有学生的成绩信息",description = "用于查询所有学生的成绩信息")
-    public JsonResult selectAllStudentScores() {
-        List<EasArcTlsScores> easArcTlsScores = easArcTlsScoresService.selectAllStudentScores();
-        return JsonResult.data(easArcTlsScores);
-    }
-
     /**
      * 条件查询学生成绩信息
      * @param easArcTlsScores
@@ -71,7 +60,7 @@ public class EasArcTlsScoresController {
      * @param pageSize
      * @return
      */
-    @PostMapping(value = "/selectScoreByExample")
+    @PostMapping(value = "/query")
     @Operation(summary = "条件查询学生成绩信息",description = "用于条件查询学生成绩信息")
     public JsonPageResult selectScoreByExample(@RequestBody EasArcTlsScores easArcTlsScores,
                                                @RequestParam Integer pageNum,@RequestParam Integer pageSize){
@@ -80,16 +69,16 @@ public class EasArcTlsScoresController {
         return JsonPageResult.data(pageDataResult);
     }
 
-    @PostMapping(value = "/importExcelScores")
+    @PostMapping(value = "/import")
     @Operation(summary = "Excel导入学生成绩信息",description = "用于Excel导入学生成绩信息")
     public JsonResult importExcelScores(MultipartFile excelFile) {
         InputStream inputStream = null;
-        Boolean aBoolean;
+        Boolean ret;
         try {
             inputStream = excelFile.getInputStream();
-            aBoolean = easArcTlsScoresService.importExcelScores(inputStream);
+            ret = easArcTlsScoresService.importExcelScores(inputStream);
         } catch (IOException e) {
-            aBoolean = false;
+            ret = false;
         } finally {
             try {
                 if (Objects.nonNull(inputStream) ) {
@@ -97,7 +86,7 @@ public class EasArcTlsScoresController {
                 }
             } catch (IOException e) {}
         }
-        if (aBoolean == true){
+        if (ret == true){
             return JsonResult.ok();
         }else {
             return JsonResult.fail();

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

@@ -12,10 +12,10 @@ 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("/category")
 public class EasEduCategoryController {
 
     @Resource
@@ -26,7 +26,7 @@ public class EasEduCategoryController {
      * @param easEduCategory
      * @return
      */
-    @PostMapping(value = "/addEasEduCategory")
+    @PostMapping(value = "/add")
     @Operation(summary = "添加课程类别" , description = "用于添加课程类别")
     public JsonResult addEasEduCategory(@RequestBody EasEduCategory easEduCategory ){
         int add = easEduCategoryService.addEasEduCategory( easEduCategory );
@@ -39,7 +39,7 @@ public class EasEduCategoryController {
      * @param easEduCategory
      * @return
      */
-    @PostMapping(value = "/updateEasEduCategory")
+    @PostMapping(value = "/update")
     @Operation(summary = "课程类别更新" , description = "用于课程类别更新")
     public JsonResult updateEasEduCategory(@RequestBody EasEduCategory easEduCategory){
         int i = easEduCategoryService.updateEasEduCategory( easEduCategory );
@@ -55,7 +55,7 @@ public class EasEduCategoryController {
      * @param id
      * @return
      */
-    @DeleteMapping(value = "/deleteById/{id}")
+    @DeleteMapping(value = "/delete/{id}")
     @Operation(summary = "根据Id删除课程类别" , description = "用于根据Id删除课程类别")
     public JsonResult deleteById(@PathVariable Integer id){
         int i = easEduCategoryService.deleteById(id);
@@ -81,17 +81,6 @@ public class EasEduCategoryController {
         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
@@ -99,7 +88,7 @@ public class EasEduCategoryController {
      * @param pageSize
      * @return
      */
-    @PostMapping(value = "/selectByCondition")
+    @PostMapping(value = "/query")
     @Operation(summary = "根据条件进行查询课程类别", description = "用于根据条件查询课程类别")
     public JsonPageResult selectByCondition(@RequestBody EasEduCategory easEduCategory,
                                             @RequestParam Integer pageNum, @RequestParam Integer pageSize) {

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

@@ -17,6 +17,7 @@ import java.util.List;
 
 @RestController
 @Tag(name = "班级控制器")
+@RequestMapping("/class")
 public class EasEduClassController {
 
     @Resource

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

@@ -21,6 +21,7 @@ import javax.annotation.Resource;
  */
 @Tag(name = "登陆模块")
 @RestController
+@RequestMapping("/login")
 public class EasSysUsersLoginController {
     @Resource
     private EasSysAdminLoginService adminLoginService;
@@ -63,7 +64,7 @@ public class EasSysUsersLoginController {
         return JsonResult.data(result);
     }
 
-    @GetMapping("getUserInfo")
+    @GetMapping("/getUserInfo")
     @Operation(summary = "获取用户信息", description = "根据token获取用户信息")
     public JsonResult getUserInfo(@RequestHeader("Authorization") String token) {
         return JsonResult.data(adminLoginService.getUserInfo(token));
@@ -76,13 +77,13 @@ public class EasSysUsersLoginController {
         return JsonResult.data(adminLoginService.refreshToken(refreshToken));
     }
 
-    @PostMapping("/verify.get")
+    @PostMapping("/verify/get")
     @Operation(summary = "获取验证码", description = "前端发起获取验证码请求，后端访问静态资源返回滑动图片")
     public JsonResult get(@RequestBody CaptchaVO captchaVO) {
         return  adminLoginService.verifyToJsonResult(captchaService.get(captchaVO)) ;
     }
 
-    @PostMapping("/verify.check")
+    @PostMapping("/verify/check")
     @Operation(summary = "核对验证码轨迹", description = "前端把用户的滑动轨迹转化成字符串传入后端，通过算法判断轨迹是否为真人")
     public JsonResult check(@RequestBody CaptchaVO captchaVO) {
         return adminLoginService.verifyToJsonResult(captchaService.check(captchaVO));

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

@@ -44,6 +44,11 @@ public class EasArchiveFileDownloadServiceImpl implements EasArchiveFileDownload
         String token = archiveId + "_" + timestamp + "_" + uniqueId;
         System.out.println("生成的file token 拼接版："+token);
         EasArcArchives easArcArchives = archivesMapper.selectByPrimaryKey(archiveId);
+
+        if (Objects.isNull(easArcArchives)) {
+            throw new EasException("文件不存在");
+        }
+
         // 获取文件路径
         String filePath = easArcArchives.getFilePath();