brynhild 2 éve
szülő
commit
f5b0220ef6

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+/target/**

+ 14 - 4
src/main/java/com/main/service/impl/DocumentServiceImpl.java

@@ -20,6 +20,7 @@ import org.brynhild.common.utils.TimeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -65,7 +66,7 @@ public class DocumentServiceImpl implements IDocumentService {
         if(!category.getOwnerId().equals(tokenValidateResult.getUserId().longValue())){
             return new Result(false,StatusCode.ERROR,"分类不存在或查询失败");
         }
-        return new Result(true,StatusCode.OK,"查询成功",category);
+        return new Result(true,StatusCode.OK,"查询成功",new CategoryResponse(category));
     }
 
     @Override
@@ -78,7 +79,10 @@ public class DocumentServiceImpl implements IDocumentService {
         if(categoryList==null){
             return new Result(false,StatusCode.ERROR,"查询失败");
         }
-        return new Result(true,StatusCode.OK,"查询成功",categoryList);
+        List<CategoryResponse> categoryResponses=new ArrayList<CategoryResponse>(){{
+            categoryList.forEach(k->this.add(new CategoryResponse(k)));
+        }};
+        return new Result(true,StatusCode.OK,"查询成功",categoryResponses);
     }
 
     @Override
@@ -151,7 +155,10 @@ public class DocumentServiceImpl implements IDocumentService {
             return new Result(false,StatusCode.ERROR,"没有该分类的操作权限");
         }
         final List<FileEntity> fileEntityList = fileRepository.findByCategoryId(info.getCategoryId());
-        return new Result(true,StatusCode.OK,"查询成功",fileEntityList);
+        List<FileResponse> fileResponses=new ArrayList<FileResponse>(){{
+            fileEntityList.forEach(file -> this.add(new FileResponse(file)));
+        }};
+        return new Result(true,StatusCode.OK,"查询成功",fileResponses);
     }
 
     @Override
@@ -161,7 +168,10 @@ public class DocumentServiceImpl implements IDocumentService {
             return new Result(false, StatusCode.ERROR, "身份验证失败");
         }
         final List<FileEntity> fileEntityList = fileRepository.findByKeyWord(info.getKeyword(), tokenValidateResult.getUserId().longValue());
-        return new Result(true,StatusCode.OK,"查询成功",fileEntityList);
+        List<FileResponse> fileResponses=new ArrayList<FileResponse>(){{
+            fileEntityList.forEach(file -> this.add(new FileResponse(file)));
+        }};
+        return new Result(true,StatusCode.OK,"查询成功",fileResponses);
     }
 
     @Override

+ 19 - 0
src/main/java/com/main/transfer/document/CategoryResponse.java

@@ -0,0 +1,19 @@
+package com.main.transfer.document;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.main.entity.acuta.Category;
+import lombok.Data;
+
+@Data
+public class CategoryResponse {
+    private String id;
+    private String name;
+    @JsonProperty("owner_id")
+    private String ownerId;
+
+    public CategoryResponse(Category category){
+        this.id=category.getId()+"";
+        this.name=category.getName();
+        this.ownerId=category.getOwnerId()+"";
+    }
+}

+ 32 - 0
src/main/java/com/main/transfer/document/FileResponse.java

@@ -0,0 +1,32 @@
+package com.main.transfer.document;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.main.entity.acuta.FileEntity;
+import lombok.Data;
+
+@Data
+public class FileResponse {
+    private String id;
+    @JsonProperty("category_id")
+    private String categoryId;
+    private String name;
+    @JsonProperty("upload_time")
+    private String uploadTime;
+    private String resource;
+    private String content;
+    @JsonProperty("file_id")
+    private String fileId;
+    @JsonProperty("owner_id")
+    private String ownerId;
+
+    public FileResponse(FileEntity file){
+        this.id=file.getId()+"";
+        this.categoryId=file.getCategoryId()+"";
+        this.name=file.getName();
+        this.uploadTime=file.getUploadTime();
+        this.resource=file.getResource();
+        this.content=file.getContent();
+        this.fileId=file.getFileId()+"";
+        this.ownerId=file.getOwnerId()+"";
+    }
+}

+ 3 - 3
target/classes/application.yaml

@@ -1,6 +1,6 @@
-#logging:
-#  level:
-#    root: OFF
+logging:
+  level:
+    root: OFF
 
 server:
   port: 8081

BIN
target/classes/com/main/config/GlobalCrossConfig.class


BIN
target/classes/com/main/entity/Task.class


BIN
target/classes/com/main/repository/acuta/CategoryRepository.class


BIN
target/classes/com/main/repository/acuta/FileRepository.class


BIN
target/classes/com/main/schedule/AutoActiveTask.class


BIN
target/classes/com/main/service/impl/DocumentServiceImpl.class


BIN
target/classes/com/main/service/impl/StudentServiceImpl.class


BIN
target/classes/com/main/service/impl/TeacherServiceImpl$4.class


BIN
target/classes/com/main/service/impl/TeacherServiceImpl.class


BIN
target/classes/com/main/transfer/teacher/vo/AddTask.class


+ 5 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -5,6 +5,7 @@ com\main\service\IStudentService.class
 com\main\constant\TaskFileConstant.class
 com\main\controller\StudentController.class
 com\main\transfer\rpc\bo\TextItem.class
+com\main\service\impl\DocumentServiceImpl$2.class
 com\main\transfer\document\FindCategoryById.class
 com\main\constant\TaskConstant.class
 com\main\service\impl\TeacherServiceImpl$3.class
@@ -36,8 +37,11 @@ com\main\caller\TokenValidateCaller$1.class
 com\main\executor\PythonAlgorithmExecutor.class
 com\main\repository\TaskRepository.class
 com\main\entity\acuta\FileEntity.class
+com\main\service\impl\DocumentServiceImpl$3.class
+com\main\transfer\document\CategoryResponse.class
 com\main\executor\PythonAlgorithmExecutor$TaskReviewer.class
 com\main\entity\TaskKeyword.class
+com\main\transfer\document\FileResponse.class
 com\main\caller\GoServiceCaller.class
 com\main\transfer\document\DeleteCategoryById.class
 com\main\transfer\teacher\vo\AddTask.class
@@ -66,6 +70,7 @@ com\main\service\internal\IInternalTaskService.class
 com\main\transfer\teacher\vo\QueryTaskInfo.class
 com\main\service\impl\DocumentServiceImpl.class
 com\main\config\RedisConfig.class
+com\main\service\impl\DocumentServiceImpl$1.class
 com\main\transfer\rpc\bo\TokenValidateResult.class
 com\main\transfer\student\vo\QueryTaskInfo.class
 com\main\controller\RPCController.class

+ 2 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -59,7 +59,9 @@ C:\Users\Orange\Desktop\智助教\src\main\java\com\main\transfer\rpc\bo\TokenVa
 C:\Users\Orange\Desktop\智助教\src\main\java\com\main\util\TimeUtil.java
 C:\Users\Orange\Desktop\智助教\src\main\java\com\main\controller\StudentController.java
 C:\Users\Orange\Desktop\智助教\src\main\java\com\main\tag\caller\RPCConsumer.java
+C:\Users\Orange\Desktop\智助教\src\main\java\com\main\transfer\document\FileResponse.java
 C:\Users\Orange\Desktop\智助教\src\main\java\com\main\controller\RPCController.java
+C:\Users\Orange\Desktop\智助教\src\main\java\com\main\transfer\document\CategoryResponse.java
 C:\Users\Orange\Desktop\智助教\src\main\java\com\main\transfer\document\DeleteFileById.java
 C:\Users\Orange\Desktop\智助教\src\main\java\com\main\entity\TaskFile.java
 C:\Users\Orange\Desktop\智助教\src\main\java\com\main\transfer\document\FindFileByCategoryId.java

BIN
target/teach.jar