合并版本至4.9.0

src/main/java/com/fdkankan/scene/controller/SceneMarkShapeController.java

@@ -2,12 +2,11 @@ package com.fdkankan.scene.controller;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.UploadFilePath;
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.scene.entity.SceneMarkShape;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
+import com.fdkankan.scene.oss.OssUtil;
 import com.fdkankan.scene.service.ISceneMarkShapeService;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
@@ -25,7 +24,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -43,15 +45,13 @@ public class SceneMarkShapeController extends BaseController
     @Autowired
     private ISceneMarkShapeService sceneMarkShapeService;
     @Resource
-    private FYunFileServiceInterface fYunFileService;
+    private OssUtil ossUtil;
     @Autowired
     private IScenePlusService scenePlusService;
     @Autowired
     private IScenePlusExtService scenePlusExtService;
     @Value("${fyun.host}")
     private String ossUrlPrefix;
-    @Autowired
-    private RabbitMqProducer rabbitMqProducer;
     @Value("${main.url}")
     private String mainUrl;
 
@@ -66,7 +66,7 @@ public class SceneMarkShapeController extends BaseController
             ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
             if (ObjectUtil.isNotNull(scenePlus)) {
                 String publicUserPath = String.format(UploadFilePath.scene_result_data_path, param.getNum());
-                List<String> panoramaList = fYunFileService.listRemoteFiles(scenePlusExt.getYunFileBucket(), publicUserPath + "caches/images/");
+                List<String> panoramaList = ossUtil.listFiles(publicUserPath + "caches/images/");
                 List<String> panoramaListUrl = panoramaList.stream().filter(f -> FileUtil.extName(f).equals("jpg")).map(s -> ossUrlPrefix + s).collect(Collectors.toList());
                 return ResultData.ok(panoramaListUrl);
             }
@@ -87,7 +87,7 @@ public class SceneMarkShapeController extends BaseController
     @PostMapping("/detectScene")
     public ResultData detect(@RequestBody @Validated SceneMarkShapeDetectParamVO param) {
         param.setWebSite(mainUrl);
-        rabbitMqProducer.sendByWorkQueue(yolov5DetectQueue, param);
+//        rabbitMqProducer.sendByWorkQueue(yolov5DetectQueue, param);
         return ResultData.ok();
     }
     /**

src/main/java/com/fdkankan/scene/schedule/ScheduleJob.java

@@ -1,21 +1,17 @@
 package com.fdkankan.scene.schedule;
 
-import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.service.ISceneAsynOperLogService;
-import com.fdkankan.scene.service.ISceneDownLoadService;
 import com.fdkankan.scene.service.ISceneCleanOrigService;
+import com.fdkankan.scene.service.ISceneDownLoadService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
-@RefreshScope
 @Log4j2
 @Component
 public class ScheduleJob {

src/main/java/com/fdkankan/scene/service/impl/SceneCleanOrigServiceImpl.java

@@ -6,10 +6,8 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.fdkankan.common.constant.CommonStatus;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonSuccessStatus;
-import com.fdkankan.common.constant.OperationType;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.redis.constant.RedisKey;
@@ -17,23 +15,18 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.SceneBean;
 import com.fdkankan.scene.entity.SceneCleanOrig;
 import com.fdkankan.scene.mapper.ISceneCleanOrigMapper;
-import com.fdkankan.scene.mapper.IScenePlusExtMapper;
+import com.fdkankan.scene.oss.OssUtil;
 import com.fdkankan.scene.service.ISceneCleanOrigService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.service.IScenePlusExtService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISceneProService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
-import sun.font.TextRecord;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * <p>
@@ -43,7 +36,6 @@ import java.util.Objects;
  * @author 
  * @since 2023-03-29
  */
-@RefreshScope
 @Slf4j
 @Service
 public class SceneCleanOrigServiceImpl extends ServiceImpl<ISceneCleanOrigMapper, SceneCleanOrig> implements ISceneCleanOrigService {
@@ -58,7 +50,7 @@ public class SceneCleanOrigServiceImpl extends ServiceImpl<ISceneCleanOrigMapper
     @Autowired
     private IScenePlusExtService scenePlusExtService;
     @Autowired
-    private FYunFileServiceInterface fYunFileService;
+    private OssUtil ossUtil;
     @Autowired
     private RedisUtil redisUtil;
 
@@ -100,7 +92,7 @@ public class SceneCleanOrigServiceImpl extends ServiceImpl<ISceneCleanOrigMapper
             if(StrUtil.isNotEmpty(dataSource)){
                 String homePath = dataSource.replace(ConstantFilePath.BUILD_MODEL_PATH, ConstantFilePath.OSS_PREFIX);
                 //由于国内测试和生产用的bucket是同一个，这里需要做一个安全校验，保证不会删错
-                String fileContent = fYunFileService.getFileContent(homePath.concat("/").concat("data.fdage"));
+                String fileContent = ossUtil.getFileContent(homePath.concat("/").concat("data.fdage"));
                 if(StrUtil.isNotBlank(fileContent)){
                     JSONObject jsonObject = JSON.parseObject(fileContent);
                     String snCode = jsonObject.getJSONObject("cam").getString("uuid");
@@ -112,7 +104,7 @@ public class SceneCleanOrigServiceImpl extends ServiceImpl<ISceneCleanOrigMapper
                         successStatus = CommonSuccessStatus.FAIL.code();
                         reason = "dataSource与data.fdage文件不匹配";
                     }else{
-                        fYunFileService.deleteFolder(homePath);
+                        ossUtil.deleteObject(homePath);
                     }
                 }
             }

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1,12 +1,4 @@
 package com.fdkankan.scene.service.impl;
-import cn.hutool.core.net.multipart.UploadFile;
-import cn.hutool.core.util.CharsetUtil;
-import com.fdkankan.common.constant.*;
-import com.fdkankan.common.util.FileSizeUtil;
-import com.fdkankan.common.util.MD5;
-import com.fdkankan.scene.vo.SaveFiltersParamVO;
-import io.opencensus.metrics.LongGauge;
-import java.util.Date;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -21,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.FileSizeUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;

src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -9,41 +9,28 @@ import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.model.constants.UploadFilePath;
-import com.fdkankan.scene.httpclient.MyClient;
-import com.fdkankan.web.response.ResultData;
-import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.scene.entity.Camera;
-import com.fdkankan.scene.entity.CameraDetail;
-import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
 import com.fdkankan.scene.entity.SceneResource;
+import com.fdkankan.scene.httpclient.MyClient;
 import com.fdkankan.scene.oss.OssUtil;
-import com.fdkankan.scene.service.ISceneEditInfoExtService;
-import com.fdkankan.scene.service.ISceneEditService;
-import com.fdkankan.scene.service.IScenePlusExtService;
-import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.scene.service.ISceneProService;
-import com.fdkankan.scene.service.ISceneUploadService;
+import com.fdkankan.scene.service.*;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.SceneAuthVO;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.web.user.SSOUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
 /**
  * <p>
@@ -103,7 +90,7 @@ public class SceneEditServiceImpl implements ISceneEditService {
         sceneAuthVO.setCompany(null);
 
         //判断data.json是否存在，如果存在，则证明计算在未被定时任务删除前上传过oss
-        boolean exist = fYunFileService.fileExist(String.format(UploadFilePath.scene_result_data_path, num).concat("data.json"));
+        boolean exist = ossUtil.doesObjectExist(String.format(UploadFilePath.scene_result_data_path, num).concat("data.json"));
         if(!exist){
             sceneAuthVO.setSourceExpired(true);
         }

src/main/java/com/fdkankan/scene/service/impl/SceneMarkShapeServiceImpl.java

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.scene.entity.SceneMarkShape;
 import com.fdkankan.scene.mapper.MarkShapeMapper;
 import com.fdkankan.scene.service.ISceneMarkShapeService;
@@ -39,8 +38,8 @@ import java.util.List;
 @Slf4j
 @Service
 public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, SceneMarkShape> implements ISceneMarkShapeService {
-    @Autowired
-    private RabbitMqProducer rabbitMqProducer;
+//    @Autowired
+//    private RabbitMqProducer rabbitMqProducer;
     @Value("${queue.scene.yolov5-train-queue}")
     private String yolov5TrainQueue;
     @Value("${main.url}")
@@ -84,7 +83,7 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
             paramVO.setNum(shape.getNum());
             paramVO.setImagePath(shape.getImagePath());
             paramVO.setDetectType(1);
-            rabbitMqProducer.sendByWorkQueue(yolov5TrainQueue,paramVO);
+//            rabbitMqProducer.sendByWorkQueue(yolov5TrainQueue,paramVO);
         }
         //查询需要进入训练的场景
         List<SceneMarkShape> byToDetectStatus = findByToTrainStatus(0);
@@ -96,7 +95,7 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
             }
             paramVO.setNum(shape.getNum());
             paramVO.setDetectType(2);
-            rabbitMqProducer.sendByWorkQueue(yolov5TrainQueue,paramVO);
+//            rabbitMqProducer.sendByWorkQueue(yolov5TrainQueue,paramVO);
         }
     }
 

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.FileBizType;
+import com.fdkankan.common.constant.ModelKind;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.model.constants.ConstantFileName;
@@ -1051,11 +1052,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return this.downloadModel4Dam(num, bucket);
     }
 
-    @Override
-    public ScenePro getByNum(String num) {
-        return this.getOne(new LambdaQueryWrapper<ScenePro>().eq(ScenePro::getNum, num));
-    }
-
     private ResultData downloadModel43dtiles(String num, String bucket, ScenePlusExt scenePlusExt, SceneEditInfo sceneEditInfo){
 
         //下载mesh到本地
@@ -1064,15 +1060,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         String zipName = num + "_mesh.zip";
         String zipFilePath = String.format(ConstantFilePath.SCENE_DATA_PATH_V4, num) + zipName;
         //下载
-        fYunFileService.downloadFileByCommand(bucket, meshLocalPath, meshOssPath);
+        ossUtil.downloadFile(meshOssPath, meshLocalPath);
         //打包
         ZipUtil.zip(meshLocalPath,zipFilePath);
         //上传压缩包
-        fYunFileService.uploadFile(bucket, zipFilePath, "downloads/extras/" + zipName);
+        ossUtil.uploadFile("downloads/extras/" + zipName, zipFilePath, false);
         //删除本地文件
         FileUtil.del(meshLocalPath);
         FileUtil.del(zipFilePath);
-        String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
+        String url = "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
         return ResultData.ok(url);
     }
 
@@ -1098,7 +1094,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //V3版本去oss下载2048模型
         String meshPath =  String.format(ConstantFilePath.DATABUFFER_FORMAT, num) + "mesh";
         FileUtils.deleteDirectory(meshPath);
-        fYunFileService.downloadFileByCommand(bucket, meshPath, dataViewPath + "mesh");
+        ossUtil.downloadFile(dataViewPath + "mesh", meshPath);
         log.info("meshPath="+meshPath);
         if(!new File(meshPath).exists() || new File(meshPath).listFiles().length < 1){
             throw new BusinessException(ErrorCode.FAILURE_CODE_7006);
@@ -1129,8 +1125,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //打包
         ZipUtil.zip(meshPath, zipPath);
         //上传压缩包
-        fYunFileService.uploadFile(bucket, zipPath, "downloads/extras/" + zipName);
-        String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
+        ossUtil.uploadFile("downloads/extras/" + zipName, zipPath, false);
+        String url = "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
         FileUtil.del(zipPath);
         return ResultData.ok(url);
     }

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -10,13 +10,11 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.fyun.config.FYunFileConfig;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.BodySegmentStatusBean;
+import com.fdkankan.scene.oss.OssUtil;
 import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.util.OssBodySegmentUtil;
 import com.fdkankan.web.response.ResultData;
@@ -25,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import sun.rmi.runtime.Log;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -54,11 +51,7 @@ public class SceneServiceImpl implements ISceneService {
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
-    private RabbitMqProducer rabbitMqProducer;
-    @Autowired
-    private FYunFileServiceInterface fYunFileService;
-    @Autowired
-    public FYunFileConfig fYunFileConfig;
+    private OssUtil ossUtil;
 
     @Override
     public ResultData uploadBodySegment(MultipartFile file, Integer rotate) throws Exception {
@@ -108,7 +101,7 @@ public class SceneServiceImpl implements ISceneService {
         Map<String, String> map = new HashMap<>();
         map.put("uuid", uuid);
         map.put("imgUrl", "https://" +  bodySegmentBucket + "." + bodySegmentHost + "/" + orgImgOssPath);
-        rabbitMqProducer.sendByWorkQueue(queueName, map);
+//        rabbitMqProducer.sendByWorkQueue(queueName, map);
 
         return ResultData.ok(uuid);
     }
@@ -139,9 +132,9 @@ public class SceneServiceImpl implements ISceneService {
                 throw new Exception("提取图片失败");
             }
             String targetOssImgPath = "body_segment/segment/" + uuid + ".png";
-            fYunFileService.uploadFile(imgPath, targetOssImgPath);
+            ossUtil.uploadFile(targetOssImgPath, imgPath, false);
             bodySegmentStatusBean.setStatus(CommonOperStatus.SUCCESS.code());
-            bodySegmentStatusBean.setImageUrl(fYunFileConfig.getHost() + targetOssImgPath);
+//            bodySegmentStatusBean.setImageUrl(fYunFileConfig.getHost() + targetOssImgPath);
             redisUtil.set(String.format(RedisKey.SCENE_BODY_SEGMENT, uuid), JSON.toJSONString(bodySegmentStatusBean), RedisKey.CAMERA_EXPIRE_7_TIME);
         } catch (Exception e) {
             bodySegmentStatusBean.setStatus(CommonOperStatus.FAILD.code());

src/main/java/com/fdkankan/scene/util/OssBodySegmentUtil.java

@@ -1,17 +1,12 @@
 package com.fdkankan.scene.util;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.http.HttpUtil;
 import com.aliyun.imageseg20191230.models.SegmentBodyResponse;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.tea.TeaException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.scene.httpclient.MyClient;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -19,7 +14,6 @@ import java.io.File;
 
 @Slf4j
 @Component
-@RefreshScope
 public class OssBodySegmentUtil {
 
     @Value("${oss.bodySegment.point:oss-cn-shanghai.aliyuncs.com}")