更新：部件、漫游需要维护displayModel信息

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

@@ -52,7 +52,8 @@ public class PartProvider {
     public String findBySearch(NavRequest param){
 
         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.ico, z.display, z.material, z.thumb, t.name as type_name " +
+                "SELECT z.id, z.create_time, z.update_time, z.block, z.zone, z.type_id, z.content, z.name, z.web_site, " +
+                        "z.ico, z.display, z.display_model, z.material, z.thumb, t.name as type_name " +
                         "FROM tb_part z left JOIN tb_type t on z.type_id = t.id where z.rec_status = 'A' ");
 
 

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

@@ -51,7 +51,8 @@ public class RoamProvider {
     public String findBySearch(NavRequest param){
 
         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.thumb, t.name as type_name " +
+                "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 " +
                         "FROM tb_roam z left JOIN tb_type t on z.type_id = t.id where z.rec_status = 'A' ");
 
 

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

@@ -1,6 +1,5 @@
 package com.museum.dao.Provide;
 
-import com.museum.domain.request.NavRequest;
 import com.museum.domain.request.StructurePageRequest;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;

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

@@ -12,7 +12,7 @@ import lombok.extern.log4j.Log4j2;
 public class UserProvider {
 
     public String findBySearchKey(UserPageRequest param){
-        StringBuffer sql = new StringBuffer("" +
+        StringBuffer sql = new StringBuffer(
                 "SELECT * FROM tb_user where rec_status = 'A' ");
         String searchKey = param.getSearchKey();
         if(StrUtil.isNotBlank(searchKey)){

museum_dao/src/main/java/com/museum/dao/UserMapper.java

@@ -15,9 +15,6 @@ import java.util.List;
 @Mapper
 public interface UserMapper extends IBaseMapper<UserEntity, Long> {
 
-//    @SelectProvider(type = UserProvider.class, method = "findAllBySearchKey")
-//    List<UserResponse> findAllBySearchKey(String searchKey);
-
     @Select(value = "select * from tb_user where rec_status = 'A' AND user_name= #{userName}")
     UserEntity findByUserName(String userName);
 

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

@@ -37,8 +37,8 @@ public class PartEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "程序显示， 1：显示，0：不显示")
     private Integer display;
 
-//    @ApiModelProperty(value = "程序显示， 0：显示模型，1：显示图片")
-//    private Integer displayModel;
+    @ApiModelProperty(value = "url类型：0：显示模型，1：场景漫游, 2:显示图片")
+    private Integer displayModel;
 
     @JsonIgnore
     @ApiModelProperty(value = "高清图")

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

@@ -28,10 +28,6 @@ public class PartRequest  {
     @ApiModelProperty(value = "区域, in:室内，out:室外", name = "zone", required = true)
     private String zone;
 
-//    @NotNull(message = "模型类型不能为空")
-//    @ApiModelProperty(value = "模型类型, roam:自由漫游，part：部件欣赏", name = "modelType")
-//    private String modelType;
-
     @NotNull(message = "类型id不能为空")
     @ApiModelProperty(value = "类型id", name = "typeId", required = true)
     private Long typeId;
@@ -40,14 +36,21 @@ public class PartRequest  {
     @ApiModelProperty(value = "展示内容", name = "content", required = true)
     private String content;
 
-    @ApiModelProperty(value = "场景url", name = "webSite")
-    private String webSite;
 
+    @NotNull(message = "程序显示不能为空")
     @ApiModelProperty(value = "程序显示， 1：显示，0：不显示", name = "display", required = true)
     private Integer display;
 
-    @NotNull(message = "封面图不能为空")
-    @ApiModelProperty(value = "封面ico")
+
+    @NotNull(message = "url类型不能为空")
+    @ApiModelProperty(value = "url类型：0：显示模型，1：场景漫游, 2:显示图片")
+    private Integer displayModel;
+
+    @ApiModelProperty(value = "场景url", name = "webSite")
+    private String webSite;
+
+//    @NotNull(message = "封面图不能为空")
+    @ApiModelProperty(value = "封面url")
     private String ico;
 
     @NotNull(message = "缩略图不能为空")

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

@@ -37,14 +37,14 @@ public class RoamRequest implements Serializable {
     @ApiModelProperty(value = "展示内容", name = "content", required = true)
     private String content;
 
-    @ApiModelProperty(value = "场景url", name = "webSite")
-    private String webSite;
-
     @ApiModelProperty(value = "程序显示， 1：显示，0：不显示", name = "display", required = true)
     private Integer display;
 
-    @NotNull(message = "显示类型")
-    @ApiModelProperty(value = "程序显示， 0：显示模型，1：场景漫游")
+    @NotNull(message = "显示类型不能为空")
+    @ApiModelProperty(value = "显示类型， 0：模型url，1：场景url")
     private Integer displayModel;
 
+    @ApiModelProperty(value = "场景/模型url", name = "webSite")
+    private String webSite;
+
 }

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

@@ -7,6 +7,7 @@ import com.museum.domain.entity.FileEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -30,17 +31,17 @@ public class PartResponse extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "展示内容")
     private String content;
 
-    @ApiModelProperty(value = "高清图/场景/模型/url")
+    @ApiModelProperty(value = "模型url")
     private String webSite;
 
     @ApiModelProperty(value = "程序显示， 1：显示，0：不显示")
     private Integer display;
 
-//    @ApiModelProperty(value = "程序显示， 0：显示模型，1：显示图片")
-//    private Integer displayModel;
+    @ApiModelProperty(value = "url类型：0：模型url， 2:图片url")
+    private Integer displayModel;
 
     @JsonIgnore
-    @ApiModelProperty(value = "高清图")
+    @ApiModelProperty(value = "高清图url")
     private String ico;
 
     @ApiModelProperty(value = "缩略图")

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

@@ -28,15 +28,16 @@ public class RoamResponse extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "展示内容")
     private String content;
 
-    @ApiModelProperty(value = "高清图/场景/模型/url")
-    private String webSite;
 
-    @ApiModelProperty(value = "程序显示， 0：显示模型，1：场景漫游")
+    @ApiModelProperty(value = "显示类型， 0：模型url，1：场景url")
     private Integer displayModel;
 
-    @JsonIgnore
-    @ApiModelProperty(value = "高清图")
-    private String ico;
+    @ApiModelProperty(value = "场景/模型/url")
+    private String webSite;
+
+//    @JsonIgnore
+//    @ApiModelProperty(value = "高清图")
+//    private String ico;
 
     @ApiModelProperty(value = "缩略图")
     private String thumb;

museum_service/src/main/java/com/museum/service/UserService.java

@@ -14,14 +14,10 @@ import java.util.List;
  */
 public interface UserService extends IBaseService<UserEntity, Long> {
 
-//    List<UserResponse> findAllBySearchKey(PageDto param);
 
     UserEntity findByUserName(String userName);
 
     UserEntity findByPhone(String phone);
 
-
-
-
     List<UserEntity> findBySearchKey(UserPageRequest param);
 }

museum_service/src/main/java/com/museum/service/impl/UserServiceImpl.java

@@ -26,12 +26,6 @@ public class UserServiceImpl extends IBaseServiceImpl<UserEntity, Long> implemen
         return this.entityMapper;
     }
 
-//    @Override
-//    public List<UserResponse> findAllBySearchKey(PageDto param) {
-//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-//        return entityMapper.findAllBySearchKey(param.getSearchKey());
-//    }
-
     @Override
     public UserEntity findByUserName(String userName) {
         return entityMapper.findByUserName(userName);