把前端接口搬到apiController

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

@@ -19,7 +19,7 @@ public class PartProvider {
         String searchKey = param.getSearchKey();
         if(StringUtils.isNotBlank(searchKey)){
             // 字符串要加'
-            sql.append(" and name ='").append(searchKey).append("'");
+            sql.append(" and name like '%").append(searchKey).append("%'");
         }
 
 

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

@@ -19,7 +19,7 @@ public class RoamProvider {
         String searchKey = param.getSearchKey();
         if(StringUtils.isNotBlank(searchKey)){
             // 字符串要加'
-            sql.append(" and name ='").append(searchKey).append("'");
+            sql.append(" and name like '%").append(searchKey).append("%'");
         }
 
         Integer block = param.getBlock();

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

@@ -1,6 +1,7 @@
 package com.museum.domain.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,15 +32,22 @@ public class PartEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "展示内容")
     private String content;
 
-    @ApiModelProperty(value = "场景rul")
+    @ApiModelProperty(value = "高清图/场景/模型/url")
     private String webSite;
 
     @ApiModelProperty(value = "程序显示， 0：显示，1：不显示")
     private Integer display;
 
-    @ApiModelProperty(value = "场景ico")
+    @ApiModelProperty(value = "程序显示， 0：显示模型，1：显示图片")
+    private Integer displayModel;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "高清图")
     private String ico;
 
+    @ApiModelProperty(value = "缩略图")
+    private String thumb;
+
     @ApiModelProperty(value = "材质")
     private String material;
 

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

@@ -1,5 +1,6 @@
 package com.museum.domain.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -27,12 +28,19 @@ public class RoamEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "展示内容")
     private String content;
 
-    @ApiModelProperty(value = "场景rul")
+    @ApiModelProperty(value = "高清图/场景/模型/url")
     private String webSite;
 
-    @ApiModelProperty(value = "场景ico")
+    @ApiModelProperty(value = "程序显示， 0：显示模型，1：显示图片, 2:场景漫游")
+    private Integer displayModel;
+
+    @JsonIgnore
+    @ApiModelProperty(value = "高清图")
     private String ico;
 
+    @ApiModelProperty(value = "缩略图")
+    private String thumb;
+
     @ApiModelProperty(value = "程序显示， 0：显示，1：不显示")
     private Integer display;
 

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

@@ -3,6 +3,9 @@ package com.museum.domain.request;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -14,15 +17,18 @@ public class MessageRequest implements Serializable {
     private static final long serialVersionUID = -5191918184588231778L;
 
 
+    @NotBlank(message = "游客名称不能为空")
     @ApiModelProperty(value = "游客名称", name = "userName", required = true)
     private String userName;
 
     @ApiModelProperty(value = "电话", name = "phone")
     private String phone;
 
+    @Email(message = "邮箱格式有误")
     @ApiModelProperty(value = "邮箱", name = "email")
     private String email;
 
+    @NotBlank(message = "留言不能为空")
     @ApiModelProperty(value = "留言", name = "message", required = true)
     private String message;
 }

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

@@ -1,22 +1,26 @@
 package com.museum.web.controller;
 
 
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.museum.common.constant.TypeCode;
 import com.museum.common.util.Result;
-import com.museum.domain.entity.FileEntity;
-import com.museum.domain.entity.PartEntity;
-import com.museum.domain.entity.RoamEntity;
-import com.museum.domain.entity.TypeEntity;
+import com.museum.domain.entity.*;
+import com.museum.domain.request.MessageRequest;
 import com.museum.domain.request.NavRequest;
+import com.museum.service.MessageService;
 import com.museum.service.PartService;
 import com.museum.service.RoamService;
 import com.museum.service.TypeService;
+import com.museum.web.aop.WebControllerLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +52,9 @@ public class ApiController extends BaseController {
     @Autowired
     private RoamService roamService;
 
+    @Autowired
+    public MessageService messageService;
+
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "modelType", value = "模型类型, roam:自由漫游，part：部件欣赏", required = true)
@@ -116,6 +123,28 @@ public class ApiController extends BaseController {
     }
 
 
+    @WebControllerLog(description = "留言管理-新增留言")
+    @ApiOperation("新增留言")
+    @PostMapping("save/msg")
+    public Result saveMessage(@Valid @RequestBody MessageRequest param) {
+
+        String phone = param.getPhone();
+        if (StringUtils.isNoneEmpty(phone) ) {
+            if (!Validator.isMobile(phone)) {
+                log.error("手机号有误： {}", phone);
+                return Result.failure("手机号有误");
+
+            }
+        }
+
+        MessageEntity entity = new MessageEntity();
+        BeanUtils.copyProperties(param, entity);
+        messageService.save(entity);
+        return Result.success();
+    }
+
+
+
 
 
 

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

@@ -10,6 +10,7 @@ import com.museum.domain.request.PageRequest;
 import com.museum.service.MessageService;
 import com.museum.web.aop.WebControllerLog;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
@@ -42,16 +43,16 @@ public class MessageController extends BaseController {
         return Result.success(page);
     }
 
-    @WebControllerLog(description = "留言管理-新增留言")
-    @ApiOperation("新增留言")
-    @PostMapping("save")
-    public Result save(@Valid @RequestBody MessageRequest param) {
-
-        MessageEntity entity = new MessageEntity();
-        BeanUtils.copyProperties(param, entity);
-        messageService.save(entity);
-        return Result.success();
-    }
+//    @WebControllerLog(description = "留言管理-新增留言")
+//    @ApiOperation("新增留言")
+//    @PostMapping("save")
+//    public Result save(@Valid @RequestBody MessageRequest param) {
+//
+//        MessageEntity entity = new MessageEntity();
+//        BeanUtils.copyProperties(param, entity);
+//        messageService.save(entity);
+//        return Result.success();
+//    }
 
 
     @ApiOperation("留言详情")

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

@@ -54,6 +54,14 @@ public class RoamController extends BaseController {
     @PostMapping("save")
     public Result save(@Valid @RequestBody RoamRequest param) {
 
+        /**
+         * 墙立面类型，displayModel:0
+         * 漫游， displayModel:2
+         *
+         * 墙立面展示：模型URL
+         * 场景漫游：四维看看场景URL
+         */
+
         RoamEntity entity = null;
         Long id = param.getId();
         if (id == null) {

pom.xml

@@ -58,6 +58,8 @@
             <!--模块版本管理-->
 
             <dependency>
+
+
                 <groupId>com.museum</groupId>
                 <artifactId>museum_application</artifactId>
                 <version>${museum.version}</version>