111

src/main/java/com/fdkankan/deploy/controller/SceneController.java

@@ -61,9 +61,9 @@ public class SceneController {
     }
 
     @ApiOperation(value = "删除")
-    @DeleteMapping("{num}")
-    public ResultData<Void> delete(@PathVariable String num) throws Exception {
-        sceneService.delete(num);
+    @DeleteMapping("{id}")
+    public ResultData<Void> delete(@PathVariable Long id) throws Exception {
+        sceneService.delete(id);
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/deploy/service/SceneService.java

@@ -32,5 +32,5 @@ public interface SceneService extends IService<Scene> {
 
     ResultData getDeployStatus(String taskId);
 
-    void delete(String num);
+    void delete(Long id);
 }

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

@@ -346,7 +346,7 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
 
     @Override
     public PageInfo<Scene> listScene(ScenePageRequest request) {
-        Page<Scene> page = lambdaQuery().like(Scene::getTitle, request.getTitle()).page(Page.of(request.getPageNum(), request.getPageSize()));
+        Page<Scene> page = lambdaQuery().like(Scene::getTitle, request.getTitle()).orderByDesc(Scene::getUploadTime).page(Page.of(request.getPageNum(), request.getPageSize()));
         return PageInfo.convert(page);
     }
 
@@ -365,8 +365,8 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
     }
 
     @Override
-    public void delete(String num) {
-        Scene scene = lambdaQuery().eq(Scene::getNum, num).one();
+    public void delete(Long id) {
+        Scene scene = this.getById(id);
         if(scene == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005.code(), "场景不存在或者已被删除");
         }

src/main/resources/application.yml

@@ -53,7 +53,7 @@ scene:
     zip-dir: ${scene.dir}/download/zip/
   deploy:
     kankan: ${scene.dir}/wwwroot/scene_view_data/
-    laser: ${scene.dir}/wwwroot/www/
+    laser: /oss/offline/meta/www/
   log:
     path: ${scene.dir}/log/%s.log
 

src/main/resources/db/schema.sql

@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS "t_scene"  (
 
 CREATE UNIQUE INDEX IF NOT EXISTS "IDX_NUM"
 ON "t_scene" (
-  "num"
+  "num","type"
 );
 
 CREATE INDEX IF NOT EXISTS"IDX_TITLE"

src/main/resources/logback-spring.xml

@@ -9,7 +9,7 @@
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="${LOG_PATH}/scene-deploy/logs" />
+	<property name="log.path" value="${LOG_PATH}/deploy/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->
@@ -18,7 +18,7 @@
 	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
 	<!-- 彩色日志格式 -->
 	<property name="CONSOLE_LOG_PATTERN"
-		value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
 
 	<!--输出到控制台 -->
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">