1

doc/update-1.7.1.sql

@@ -38,4 +38,8 @@ ALTER TABLE `4dkankan_v4`.`t_common_upload`
     ADD COLUMN `use_type` varchar(255) NULL DEFAULT 'ordinary' AFTER `gcj02`;
 
 ALTER TABLE `4dkankan_v4`.`t_dict_file`
-    ADD COLUMN `use_type` varchar(255) NULL DEFAULT 'ordinary' AFTER `upload_id`;
+    ADD COLUMN `use_type` varchar(255) NULL DEFAULT 'ordinary' AFTER `upload_id`;
+
+
+ALTER TABLE `fd_fusion`.`t_case_tag_point`
+    ADD COLUMN `pose` varchar(255) NULL AFTER `normal`;

src/main/java/com/fdkankan/fusion/common/util/Openai.java

@@ -18,8 +18,9 @@ import java.util.List;
  */
 public class Openai {
     public static void main(String[] args) throws IOException {
-       // gptVision("https://4dkankan.oss-cn-shenzhen.aliyuncs.com/images/imagesg5LNCydH6k/pan/high/7c84b1610aec4ee6095f1fa76ad6236c.png","http://192.168.9.61:30000/v1/");
-        gptVision("https://4dkankan.oss-cn-shenzhen.aliyuncs.com/images/imagesg5LNCydH6k/pan/high/7c84b1610aec4ee6095f1fa76ad6236c.png","http://192.168.9.61:30000/v1/",null);
+//        gptVision("https://4dkankan.oss-cn-shenzhen.aliyuncs.com/images/imagesg5LNCydH6k/pan/high/7c84b1610aec4ee6095f1fa76ad6236c.png","http://192.168.9.61:30000/v1/");
+        String s = gptVision("https://4dkankan.oss-cn-shenzhen.aliyuncs.com/images/imagesg5LNCydH6k/pan/high/7c84b1610aec4ee6095f1fa76ad6236c.png", "http://192.168.9.61:30000/v1/", null);
+        System.out.println(s);
 
     }
 
@@ -61,7 +62,7 @@ public class Openai {
                 .messages(messages)
                 .temperature(0.06)
                 .topP(0.75)
-                .maxTokens(1024)
+                .maxTokens(512)
                 .n(1)
                 .build();
         ChatCompletionChoice choice = openAiService1.createChatCompletion(chatCompletionRequest).getChoices().get(0);

src/main/java/com/fdkankan/fusion/controller/AiController.java

@@ -1,16 +1,21 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.Openai;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.config.FusionConfig;
+import com.fdkankan.fusion.entity.CaseFiles;
+import com.fdkankan.fusion.entity.CaseFilesType;
 import com.fdkankan.fusion.entity.CaseInquestInfo;
 import com.fdkankan.fusion.entity.CaseNumEntity;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.request.AiParam;
 import com.fdkankan.fusion.response.FloorPathVo;
+import com.fdkankan.fusion.service.ICaseFilesService;
+import com.fdkankan.fusion.service.ICaseFilesTypeService;
 import com.fdkankan.fusion.service.ICaseInquestInfoService;
 import com.fdkankan.fusion.service.ICaseNumService;
 import lombok.extern.slf4j.Slf4j;
@@ -59,8 +64,8 @@ public class AiController {
     @GetMapping("/getFloor/{caseId}")
     public ResultData getFloor(@PathVariable Integer caseId){
         String foorPath = "/oss/4dkankan/scene_view_data/%s/user";
-        String fileName = "floor-cad";
-        String extName = "png";
+        String fileName = "cad";
+        String extName = "jpg";
         List<CaseNumEntity> byCaseId = caseNumService.getByCaseId(caseId);
         List<FloorPathVo> pathVos = new ArrayList<>();
         for (CaseNumEntity caseNumEntity : byCaseId) {
@@ -85,5 +90,28 @@ public class AiController {
 
         return ResultData.ok(pathVos);
     }
+
+//    @Autowired
+//    ICaseFilesService caseFilesService;
+//    @Autowired
+//    ICaseFilesTypeService caseFilesTypeService;
+//
+//    @GetMapping("/getFloor/{caseId}")
+//    public ResultData getFloor(@PathVariable Integer caseId){
+//        List<FloorPathVo> pathVos = new ArrayList<>();
+//        CaseFilesType caseFilesType = caseFilesTypeService.getByName("平面图");
+//        if(caseFilesType == null){
+//            return ResultData.ok(pathVos);
+//        }
+//        List<CaseFiles> list = caseFilesService.getByCaseIdAndTypeId(caseId,caseFilesType.getFilesTypeId());
+//        for (CaseFiles caseFiles : list) {
+//            FloorPathVo pathVo = new FloorPathVo();
+//            pathVo.setNum(caseFiles.getFilesTitle());
+//            pathVo.getUrls().add(caseFiles.getFilesUrl());
+//            pathVos.add(pathVo);
+//        }
+//
+//        return ResultData.ok(pathVos);
+//    }
 }
 

src/main/java/com/fdkankan/fusion/entity/CaseTagPoint.java

@@ -89,4 +89,7 @@ public class CaseTagPoint implements Serializable {
 
     @TableField("normal")
     private String normal;
+
+    @TableField("pose")
+    private String pose;
 }

src/main/java/com/fdkankan/fusion/response/CaseTagPointVo.java

@@ -41,4 +41,6 @@ public class CaseTagPointVo extends CaseTag {
     private Integer visibilityRange;
 
     private String normal;
+    private String pose;
+
 }

src/main/java/com/fdkankan/fusion/service/ICaseFilesService.java

@@ -23,4 +23,6 @@ public interface ICaseFilesService extends IService<CaseFiles> {
     void deleteByCaseId(Integer caseId);
 
     CaseFiles addByInquest(CaseInquestCriminal caseInquestCriminal);
+
+    List<CaseFiles> getByCaseIdAndTypeId(Integer caseId, Integer filesTypeId);
 }

src/main/java/com/fdkankan/fusion/service/ICaseFilesTypeService.java

@@ -18,4 +18,6 @@ public interface ICaseFilesTypeService extends IService<CaseFilesType> {
     List<CaseFilesType> getByParentId(Integer parentId);
 
     Object getByTree(Integer caseId);
+
+    CaseFilesType getByName(String name);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseFilesServiceImpl.java

@@ -89,4 +89,13 @@ public class CaseFilesServiceImpl extends ServiceImpl<ICaseFilesMapper, CaseFile
         wrapper.eq(CaseFiles::getCreateType,online);
         return this.count(wrapper);
     }
+
+    @Override
+    public List<CaseFiles> getByCaseIdAndTypeId(Integer caseId, Integer filesTypeId) {
+        LambdaQueryWrapper<CaseFiles> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseFiles::getCaseId,caseId);
+        wrapper.eq(CaseFiles::getFilesTypeId,filesTypeId);
+        List<CaseFiles> list = this.list(wrapper);
+        return list;
+    }
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseFilesTypeServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -68,4 +69,15 @@ public class CaseFilesTypeServiceImpl extends ServiceImpl<ICaseFilesTypeMapper,
         }
         return voList;
     }
+
+    @Override
+    public CaseFilesType getByName(String name) {
+        LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseFilesType::getFilesTypeName,name);
+        List<CaseFilesType> list = this.list(wrapper);
+        if(!list.isEmpty()){
+            return list.get(0);
+        }
+        return null;
+    }
 }