Merge branch 'dev' into 'master'

新增新闻翻译和标签统一接口

See merge request !8

src/main/java/com/nanyan/securitylink/controller/AIController.java

@@ -25,4 +25,9 @@ public class AIController {
     public Response<AIResponse> naturalDisasterTag(@RequestBody AIRequestDTO AIRequestDTO) {
         return Response.SUCCESS(aiService.naturalDisasterTag(AIRequestDTO));
     }
+
+    @PostMapping("/news/tag/translate")
+    public Response<AIResponse> newsTagAndTranslate(@RequestBody AIRequestDTO AIRequestDTO) {
+        return Response.SUCCESS(aiService.newsTagAndTranslate(AIRequestDTO));
+    }
 }

src/main/java/com/nanyan/securitylink/entity/Choice.java

@@ -7,5 +7,5 @@ public class Choice {
     private int index;
     private Message message;
     private Object logprobs; // logprobs is null in the JSON
-    private String finishReason;
+    private String finish_reason;
 }

src/main/java/com/nanyan/securitylink/service/AIService.java

 package com.nanyan.securitylink.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.nanyan.securitylink.dto.AIRequestDTO;
 import com.nanyan.securitylink.vo.AIResponse;
+import com.nanyan.securitylink.vo.CodeVO;
 
 public interface AIService {
-    AIResponse translate(AIRequestDTO AIRequestDTO);
-    AIResponse newsTags(AIRequestDTO AIRequestDTO);
+    AIResponse<String> translate(AIRequestDTO AIRequestDTO);
+    AIResponse<CodeVO> newsTags(AIRequestDTO AIRequestDTO);
 
-    AIResponse naturalDisasterTag(AIRequestDTO aiRequestDTO);
+    AIResponse<CodeVO> naturalDisasterTag(AIRequestDTO aiRequestDTO);
+
+    AIResponse<JSONObject> newsTagAndTranslate(AIRequestDTO aiRequestDTO);
 }

src/main/java/com/nanyan/securitylink/vo/AIResponse.java

@@ -3,13 +3,14 @@ package com.nanyan.securitylink.vo;
 import lombok.Data;
 
 @Data
-public class AIResponse {
+public class AIResponse<T> {
     private String event;
     private String task_id;
     private String id;
     private String message_id;
     private String mode;
     private String answer;
-    private ResultVO outputs;
+    private ResultVO<T> outputs;
     private long created_at;
+    private String finish_reason;
 }

src/main/java/com/nanyan/securitylink/vo/AnswerVO.java

+package com.nanyan.securitylink.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AnswerVO<T> {
+    List<T> result;
+    String finish_reason;
+}

src/main/java/com/nanyan/securitylink/vo/ResultVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class ResultVO {
-    List<CodeVO> result;
+public class ResultVO<T> {
+    List<T> result;
+    AnswerVO<T> answer;
 }