增加转换接口

pom.xml

@@ -389,6 +389,7 @@
                 <artifactId>netty-websocket-spring-boot-starter</artifactId>
                 <version>0.12.0</version>
             </dependency>
+
             <!-- 钉钉告警 -->
             <!--		<dependency>-->
             <!--			<groupId>com.aliyun</groupId>-->

sxz-core/src/main/java/com/fdkk/sxz/other/mq/TopicRabbitConfig.java

@@ -14,37 +14,37 @@ import java.util.Map;
 public class TopicRabbitConfig {
 
 
-    public final static String CHANGE = "topic.chang.dev";
+    public final static String CHANGE = "topic.chang";
     //灯光预览
-    public final static String LIGHT = "topic.light.dev";
+    public final static String LIGHT = "topic.light";
 
     ////图片渲染
     //public final static String MODEL_CREAT_THUM = "topic.modelCreatThum";
 
     //上传模型
-    public final static String MODEL = "topic.model.dev";
+    public final static String MODEL = "topic.model";
     //上传模型处理业务
-    public final static String MODEL_BIZ = "topic.modelBiz.dev";
+    public final static String MODEL_BIZ = "topic.modelBiz";
     // 线下版本使用队列
-    public final static String MODEL_BIZ_3D = "topic.3dModelBiz.dev";
+    public final static String MODEL_BIZ_3D = "topic.3dModelBiz";
     //"更新模型库，syncmodel
-    public final static String SYNCMODEL = "topic.syncmodel.dev";
+    public final static String SYNCMODEL = "topic.syncmodel";
 
     //上传后提交模型
-    public final static String ADDMODEL = "topic.addModel.dev";
+    public final static String ADDMODEL = "topic.addModel";
     //上传后提交模型3D端
-    public final static String ADDMODELTO3D = "topic.addmodelto3d.dev";
+    public final static String ADDMODELTO3D = "topic.addmodelto3d";
     //处理
-    public final static String MVIEW = "delay.mview.dev";
+    public final static String MVIEW = "delay.mview";
 
     /**
      * 普通交换机
      */
-    public final static String TOPICE = "topicExchange.dev";
+    public final static String TOPICE = "topicExchange";
     /**
      * 延迟消息交换机
      */
-    public final static String DELAY_EXCHANGE = "delay.exchange.dev";
+    public final static String DELAY_EXCHANGE = "delay.exchange";
 
     @Bean
     public CustomExchange delayMessageExchange() {

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

@@ -139,7 +139,7 @@ public class ImportDataController extends BaseController {
                 sceneEntity.setRoamingPointUrl(roamingPointUrl);
                 sceneService.updateById(sceneEntity);
             }
-            if (sceneEntity.getSceneName().equals(sceneName)) {
+            if (!sceneEntity.getSceneName().equals(sceneName)) {
                 sceneEntity.setSceneName(sceneName);
                 sceneService.updateById(sceneEntity);
             }
@@ -515,7 +515,7 @@ public class ImportDataController extends BaseController {
     @RequestMapping(value = "/createJson", method = RequestMethod.GET)
     @NoAuthentication
     @AroundLog(name = "生成房型数据")
-    public JSONObject createJson(String num, String styleNum, String sceneName) {
+    public JSONObject createJson(String num, String styleNum, String sceneName, Long userId) {
 
         JSONObject resultJson = new JSONObject();
 
@@ -581,6 +581,7 @@ public class ImportDataController extends BaseController {
                                     "data/data" + num + "/roamingPoint.json");
                             sceneEntity.setSceneNum(num);
                             sceneEntity.setSceneName(sceneName);
+                            sceneEntity.setUserId(userId);
 
                             String roamingPointUrl = "";
                             Boolean existRoamingPoint = uploadToOssUtil.existFileToOSS("data/data" + num + "/roamingPoint.json", "4dkankan");

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

@@ -119,7 +119,6 @@ public class LoginController extends BaseController {
             statisticsEntity.setStatisticsDate(DateUtil.date2String(new Date(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
             statisticsService.save(statisticsEntity);
         }
-
         return object;
     }
 

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

@@ -6,6 +6,7 @@ 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.constant.CodeConstant;
 import com.fdkk.sxz.entity.SceneEntity;
 import com.fdkk.sxz.other.mq.TopicRabbitConfig;
 import com.fdkk.sxz.util.EscapeUtil;
@@ -110,6 +111,7 @@ public class SceneController extends BaseController {
                 JSONArray data1 = jsonObject.getJSONObject("data").getJSONArray("list");
                 if (data1.size() > 0) {
                     sceneEntity.setSceneName(data1.getJSONObject(0).getString("sceneName"));
+                    sceneEntity.setUserId(data1.getJSONObject(0).getLong("userId"));
                     sceneService.updateById(sceneEntity);
                 }
             }
@@ -131,6 +133,9 @@ public class SceneController extends BaseController {
     @NoAuthentication
     @AroundLog(name = "获取四维看看用户场景列表")
     public Result getAllSceneList(@RequestBody RequestScene scene) {
+        if (scene.getUserId() == null) {
+            return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
+        }
         PageInfo<SceneEntity> sceneEntityPageInfo = sceneService.findAllByStatus(scene);
         return success(sceneEntityPageInfo);
     }

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

@@ -18,6 +18,7 @@ import com.fdkk.sxz.vo.request.RequestScene;
 import com.fdkk.sxz.vo.request.RequestSceneLight;
 import com.fdkk.sxz.vo.request.RequestSceneStyle;
 import com.fdkk.sxz.vo.response.ResponseSceneLight;
+import com.fdkk.sxz.vo.response.ResponseSceneStyle;
 import com.fdkk.sxz.vo.response.ResponseSceneStyleIssue;
 import com.fdkk.sxz.webApi.service.ISceneLightService;
 import com.fdkk.sxz.webApi.service.ISceneStyleService;
@@ -196,6 +197,43 @@ public class SceneStyleController extends BaseController {
     }
 
     /**
+     * 根据场景码获取风格列表
+     *
+     * @param style
+     * @return
+     */
+    @ApiOperation("根据场景码获取风格列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sceneNum", value = "四维看看场景码", dataType = "String"),
+            @ApiImplicitParam(name = "styleName", value = "风格方案名称", dataType = "String"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", dataType = "String"),
+            @ApiImplicitParam(name = "pageSize", value = "页数", dataType = "String")})
+    @RequestMapping(value = "/offlineList", method = RequestMethod.POST)
+    @NoAuthentication
+    @AroundLog(name = "根据场景码获取风格列表")
+    public Result offlineList(@RequestBody RequestSceneStyle style) {
+        LambdaQueryWrapper<SceneStyleEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(SceneStyleEntity::getSceneNum, style.getSceneNum());
+        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);
+        PageInfo<ResponseSceneStyle> newPage = new PageInfo<>();
+        BeanUtils.copyProperties(list, newPage, "list");
+        List<ResponseSceneStyle> collect = list.getList().stream().map(a -> {
+            ResponseSceneStyle sceneStyle = new ResponseSceneStyle();
+            BeanUtils.copyProperties(a, sceneStyle);
+            return sceneStyle;
+        }).collect(Collectors.toList());
+        newPage.setList(collect);
+        return Result.success(newPage);
+    }
+
+    /**
      * 根据场景码获取发布风格列表
      *
      * @param style

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

@@ -17,6 +17,7 @@ import java.util.List;
 @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`!= -2 ORDER BY ts.create_time,ts.id DESC")
+    @Select("SELECT DISTINCT ts.* FROM tb_scene ts LEFT JOIN tb_scene_style tss on ts.scene_num = tss.scene_num and tss.`status`!= -2 and ts.user_id=#{param.userId} ORDER BY ts.create_time,ts.id " +
+            "DESC")
     List<SceneEntity> findAllByStatus(@Param("param") RequestScene scene);
 }

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

@@ -18,4 +18,6 @@ public class SceneEntity extends BaseEntity {
     private String sceneName;
     @TableField("roaming_point_url")
     private String roamingPointUrl;
+    @TableField("user_id")
+    private Long userId;
 }

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

@@ -17,4 +17,6 @@ public class RequestScene extends RequestBase {
 
     private Long id;
 
+    private Long userId;
+
 }

sxz-modules/src/main/java/com/fdkk/sxz/vo/response/ResponseSceneStyle.java

@@ -0,0 +1,19 @@
+package com.fdkk.sxz.vo.response;
+
+import lombok.Data;
+
+/**
+ * Created by Hb_zzZ on 2021/1/19.
+ */
+@Data
+public class ResponseSceneStyle {
+
+    private Long id;
+
+    private String sceneNum;
+
+    private String styleName;
+
+    private String styleNum;
+
+}