Merge branch 'release_gdghg' of ssh://gitlab.gsstcloud.com:10022/poc/poc-api into release_gdghg

src/main/java/cn/com/poc/law/service/impl/AiLawServiceImpl.java

@@ -128,7 +128,7 @@ public class AiLawServiceImpl implements AiLawService {
             List<Tool> tools = AgentApplicationTools.buildFunctionConfig(null, "N", dialoguesId, dialoguesId, unitIds, "N");
             CheckPluginUseEntity checkPluginUseEntity = AgentApplicationTools.checkPluginUse(messages, tools, null);
             FunctionCallResult functionCallResult = checkPluginUseEntity.getFunctionCallResult();
-            if (functionCallResult != null) {
+            if (functionCallResult != null && functionCallResult.isNeed()) {
                 FunctionCall functionCall = functionCallResult.getFunctionCall();
                 if ("web_search".equals(functionCall.getName())) {
                     AbstractFunctionResult<List<WebSearchFunctionResult>> functionResult = webSearchFunction.doFunction(functionCall.getArguments(), dialoguesId, null, null);

src/main/java/cn/com/poc/long_document/aggregate/impl/LongTextDialoguesServiceImpl.java

@@ -613,7 +613,7 @@ public class LongTextDialoguesServiceImpl implements LongTextDialoguesService {
             List<Tool> tools = AgentApplicationTools.buildFunctionConfig(null, "N", dialoguesId, dialoguesId, unitIds, "N");
             CheckPluginUseEntity checkPluginUseEntity = AgentApplicationTools.checkPluginUse(messages, tools, null);
             FunctionCallResult functionCallResult = checkPluginUseEntity.getFunctionCallResult();
-            if (functionCallResult != null) {
+            if (functionCallResult != null && functionCallResult.isNeed()) {
                 FunctionCall functionCall = functionCallResult.getFunctionCall();
                 if (functionCallResult.isNeed() && functionCall != null && "web_search".equals(functionCall.getName())) {
                     AbstractFunctionResult<List<WebSearchFunctionResult>> functionResult = webSearchFunction.doFunction(functionCall.getArguments(), dialoguesId, null, null);

src/main/java/cn/com/poc/portal/aggregate/impl/PortalServiceImpl.java

@@ -143,7 +143,7 @@ public class PortalServiceImpl implements PortalService {
             List<Tool> tools = AgentApplicationTools.buildFunctionConfig(null, "N", callEntity.getDialoguesId(), callEntity.getDialoguesId(), unitIds, "N");
             CheckPluginUseEntity checkPluginUseEntity = AgentApplicationTools.checkPluginUse(messages, tools, null);
             FunctionCallResult functionCallResult = checkPluginUseEntity.getFunctionCallResult();
-            if (functionCallResult != null) {
+            if (functionCallResult != null && functionCallResult.isNeed()) {
                 FunctionCall functionCall = functionCallResult.getFunctionCall();
                 if ("web_search".equals(functionCall.getName())) {
                     AbstractFunctionResult<List<WebSearchFunctionResult>> functionResult = webSearchFunction.doFunction(functionCall.getArguments(), callEntity.getDialoguesId(), null, null);

src/main/java/cn/com/poc/writing/aggregate/ExaminationService.java

@@ -47,8 +47,19 @@ public interface ExaminationService {
 
     /**
      * 批量删除
+     *
      * @param examinationIds 试卷ID
-     * @param userId 用户ID
+     * @param userId         用户ID
      */
     boolean batchDelete(List<String> examinationIds, Long userId);
+
+
+    /**
+     * 试卷文件下载
+     *
+     * @param examinationId 试卷id
+     * @param userId        用户id
+     * @return 下载地址
+     */
+    String downloadExamination(String examinationId, Long userId);
 }

src/main/java/cn/com/poc/writing/aggregate/impl/AiWritingServiceImpl.java

@@ -236,7 +236,7 @@ public class AiWritingServiceImpl implements AiWritingService {
             List<Tool> tools = AgentApplicationTools.buildFunctionConfig(null, "N", dialoguesId, dialoguesId, unitIds, "N");
             CheckPluginUseEntity checkPluginUseEntity = AgentApplicationTools.checkPluginUse(messages, tools, null);
             FunctionCallResult functionCallResult = checkPluginUseEntity.getFunctionCallResult();
-            if (functionCallResult != null) {
+            if (functionCallResult != null && functionCallResult.isNeed()) {
                 FunctionCall functionCall = functionCallResult.getFunctionCall();
                 if (functionCallResult.isNeed() && functionCall != null && "web_search".equals(functionCall.getName())) {
                     AbstractFunctionResult<List<WebSearchFunctionResult>> functionResult = webSearchFunction.doFunction(functionCall.getArguments(), dialoguesId, null, null);

src/main/java/cn/com/poc/writing/convert/BizExaminationConvert.java

@@ -20,6 +20,8 @@ public class BizExaminationConvert {
         entity.setLanguage(model.getLanguage());
         entity.setPositions(model.getPositions());
         entity.setExaminationDetail(model.getExaminationDetail());
+        entity.setFileUrl(model.getFileUrl());
+        entity.setContent(model.getContent());
         entity.setIsDeleted(model.getIsDeleted());
         entity.setCreator(model.getCreator());
         entity.setCreatedTime(model.getCreatedTime());
@@ -42,6 +44,8 @@ public class BizExaminationConvert {
         model.setLanguage(entity.getLanguage());
         model.setPositions(entity.getPositions());
         model.setExaminationDetail(entity.getExaminationDetail());
+        model.setFileUrl(entity.getFileUrl());
+        model.setContent(entity.getContent());
         model.setIsDeleted(entity.getIsDeleted());
         model.setCreator(entity.getCreator());
         model.setCreatedTime(entity.getCreatedTime());
@@ -64,6 +68,8 @@ public class BizExaminationConvert {
         dto.setLanguage(entity.getLanguage());
         dto.setPositions(entity.getPositions());
         dto.setExaminationDetail(entity.getExaminationDetail());
+        dto.setFileUrl(entity.getFileUrl());
+        dto.setContent(entity.getContent());
         dto.setIsDeleted(entity.getIsDeleted());
         dto.setCreator(entity.getCreator());
         dto.setCreatedTime(entity.getCreatedTime());
@@ -86,6 +92,8 @@ public class BizExaminationConvert {
         entity.setLanguage(dto.getLanguage());
         entity.setPositions(dto.getPositions());
         entity.setExaminationDetail(dto.getExaminationDetail());
+        entity.setFileUrl(dto.getFileUrl());
+        entity.setContent(dto.getContent());
         entity.setIsDeleted(dto.getIsDeleted());
         entity.setCreator(dto.getCreator());
         entity.setCreatedTime(dto.getCreatedTime());

src/main/java/cn/com/poc/writing/dto/BizExaminationDto.java

@@ -135,6 +135,30 @@ public class BizExaminationDto {
     
     public void setExaminationDetail(java.lang.String examinationDetail){
         this.examinationDetail = examinationDetail;
+    }
+	/** file_url
+    *文件地址
+    */ 
+    private java.lang.String fileUrl;
+
+    public java.lang.String getFileUrl(){
+        return this.fileUrl;
+    }
+    
+    public void setFileUrl(java.lang.String fileUrl){
+        this.fileUrl = fileUrl;
+    }
+	/** content
+    *输入文本
+    */ 
+    private java.lang.String content;
+
+    public java.lang.String getContent(){
+        return this.content;
+    }
+    
+    public void setContent(java.lang.String content){
+        this.content = content;
     }
 	/** is_deleted
     *是否删除 Y 是  N 否

src/main/java/cn/com/poc/writing/dto/ExaminationDto.java

@@ -29,6 +29,36 @@ public class ExaminationDto {
 
     private String positions;
 
+    private List<String> questionType;
+
+    private String content;
+
+    private String fileUrl;
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    public List<String> getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(List<String> questionType) {
+        this.questionType = questionType;
+    }
+
     public Integer getTotalScore() {
         return totalScore;
     }

src/main/java/cn/com/poc/writing/entity/BizExaminationEntity.java

@@ -135,6 +135,30 @@ public class BizExaminationEntity {
     
     public void setExaminationDetail(java.lang.String examinationDetail){
         this.examinationDetail = examinationDetail;
+    }
+	/** file_url
+    *文件地址
+    */ 
+    private java.lang.String fileUrl;
+
+    public java.lang.String getFileUrl(){
+        return this.fileUrl;
+    }
+    
+    public void setFileUrl(java.lang.String fileUrl){
+        this.fileUrl = fileUrl;
+    }
+	/** content
+    *输入文本
+    */ 
+    private java.lang.String content;
+
+    public java.lang.String getContent(){
+        return this.content;
+    }
+    
+    public void setContent(java.lang.String content){
+        this.content = content;
     }
 	/** is_deleted
     *是否删除 Y 是  N 否

src/main/java/cn/com/poc/writing/entity/ExaminationEntity.java

@@ -23,8 +23,38 @@ public class ExaminationEntity {
 
     private String positions;
 
+    private List<String> questionType;
+
     private List<ExaminationDetail> examinationDetails;
 
+    private String content;
+
+    private String fileUrl;
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    public List<String> getQuestionType() {
+        return questionType;
+    }
+
+    public void setQuestionType(List<String> questionType) {
+        this.questionType = questionType;
+    }
+
     public Integer getTotalScore() {
         return totalScore;
     }

src/main/java/cn/com/poc/writing/model/BizExaminationModel.java

@@ -202,6 +202,38 @@ public class BizExaminationModel extends BaseModelClass implements Serializable
     }
     
   
+    /** file_url
+    *文件地址
+    */ 
+    private java.lang.String fileUrl;
+    
+    @Column(name = "file_url",length = 150)
+    public java.lang.String getFileUrl(){
+        return this.fileUrl;
+    }
+    
+    public void setFileUrl(java.lang.String fileUrl){
+        this.fileUrl = fileUrl;
+        super.addValidField("fileUrl");
+    }
+    
+  
+    /** content
+    *输入文本
+    */ 
+    private java.lang.String content;
+    
+    @Column(name = "content",length = 2147483647)
+    public java.lang.String getContent(){
+        return this.content;
+    }
+    
+    public void setContent(java.lang.String content){
+        this.content = content;
+        super.addValidField("content");
+    }
+    
+  
     /** is_deleted
     *是否删除 Y 是  N 否
     */ 

src/main/java/cn/com/poc/writing/rest/ExaminationRest.java

@@ -59,4 +59,11 @@ public interface ExaminationRest extends BaseRest {
      */
     void batchDelete(@RequestBody ExaminationBatchDeleteDto dto);
 
+    /**
+     * 试卷文件下载
+     *
+     * @param examinationId 试卷ID
+     */
+    String downloadExamination(@RequestParam(value = "examinationId") String examinationId);
+
 }

src/main/java/cn/com/poc/writing/rest/impl/ExaminationRestImpl.java

@@ -48,9 +48,10 @@ public class ExaminationRestImpl implements ExaminationRest {
         Assert.notBlank(generateExaminationDto.getLanguage());
         Assert.notBlank(generateExaminationDto.getTitle());
         Assert.notBlank(generateExaminationDto.getLevel());
-        Assert.notBlank(generateExaminationDto.getPositions());
+//        Assert.notBlank(generateExaminationDto.getPositions());
         Assert.notEmpty(generateExaminationDto.getQuestionType());
         Assert.notNull(generateExaminationDto.getN());
+        Assert.isTrue(generateExaminationDto.getN() <= 20,"总题数不可大于20题");
 
         UserBaseEntity currentUser = BlContext.getCurrentUser();
         GenerateExaminationEntity generateExaminationEntity = new GenerateExaminationEntity();
@@ -89,11 +90,18 @@ public class ExaminationRestImpl implements ExaminationRest {
 
     @Override
     public void batchDelete(ExaminationBatchDeleteDto dto) {
-        Assert.notEmpty(dto.getExaminationIds(),"删除ID不能为空");
+        Assert.notEmpty(dto.getExaminationIds(), "删除ID不能为空");
         UserBaseEntity currentUser = BlContext.getCurrentUser();
         boolean deleted = examinationService.batchDelete(dto.getExaminationIds(), currentUser.getUserId());
-        if (!deleted){
+        if (!deleted) {
             throw new BusinessException("删除异常");
         }
     }
+
+    @Override
+    public String downloadExamination(String examinationId) {
+        Assert.notBlank(examinationId, "examinationId 不能为空");
+        UserBaseEntity currentUser = BlContext.getCurrentUser();
+        return examinationService.downloadExamination(examinationId, currentUser.getUserId());
+    }
 }

src/test/java/cn/com/poc/examination/ExaminationTest.java

@@ -204,4 +204,14 @@ public class ExaminationTest {
         String query;
         Long userId;
     }
+
+    @Test
+    public void text_genereateExaminationFile() {
+        String examinationId = "EXAMINATION_75ad7043b8064640a3eb222a0c6ab59b";
+        Long userId = 198L;
+
+        String url = examinationService.downloadExamination(examinationId, userId);
+        System.out.println(url);
+
+    }
 }