Merge branch 'feature-v4.1.0-20220620' into test

# Conflicts:
#	4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

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

@@ -1888,7 +1888,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if (scenePlus == null)
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
 
-        List<String> idList = param.getIdList();
+        List<String> idList = param.getSidList();
 
         this.syncLinkPanStylesFromFileToRedis(param.getNum());
 
@@ -2107,7 +2107,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         Map<String, String> styleMap = new HashMap<>();
         styles.stream().forEach(style->{
-            String id = style.getString("id");
+            String id = style.getString("sid");
             styleMap.put(id, style.toJSONString());
         });
 
@@ -2152,7 +2152,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             Map<String, String> styleMap = new HashMap<>();
             for (Object style : stylesArr) {
                 JSONObject styleObj = (JSONObject)style;
-                String id = styleObj.getString("id");
+                String id = styleObj.getString("sid");
                 styleMap.put(id, styleObj.toJSONString());
             }
             redisUtil.hmset(key, styleMap);

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

@@ -90,6 +90,7 @@ import com.fdkankan.scene.vo.SceneProVO;
 import com.fdkankan.scene.vo.SceneVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.nio.charset.StandardCharsets;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;

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

@@ -19,8 +19,8 @@ public class DeleteLinkSceneStylesParamVO {
     @NotBlank(message = "场景码不能为空")
     private String num;
 
-    @NotNull(message = "idList不能为空")
-    private List<String> idList;
+    @NotNull(message = "sidList不能为空")
+    private List<String> sidList;