漫游更加了video

README.md

@@ -32,4 +32,7 @@
     需要配置静态资源路径
     
     
-# 不删除oss物理文件的原因是，下载管理有历史记录，删除了，跟显示有冲突。
+# 不删除oss物理文件的原因是，下载管理有历史记录，删除了，跟显示有冲突。
+
+
+# uat

museum_application/src/main/resources/application-sit.properties

@@ -57,6 +57,6 @@ output.file.path=/root/user/sh_museum_data/
 server.domain =http://face3d.4dage.com:8100/downfile/
 
 oss.file.path=sh_museum/
-oss.domain=http://4dkankan.oss-cn-shenzhen.aliyuncs.com/
+oss.domain=http://shlmuseum.oss-cn-shanghai.aliyuncs.com/
 
 

museum_common/src/main/java/com/museum/common/util/FileUtils.java

@@ -34,7 +34,7 @@ public class FileUtils {
         String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
         savePath = savePath + time + File.separator;
         log.info("savePath: {}", savePath);
-        FileUtil.mkdir(time);
+//        FileUtil.mkdir(time);
 
         ArrayList<Map<String, String>> list = new ArrayList<>();
 

museum_dao/src/main/java/com/museum/dao/Provide/RoamProvider.java

@@ -52,7 +52,7 @@ public class RoamProvider {
 
         StringBuffer sql = new StringBuffer(
                 "SELECT z.id, z.create_time, z.update_time, z.block, z.zone, z.type_id, z.content, z.name, z.web_site, z.display, " +
-                        "z.display_model, z.thumb, t.name as type_name " +
+                        "z.display_model, z.thumb, z.video, t.name as type_name " +
                         "FROM tb_roam z left JOIN tb_type t on z.type_id = t.id where z.rec_status = 'A' ");
 
 

museum_domain/src/main/java/com/museum/domain/entity/RoamEntity.java

@@ -31,7 +31,7 @@ public class RoamEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "高清图/场景/模型/url")
     private String webSite;
 
-    @ApiModelProperty(value = "程序显示， 0：显示模型，1：场景漫游")
+    @ApiModelProperty(value = "程序显示， 0：显示模型，1：场景漫游，2：动画视频")
     private Integer displayModel;
 
     @JsonIgnore
@@ -47,5 +47,8 @@ public class RoamEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "展示类型id")
     private Long typeId;
 
+    @ApiModelProperty(value = "视频url")
+    private String video;
+
 
 }

museum_domain/src/main/java/com/museum/domain/request/RoamRequest.java

@@ -42,7 +42,7 @@ public class RoamRequest implements Serializable {
     private Integer display;
 
     @NotNull(message = "显示类型不能为空")
-    @ApiModelProperty(value = "显示类型， 0：模型url，1：场景url")
+    @ApiModelProperty(value = "显示类型， 0：模型url，1：场景url，2：视频url")
     private Integer displayModel;
 
     @ApiModelProperty(value = "场景/模型url", name = "webSite")
@@ -52,4 +52,7 @@ public class RoamRequest implements Serializable {
     @ApiModelProperty(value = "缩略图")
     private String thumb;
 
+    @ApiModelProperty(value = "视频url")
+    private String video;
+
 }

museum_domain/src/main/java/com/museum/domain/response/RoamResponse.java

@@ -1,11 +1,9 @@
 package com.museum.domain.response;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.museum.domain.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -29,16 +27,12 @@ public class RoamResponse extends BaseEntity implements Serializable {
     private String content;
 
 
-    @ApiModelProperty(value = "显示类型， 0：模型url，1：场景url")
+    @ApiModelProperty(value = "显示类型， 0：模型url，1：场景url，2：视频url")
     private Integer displayModel;
 
     @ApiModelProperty(value = "场景/模型/url")
     private String webSite;
 
-//    @JsonIgnore
-//    @ApiModelProperty(value = "高清图")
-//    private String ico;
-
     @ApiModelProperty(value = "缩略图")
     private String thumb;
 
@@ -51,5 +45,8 @@ public class RoamResponse extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "展示类型名称")
     private String typeName;
 
+    @ApiModelProperty(value = "视频url")
+    private String video;
+
 
 }

museum_web/src/main/java/com/museum/web/controller/IndexController.java

@@ -115,8 +115,8 @@ public class IndexController extends BaseController {
         return Result.success();
     }
 
-
-    @GetMapping("/test/test")
+    @ApiIgnore
+    @GetMapping("admin/test")
     public String test(){
         return LocalDateTime.now().toString();
     }

museum_web/src/main/java/com/museum/web/shiro/ShiroConfig.java

@@ -73,7 +73,6 @@ public class ShiroConfig {
         filterRuleMap.put("/admin", "anon");
         filterRuleMap.put("/admin/login", "anon");
         filterRuleMap.put("/test/**", "anon");
-//        filterRuleMap.put("/api/**", "anon");
 
 
         // swagger 不拦截