2.0.0

src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -80,6 +80,9 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
 
         this.addOrUpdateData(param.getNum(), param.getDataList());
 
+        //设置应用到全部数据
+        this.generalConfig(param.getNum(), param.getGeneralConfig());
+
         this.addOrUpdateIcons(param.getNum(), param.getIcons());
 
         //保存数据库
@@ -92,6 +95,23 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
 
     }
 
+    private void generalConfig(String num, JSONObject generalConfig){
+        if(CollUtil.isEmpty(generalConfig)){
+            return;
+        }
+        List<SceneEvidence> sceneEvidences = this.listByNum(num);
+        if(CollUtil.isEmpty(sceneEvidences)){
+            return;
+        }
+        sceneEvidences.stream().forEach(v->{
+            JSONObject visiSetting = v.getEvidenceContent().getJSONObject("visiSetting");
+            for (String settingKey : generalConfig.keySet()) {
+                visiSetting.put(settingKey, generalConfig.get(settingKey));
+            }
+        });
+        this.updateBatchById(sceneEvidences);
+    }
+
     private void batchPushMedia(SaveEvidenceParamVO param, SSOUser ssoUser, ScenePlus scenePlus){
         List<JSONObject> params = new ArrayList<>();
         for (EvidenceParamVO evidenceParamVO : param.getDataList()) {
@@ -200,7 +220,11 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
 
     @Override
     public List<SceneEvidence> listByNumAndSids(String num, Set<String> sids) {
-        return this.list(new LambdaQueryWrapper<SceneEvidence>().eq(SceneEvidence::getNum, num).in(SceneEvidence::getSid, sids));
+        LambdaQueryWrapper<SceneEvidence> queryWrapper = new LambdaQueryWrapper<SceneEvidence>().eq(SceneEvidence::getNum, num);
+        if(CollUtil.isNotEmpty(sids)){
+            queryWrapper.in(SceneEvidence::getSid, sids);
+        }
+        return this.list(queryWrapper);
     }
 
     @Override

src/main/java/com/fdkankan/scene/vo/SaveEvidenceParamVO.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.vo;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 
 import javax.validation.Valid;
@@ -28,6 +29,8 @@ public class SaveEvidenceParamVO {
     @Valid
     private List<String> icons;
 
+    private JSONObject generalConfig;
+
 
 
 }