Merge remote-tracking branch 'origin/develop' into dev_shb

# Conflicts: # src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
2023-09-13 10:34:09 +08:00
parent 7a6d70c2cf 41111bc0e4
commit a08300f095
101 changed files with 1597 additions and 346 deletions
--- a/src/main/java/com/ai/da/controller/DesignController.java
+++ b/src/main/java/com/ai/da/controller/DesignController.java
@@ -3,7 +3,6 @@ package com.ai.da.controller;
 import com.ai.da.common.response.Response;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.DesignCollectionVO;
-import com.ai.da.model.vo.DesignItemDetailVO;
 import com.ai.da.model.vo.DesignLikeVO;
 import com.ai.da.service.DesignService;
 import com.alibaba.fastjson.JSONObject;
--- a/src/main/java/com/ai/da/controller/DesignDetailController.java
+++ b/src/main/java/com/ai/da/controller/DesignDetailController.java
@@ -1,8 +1,6 @@
 package com.ai.da.controller;

 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.entity.CollectionElement;
-import com.ai.da.mapper.entity.DesignItem;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.DesignItemService;
@@ -15,7 +13,6 @@ import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.math.BigDecimal;


@Api(tags = "design Detail模块")
@@ -44,8 +41,9 @@ public class DesignDetailController {
    }
    @ApiOperation(value = "查询design详情")
    @GetMapping("/getDetail")
-    public Response<DesignItemDetailVO> getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId) {
-        return Response.success(designService.detail(designItemId));
+    public Response<DesignItemDetailVO> getDetail(@ApiParam("designItemId") @RequestParam("designItemId") Long designItemId,
+                                                  @ApiParam("designPythonOutfitId") @RequestParam(value = "designPythonOutfitId",required = false) Long designPythonOutfitId) {
+        return Response.success(designService.detail(designPythonOutfitId,designItemId));
    }

    @ApiOperation(value = "切换系统的element")
--- a/src/main/java/com/ai/da/controller/GenerateController.java
+++ b/src/main/java/com/ai/da/controller/GenerateController.java
@@ -0,0 +1,49 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.GenerateLikeDTO;
+import com.ai.da.model.dto.GenerateThroughImageTextDTO;
+import com.ai.da.model.vo.GenerateCaptionVO;
+import com.ai.da.model.vo.GenerateCollectionVO;
+import com.ai.da.model.vo.GenerateLikeVO;
+import com.ai.da.service.GenerateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * @author XP
+ */
+@Api(tags = "Generate模块")
+@Slf4j
+@RestController
+@RequestMapping("/api/generate")
+public class GenerateController {
+
+    @Resource
+    private GenerateService generateService;
+
+    @ApiOperation("自动识别sketch的caption")
+    @PostMapping("/caption")
+    public Response<GenerateCaptionVO> generateCaption(@RequestParam  Long sketchElementId){
+        return Response.success(generateService.generateCaption(sketchElementId));
+    }
+
+
+    @ApiOperation("通过文字、图片生成图片")
+    @PostMapping("/sketchAndPrint")
+    public Response<GenerateCollectionVO> generateThroughImageText(@Valid @RequestBody GenerateThroughImageTextDTO generateThroughImageTextDTO){
+        return Response.success(generateService.generateThroughImageText(generateThroughImageTextDTO));
+    }
+
+    @ApiOperation("喜欢生成的图片")
+    @PostMapping("/like")
+    public Response<GenerateLikeVO> like(@Valid @RequestBody GenerateLikeDTO generateLikeDTO){
+        return Response.success(generateService.generateLike(generateLikeDTO));
+    }
+
+}
--- a/src/main/java/com/ai/da/controller/PythonController.java
+++ b/src/main/java/com/ai/da/controller/PythonController.java
@@ -3,23 +3,23 @@ package com.ai.da.controller;
 import com.ai.da.common.enums.CollectionLevel1TypeEnum;
 import com.ai.da.common.response.Response;
 import com.ai.da.common.utils.CopyUtil;
-import com.ai.da.common.utils.MD5Utils;
-import com.ai.da.model.dto.CollectionDeleteFileDTO;
-import com.ai.da.model.dto.CollectionElementUploadDTO;
-import com.ai.da.model.dto.CollectionGeneratePrintDTO;
-import com.ai.da.model.dto.CollectionSavePrintDTO;
-import com.ai.da.model.vo.*;
+import com.ai.da.model.dto.ChatFlushDTO;
+import com.ai.da.model.dto.ChatSendDTO;
+import com.ai.da.model.vo.PythonLibraryVo;
+import com.ai.da.model.vo.SysFileVO;
 import com.ai.da.python.PythonService;
-import com.ai.da.service.*;
+import com.ai.da.service.ChatRobotService;
+import com.ai.da.service.LibraryService;
+import com.ai.da.service.SysFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

 import javax.annotation.Resource;
-import javax.validation.Valid;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -39,13 +39,27 @@ public class PythonController {
    @Resource
    private LibraryService libraryService;

+    @Resource
+    private ChatRobotService chatRobotService;
+
    @ApiOperation(value = "python服务保存图片到java服务")
    @PostMapping("/saveGeneratePicture")
    public Response<String> upload(@RequestParam("file") MultipartFile file,
-                                                @ApiParam("操作类型 generatePrint ->生成印花 " +
-                                                        "designCollection ->设计collection generateAdvancedDesign ->生成高级design")
-                                                @RequestParam(value = "operateType") String operateType) {
-        return Response.success(pythonService.upload(file,operateType));
+                                   @ApiParam("操作类型 generatePrint ->生成印花 " +
+                                           "designCollection ->设计collection generateAdvancedDesign ->生成高级design"+
+                                           "generateSketch -> 生成草图")
+                                   @RequestParam(value = "operateType") String operateType) {
+        return Response.success(pythonService.upload(file, operateType));
+    }
+
+    @ApiOperation(value = "python服务保存多张图片到java服务")
+    @PostMapping("/saveMultiGeneratePicture")
+    public Response<List<String>> uploadMultiple(@RequestParam("files") MultipartFile[] files,
+                                         @ApiParam("操作类型 generatePrint ->生成印花 " +
+                                                 "designCollection ->设计collection generateAdvancedDesign ->生成高级design"+
+                                                 "generateSketch -> 生成草图")
+                                         @RequestParam(value = "operateType") String operateType) {
+        return Response.success(pythonService.upload(files, operateType));
    }

    @ApiOperation(value = "通过文件类型获取系统文件")
@@ -56,12 +70,27 @@ public class PythonController {

    @ApiOperation(value = "通过用户id获取library")
    @GetMapping("/getLibraryByUserId")
-    public Response<Map<String,List<String>>> getLibraryByUserId(@RequestParam(value = "userId") Long userId) {
+    public Response<Map<String, List<String>>> getLibraryByUserId(@RequestParam(value = "userId") Long userId) {
        List<PythonLibraryVo> response = CopyUtil.copyList(libraryService.selectByAccountIdAnd1TypeList(userId,
-                Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName())),PythonLibraryVo.class);
+                Collections.singletonList(CollectionLevel1TypeEnum.SKETCH_BOARD.getRealName())), PythonLibraryVo.class);
        //key转小写 统一
-        return Response.success(response.stream().collect(Collectors.groupingBy(v ->v.getLevel2Type().toLowerCase(),
-                Collectors.mapping(PythonLibraryVo::getUrl,Collectors.toList()))));
+        return Response.success(response.stream().collect(Collectors.groupingBy(v -> v.getLevel2Type().toLowerCase(),
+                Collectors.mapping(PythonLibraryVo::getUrl, Collectors.toList()))));
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "发送用户输入消息")
+    @PostMapping("/chatStream")
+    public SseEmitter MessageToPythonChatStream(@RequestBody ChatSendDTO chatSendDTO) {
+        log.info(chatSendDTO.toString());
+        return chatRobotService.sendMessageToChatRobot(chatSendDTO);
+    }
+
+    @CrossOrigin
+    @ApiOperation(value = "刷新会话缓存")
+    @PostMapping("/flush")
+    public Response<String> ChatBufferFlush(@RequestBody ChatFlushDTO chatFlushDTO) {
+        return Response.success(chatRobotService.chatBufferFlush(chatFlushDTO));
    }

 }