Просмотр исходного кода

初始化场景增加计算完成时间

dsx 2 лет назад
Родитель
Сommit
08630bae80

+ 1 - 1
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -85,7 +85,7 @@ public class SceneController extends BaseController {
     public ResultData initScene(@RequestBody InitSceneParamVO param){
         return scenePlusService.initScene(param.getBucket(), param.getNum(), param.getTitle(), param.getDes(),
                 param.getSceneSource(), param.getDataSource(), param.getSceneScheme(),
-                param.getSceneResolution(), param.getSceneFrom(), param.getModelKind());
+                param.getSceneResolution(), param.getSceneFrom(), param.getModelKind(), param.getAlgorithmTime());
     }
 
     /**

+ 2 - 1
src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -7,6 +7,7 @@ import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 
 import java.nio.file.FileSystemException;
+import java.util.Date;
 import java.util.List;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
@@ -39,7 +40,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
     ResultData updateViewCount(String num) throws Exception;
 
     ResultData initScene(String bucket, String num, String title, String des, Integer sceneSource,
-        String dataSource, Integer sceneScheme, String sceneResolution, String sceneFrom, String mdoelKind);
+                         String dataSource, Integer sceneScheme, String sceneResolution, String sceneFrom, String mdoelKind, Date algorithmTime);
 
     ResultData editScene(LaserSceneBean param);
 

+ 2 - 1
src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -282,7 +282,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
      **/
     @Override
     public ResultData initScene(String bucket, String num, String title, String des, Integer sceneSource,
-        String dataSource, Integer sceneScheme, String sceneResolution, String sceneFrom, String mdoelKind) {
+        String dataSource, Integer sceneScheme, String sceneResolution, String sceneFrom, String mdoelKind, Date algorithmTime) {
 
         ScenePlus scenePlus = this.getScenePlusByNum(num);
 
@@ -321,6 +321,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         scenePlusExt.setYunFileBucket(bucket);
         scenePlusExt.setAlgorithmTime(Calendar.getInstance().getTime());
         scenePlusExt.setVideos(this.getVideosJson(dataSource, videoVersion, num, cameraType).toJSONString());
+        scenePlusExt.setAlgorithmTime(algorithmTime);
         scenePlusExtService.saveOrUpdate(scenePlusExt);
 
         //生成编辑主表

+ 3 - 0
src/main/java/com/fdkankan/scene/vo/InitSceneParamVO.java

@@ -2,6 +2,8 @@ package com.fdkankan.scene.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * <p>
  * TODO
@@ -23,6 +25,7 @@ public class InitSceneParamVO {
     private String sceneFrom;
     private String bucket;
     private String modelKind;
+    private Date algorithmTime;
 
 
 }

+ 1 - 1
src/main/resources/application-standAloneProd.yml

@@ -32,7 +32,7 @@ minio:
     bucket-custom-domain:
       laser-data: 1
 server:
-  port: 9101
+  port: 1101
   servlet:
     context-path: /
   tomcat: