tianboguang 2 gadi atpakaļ
vecāks
revīzija
28875be78b

+ 6 - 18
src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -1,13 +1,15 @@
 package com.fdkankan.contro.mq.service.impl;
 package com.fdkankan.contro.mq.service.impl;
 
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.bean.SceneJsonBean;
-import com.fdkankan.contro.entity.*;
+import com.fdkankan.contro.entity.ScenePro;
+import com.fdkankan.contro.entity.SceneProEdit;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
-import com.fdkankan.contro.service.*;
+import com.fdkankan.contro.service.IBuildSceneDTService;
+import com.fdkankan.contro.service.IFdkkLaserService;
+import com.fdkankan.contro.service.ISceneProEditService;
+import com.fdkankan.contro.service.ISceneProService;
 import com.fdkankan.contro.service.impl.FdkkV4Service;
 import com.fdkankan.contro.service.impl.FdkkV4Service;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFileName;
 import com.fdkankan.model.constants.ConstantFileName;
@@ -17,8 +19,6 @@ import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
-import com.fdkankan.redis.constant.RedisKey;
-import com.fdkankan.redis.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
@@ -64,20 +64,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
     private IBuildSceneDTService buildSceneDTService;
     private IBuildSceneDTService buildSceneDTService;
 
 
     @Autowired
     @Autowired
-    private IScenePlusService scenePlusService;
-
-    @Autowired
-    private ISceneEditControlsService sceneEditControlsService;
-
-    @Autowired
-    private ISceneEditInfoService sceneEditInfoService;
-
-    @Autowired
     private ISceneProEditService sceneProEditService;
     private ISceneProEditService sceneProEditService;
 
 
-    @Autowired
-    private RedisUtil redisUtil;
-
     @Override
     @Override
     public void buildScenePre(BuildSceneCallMessage message) {
     public void buildScenePre(BuildSceneCallMessage message) {
         boolean success = false;
         boolean success = false;

+ 1 - 2
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -232,7 +232,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             this.uploadFloorCad(path, sceneCode, uploadFiles);
             this.uploadFloorCad(path, sceneCode, uploadFiles);
 
 
             //上传文件
             //上传文件
-            log.info("开始上传场景计算结果数据,num:{},{}", sceneCode, JSONObject.toJSONString(uploadFiles));
+            log.info("开始上传场景计算结果数据,num:{}", sceneCode);
             fYunFileService.uploadMulFiles(uploadFiles);
             fYunFileService.uploadMulFiles(uploadFiles);
 
 
             Map<String,String> damFileHeaders = new HashMap<>();
             Map<String,String> damFileHeaders = new HashMap<>();
@@ -242,7 +242,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 // dam 文件设置请求头
                 // dam 文件设置请求头
                 uploadFiles.entrySet().stream().filter(entry -> FileNameUtil.extName(entry.getKey()).equals("dam"))
                 uploadFiles.entrySet().stream().filter(entry -> FileNameUtil.extName(entry.getKey()).equals("dam"))
                         .forEach(entry -> {
                         .forEach(entry -> {
-                            // 防止value重复
                             if (!new File(entry.getKey()).exists()) {
                             if (!new File(entry.getKey()).exists()) {
                                 log.error("文件不存在,不予gzip压缩,文件路径:{}", entry.getKey());
                                 log.error("文件不存在,不予gzip压缩,文件路径:{}", entry.getKey());
                                 return;
                                 return;