1

pom.xml

@@ -157,6 +157,12 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-oss</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-rabbitmq</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>

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

@@ -1,7 +1,6 @@
 package com.fdkankan.fusion.common.util;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.fusion.entity.Scene;
 import com.fdkankan.fusion.service.ISceneService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,20 +15,6 @@ public class CaseNumTypeUtil {
     ISceneService sceneService;
 
     //0 四维看看，1看见场景，2 深时场景,3 三维模型,4深时obj ,5深光点云，6深光obj，7第三方相机
-    public  Integer getCaseNumType(String num,Integer numType){
-        if(StringUtils.isBlank(num)){
-            return null;
-        }
-        LambdaQueryWrapper<Scene> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Scene::getSceneCode,num);
-        Scene one = sceneService.getOne(wrapper);
-        if(one == null){
-            return null;
-        }
-        return SceneTypeUtil.getTypeBySceneSource(one.getSceneSource(),numType);
-
-
-    }
     public static Integer getType(Integer numType){
         if(numType == 2 || numType == 5){
             return 0;

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

@@ -47,7 +47,7 @@ public class AiController {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         try {
-            return ResultData.ok(Openai.gptVision(param.getImageUrl(),fusionConfig.getAiUrl(),null));
+            return ResultData.ok(Openai.gptVision(param.getImageUrl(),null,null));
         } catch (Exception e) {
             log.info("Openai-error:{}",e);
             throw new BusinessException(ResultCode.AI_ERROR);

src/main/java/com/fdkankan/fusion/mapper/IDictFileMapper.java

@@ -1,7 +1,10 @@
 package com.fdkankan.fusion.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.entity.DictFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.fusion.request.DictFileParam;
+import com.fdkankan.fusion.response.DictFileVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IDictFileMapper extends BaseMapper<DictFile> {
 
+    Page<DictFileVo> pageList(Page<Object> objectPage, DictFileParam param);
 }