1111

src/main/java/com/fdkankan/download/bean/SceneEditControlsBean.java

@@ -106,4 +106,19 @@ public class SceneEditControlsBean implements Serializable {
      */
     private Integer showLinkTitle;
 
+    /**
+     * 空间绘制
+     */
+    private Integer showDrawTitle;
+
+    private Integer showAllModel;
+
+    /**
+     * 是否显示cad底图
+     */
+    private Integer showTexture;
+
+    private Integer showPanos;
+
+
 }

src/main/java/com/fdkankan/download/bean/SceneViewInfoBean.java

@@ -246,5 +246,25 @@ public class SceneViewInfoBean implements Serializable {
      */
     private Integer billboards;
 
+    /**
+     * 是否有模型裁剪（0-否，1-是）
+     */
+    private Integer cutModel = 0;
+
+    /**
+     * 启动页配置信息
+     */
+    private JSONObject started;
+
+    private Integer floorLogoType;
+
+    /**
+     * 空间绘制
+     */
+    private Integer sceneDraw;
+
+    //动态面板
+    private int dynamicPanel;
+
 
 }

src/main/java/com/fdkankan/download/controller/BatchDownloadController.java

@@ -62,11 +62,6 @@ public class BatchDownloadController {
         return batchDonloadService.downloadMeshScene(file,version);
     }
 
-    @PostMapping("downloadLaserScene")
-    public ResultData downloadMeshScene(@RequestParam(value = "file") MultipartFile file) throws Exception {
-        return batchDonloadService.downloadLaserScene(file);
-    }
-
     @GetMapping("test")
     public ResultData test() throws Exception {
         final OperatingSystem os = OshiUtil.getOs();
@@ -82,6 +77,11 @@ public class BatchDownloadController {
 //        return ResultData.ok(snService.list());
     }
 
+    @PostMapping("downloadLaserScene")
+    public ResultData downloadMeshScene(@RequestParam(value = "file") MultipartFile file) throws Exception {
+        return batchDonloadService.downloadLaserScene(file);
+    }
+
     @GetMapping("testlaser")
     public ResultData testlaser(String num) throws Exception {
         TimeInterval timer = DateUtil.timer();

src/main/java/com/fdkankan/download/service/impl/BatchDonloadServiceImpl.java

@@ -256,8 +256,8 @@ public class BatchDonloadServiceImpl implements IBatchDonloadService {
     private ILaserService laserService;
     @Autowired
     private IDownloadService downloadService;
-    public final static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setWorkQueue(new LinkedBlockingQueue<>(10000)).setCorePoolSize(2).setMaxPoolSize(5).build();
-    public final static ThreadPoolExecutor laserThreadPoolExecutor = ExecutorBuilder.create().setWorkQueue(new LinkedBlockingQueue<>(10000)).setCorePoolSize(2).setMaxPoolSize(2).build();
+    public final static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setWorkQueue(new LinkedBlockingQueue<>(10000)).setCorePoolSize(4).setMaxPoolSize(4).build();
+    public final static ThreadPoolExecutor laserThreadPoolExecutor = ExecutorBuilder.create().setWorkQueue(new LinkedBlockingQueue<>(10000)).setCorePoolSize(4).setMaxPoolSize(4).build();
 
     @Override
     public ResultData bacthDownloadByLocal(MultipartFile file) throws Exception {

src/main/java/com/fdkankan/download/service/impl/DownloadServiceImpl.java

@@ -767,6 +767,9 @@ public class DownloadServiceImpl implements IDownloadService {
         if(Objects.isNull(controls.getShowBillboardTitle())){
             controls.setShowBillboardTitle(CommonStatus.YES.code().intValue());
         }
+        if(Objects.isNull(controls.getShowDrawTitle())){
+            controls.setShowDrawTitle(CommonStatus.YES.code().intValue());
+        }
 
         return sceneInfoVO;
     }

src/main/java/com/fdkankan/download/service/impl/GenSceneRunnerImpl.java

@@ -70,7 +70,7 @@
 //    @Autowired
 //    private RabbitMqProducer mqProducer;
 //
-//    private final static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setWorkQueue(new LinkedBlockingQueue<>(10000)).setCorePoolSize(30).setMaxPoolSize(30).build();
+//    private final static ThreadPoolExecutor threadPoolExecutor = ExecutorBuilder.create().setWorkQueue(new LinkedBlockingQueue<>(10000)).setCorePoolSize(5).setMaxPoolSize(5).build();
 //
 //    @Autowired
 //    ILaserService laserService;

src/main/resources/application-prod.yml

@@ -77,8 +77,8 @@ logging:
 
 fyun:
   type: oss
-  key: LTAI5tJwboCj3r4vUNkSmbyX
-  secret: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
+  key: LTAI5tSkKQbEmxxuTbPtHqK6
+  secret: JI21tOnZbJuqt5NDRcQq2qvAUA4KTf
   bucket: 4dkankan
   endPoint: http://oss-cn-shenzhen-internal.aliyuncs.com
   host: https://4dkk.4dage.com/