增加线下版查询接口

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/ImportDataController.java

@@ -1,6 +1,5 @@
 package com.fdkk.sxz.webApi.controller;
 
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -114,7 +113,7 @@ public class ImportDataController extends BaseController {
     @AroundLog(name = "导入数据生成风格场景")
     public Result importData(String sceneNum, String data, String styleName, String decoration,
                              String styleNum, @RequestParam("file") MultipartFile file,
-                             String proLight, String buildType, String rooms) throws Exception {
+                             String proLight, String buildType, String rooms, String sceneName) throws Exception {
         if (StringUtils.isEmpty(sceneNum)) {
             return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
         }
@@ -140,6 +139,10 @@ public class ImportDataController extends BaseController {
                 sceneEntity.setRoamingPointUrl(roamingPointUrl);
                 sceneService.updateById(sceneEntity);
             }
+            if (sceneEntity.getSceneName().equals(sceneName)) {
+                sceneEntity.setSceneName(sceneName);
+                sceneService.updateById(sceneEntity);
+            }
             if (StringUtils.isEmpty(styleNum)) {
                 Integer num = sceneStyleService.findLastNum(sceneNum);
                 if (num == null) {
@@ -512,7 +515,7 @@ public class ImportDataController extends BaseController {
     @RequestMapping(value = "/createJson", method = RequestMethod.GET)
     @NoAuthentication
     @AroundLog(name = "生成房型数据")
-    public JSONObject createJson(String num, String styleNum) {
+    public JSONObject createJson(String num, String styleNum, String sceneName) {
 
         JSONObject resultJson = new JSONObject();
 
@@ -577,6 +580,8 @@ public class ImportDataController extends BaseController {
                             uploadToOssUtil.upload(basePath + File.separator + "roamingPoint.json",
                                     "data/data" + num + "/roamingPoint.json");
                             sceneEntity.setSceneNum(num);
+                            sceneEntity.setSceneName(sceneName);
+
                             String roamingPointUrl = "";
                             Boolean existRoamingPoint = uploadToOssUtil.existFileToOSS("data/data" + num + "/roamingPoint.json", "4dkankan");
                             if (existRoamingPoint) {

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/QueueController.java

@@ -127,7 +127,6 @@ public class QueueController {
     public Result getUploadInfo(@RequestBody RequestQueueCheckList params) {
         List<String> names = params.getCheckInfos().stream().map(RequestQueue::getName).collect(Collectors.toList());
         List<ModelUploadOfflineEntity> modelUploadOfflineEntity = modelUploadOfflineService.findByName(names);
-
         return Result.success("成功", modelUploadOfflineEntity);
     }
 }

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/SceneController.java

@@ -1,13 +1,18 @@
 package com.fdkk.sxz.webApi.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkk.sxz.annotation.auth.NoAuthentication;
 import com.fdkk.sxz.annotation.log.AroundLog;
 import com.fdkk.sxz.base.BaseController;
+import com.fdkk.sxz.base.Result;
+import com.fdkk.sxz.entity.SceneEntity;
 import com.fdkk.sxz.other.mq.TopicRabbitConfig;
 import com.fdkk.sxz.util.EscapeUtil;
 import com.fdkk.sxz.util.OkHttpUtils;
 import com.fdkk.sxz.vo.request.RequestScene;
+import com.fdkk.sxz.webApi.service.ISceneService;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -40,6 +45,9 @@ public class SceneController extends BaseController {
     @Autowired
     RabbitTemplate rabbitTemplate;  //使用RabbitTemplate,这提供了接收/发送等等方
 
+    @Autowired
+    ISceneService sceneService;
+
     /**
      * 获取四维看看用户场景列表
      *
@@ -82,4 +90,48 @@ public class SceneController extends BaseController {
         }
         return "发送消息结束";
     }
+
+    @RequestMapping(value = "/resetSceneName", method = RequestMethod.GET)
+    @NoAuthentication
+    @AroundLog(name = "发送消息")
+    public Result resetSceneName() {
+        JSONObject data = new JSONObject();
+        data.put("pageNum", 1);
+        data.put("pageSize", 20);
+        //指明请求来源
+        data.put("type", "11");
+        Map<String, String> header = new HashMap<>();
+        header.put("token", request.getHeader("token"));
+        for (SceneEntity sceneEntity : sceneService.list()) {
+            data.put("searchKey", sceneEntity.getSceneNum());
+            JSONObject jsonObject = OkHttpUtils.httpPostJson(mainUrl + "api/decorate/scene/list", data.toJSONString(), header);
+            if (jsonObject.getInteger("code") == 200) {
+                JSONArray data1 = jsonObject.getJSONObject("data").getJSONArray("list");
+                if (data1.size() > 0) {
+                    sceneEntity.setSceneName(data1.getJSONObject(0).getString("sceneName"));
+                    sceneService.updateById(sceneEntity);
+                }
+            }
+        }
+        return success();
+    }
+
+    /**
+     * 获取四维看看用户场景列表
+     *
+     * @param scene
+     * @return
+     */
+    @ApiOperation("获取场景数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", dataType = "String"),
+            @ApiImplicitParam(name = "pageSize", value = "页数", dataType = "String")})
+    @RequestMapping(value = "/getAllSceneList", method = RequestMethod.POST)
+    @NoAuthentication
+    @AroundLog(name = "获取四维看看用户场景列表")
+    public Result getAllSceneList(@RequestBody RequestScene scene) {
+        PageInfo<SceneEntity> sceneEntityPageInfo = sceneService.findAllByStatus(scene);
+        return success(sceneEntityPageInfo);
+    }
+
 }

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/SceneStyleController.java

@@ -187,6 +187,9 @@ public class SceneStyleController extends BaseController {
         if (!StringUtils.isEmpty(style.getStyleName())) {
             wrapper.like(SceneStyleEntity::getStyleName, style.getStyleName());
         }
+        if (style.getStatus() == 2) {
+            wrapper.ne(SceneStyleEntity::getStatus, style.getStatus());
+        }
         wrapper.last("ORDER BY  update_time DESC");
         PageInfo<SceneStyleEntity> list = sceneStyleService.listByPage(style, wrapper);
         return Result.success(list);

sxz-core/src/main/java/com/fdkk/sxz/webApi/mapper/ISceneMapper.java

@@ -2,9 +2,14 @@ package com.fdkk.sxz.webApi.mapper;
 
 import com.fdkk.sxz.base.IBaseMapper;
 import com.fdkk.sxz.entity.SceneEntity;
+import com.fdkk.sxz.vo.request.RequestScene;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Created by Hb_zzZ on 2020/7/14.
  */
@@ -12,4 +17,6 @@ import org.springframework.stereotype.Component;
 @Component("ISceneMapper")
 public interface ISceneMapper extends IBaseMapper<SceneEntity> {
 
+    @Select("SELECT DISTINCT ts.* FROM tb_scene ts LEFT JOIN tb_scene_style tss on ts.scene_num = tss.scene_num and tss.`status`!=#{param.status} ORDER BY ts.create_time,ts.id DESC")
+    List<SceneEntity> findAllByStatus(@Param("param") RequestScene scene);
 }

sxz-core/src/main/java/com/fdkk/sxz/webApi/service/ISceneService.java

@@ -2,10 +2,14 @@ package com.fdkk.sxz.webApi.service;
 
 import com.fdkk.sxz.base.IBaseService;
 import com.fdkk.sxz.entity.SceneEntity;
+import com.fdkk.sxz.vo.request.RequestScene;
+import com.github.pagehelper.PageInfo;
 
 /**
  * Created by Hb_zzZ on 2020/7/14.
  */
 public interface ISceneService extends IBaseService<SceneEntity> {
     SceneEntity findBySceneNum(String sceneNum);
+
+    PageInfo<SceneEntity> findAllByStatus(RequestScene scene);
 }

sxz-core/src/main/java/com/fdkk/sxz/webApi/service/impl/SceneServiceImpl.java

@@ -6,10 +6,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fdkk.sxz.base.impl.BaseServiceImpl;
 import com.fdkk.sxz.entity.SceneEntity;
+import com.fdkk.sxz.vo.request.RequestScene;
 import com.fdkk.sxz.webApi.mapper.ISceneMapper;
 import com.fdkk.sxz.webApi.service.ISceneService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Created by Hb_zzZ on 2020/7/14.
  */
@@ -25,4 +30,12 @@ public class SceneServiceImpl extends BaseServiceImpl<ISceneMapper, SceneEntity>
         }
         return getOne(wrapper);
     }
+
+    @Override
+    public PageInfo<SceneEntity> findAllByStatus(RequestScene scene) {
+        PageHelper.startPage(scene.getPageNum(), scene.getPageSize());
+        List<SceneEntity> list = getBaseMapper().findAllByStatus(scene);
+        PageInfo<SceneEntity> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
 }

sxz-modules/src/main/java/com/fdkk/sxz/entity/SceneEntity.java

@@ -14,7 +14,8 @@ public class SceneEntity extends BaseEntity {
 
     @TableField("scene_num")
     private String sceneNum;
-
+    @TableField("scene_name")
+    private String sceneName;
     @TableField("roaming_point_url")
     private String roamingPointUrl;
 }

sxz-modules/src/main/java/com/fdkk/sxz/vo/request/RequestSceneStyle.java

@@ -18,4 +18,7 @@ public class RequestSceneStyle extends RequestBase {
     private String styleName;
 
     private String vrSceneNum;
+
+    private int status;
+
 }