场景关联

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -2063,7 +2063,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     }
 
 
-    private void addOrUpdateLinkPanStyles(String num, List<String> styles) throws Exception{
+    private void addOrUpdateLinkPanStyles(String num, List<JSONObject> styles) throws Exception{
 
         this.syncLinkPanStylesFromFileToRedis(num);
 
@@ -2073,9 +2073,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         Map<String, String> styleMap = new HashMap<>();
         styles.stream().forEach(style->{
-            JSONObject jsonObject = JSON.parseObject(style);
-            String id = jsonObject.getString("id");
-            styleMap.put(id, style);
+            String id = style.getString("id");
+            styleMap.put(id, style.toJSONString());
         });
 
         String key = String.format(RedisKey.SCENE_LINKPAN_STYLES, num);
@@ -2107,7 +2106,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 return;
             }
             String linkSceneFilePath = String.format(ConstantFilePath.SCENE_USER_PATH_V4, num);
-            String linkSceneData = cn.hutool.core.io.FileUtil.readUtf8String(linkSceneFilePath + "link-scene.json");
+            String linkSceneData = FileUtils.readFile(linkSceneFilePath + "link-scene.json");
             if(StrUtil.isEmpty(linkSceneData)){
                 return;
             }
@@ -2129,13 +2128,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
     }
 
-    private void addOrUpdateLinPan(String num, List<LinkPanParamVO> linkPanList) throws Exception{
+    private void addOrUpdateLinPan(String num, List<JSONObject> linkPanList) throws Exception{
         Map<String, String> addOrUpdateMap = new HashMap<>();
         int i = 0;
-        for (LinkPanParamVO linkPan : linkPanList) {
-            JSONObject jsonObject = JSON.parseObject(linkPan.getLinkPanData());
+        for (JSONObject jsonObject : linkPanList) {
             jsonObject.put("createTime", Calendar.getInstance().getTimeInMillis() + i++);
-            addOrUpdateMap.put(linkPan.getSid(), jsonObject.toJSONString());
+            addOrUpdateMap.put(jsonObject.getString("sid"), jsonObject.toJSONString());
         }
 
         this.syncLinPanFromFileToRedis(num);
@@ -2169,7 +2167,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 return;
             }
             String linkSceneFilePath = String.format(ConstantFilePath.SCENE_USER_PATH_V4, num);
-            String linkSceneData = cn.hutool.core.io.FileUtil.readUtf8String(linkSceneFilePath + "link-scene.json");
+            String linkSceneData = FileUtils.readFile(linkSceneFilePath + "link-scene.json");
             if(StrUtil.isEmpty(linkSceneData)){
                 return;
             }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/LinkPanParamVO.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import javax.validation.constraints.NotBlank;
 import lombok.Data;
 
@@ -17,7 +18,7 @@ public class LinkPanParamVO {
     @NotBlank(message = "sid不能为空")
     private String sid;
 
-    private String linkPanData;
+    private JSONObject linkPanData;
 
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SaveLinkPanParamVO.java

@@ -1,5 +1,7 @@
 package com.fdkankan.scene.vo;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
@@ -20,11 +22,12 @@ public class SaveLinkPanParamVO {
     @NotBlank(message = "场景码不能为空")
     private String num;
 
-    @Valid
-    @NotNull(message = "热点数据不能为空")
-    private List<LinkPanParamVO> linkPans;
+//    @Valid
+    @NotNull(message = "linkPans不能为空")
+//    private List<LinkPanParamVO> linkPans;
+    private List<JSONObject> linkPans;
 
-    private List<String> styles;
+    private List<JSONObject> styles;