|
|
@@ -251,7 +251,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
HashMap<String,SceneColdStorage> coldStorageMap = null;
|
|
|
HashMap<Long, User> userMap = null;
|
|
|
HashMap<Long, Camera> cameraMap = null;
|
|
|
- HashMap<String,JSONObject> ssSceneMap = null;
|
|
|
HashMap<String,MqSendLog> mqSendLogMap = null;
|
|
|
|
|
|
List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
|
|
|
@@ -263,12 +262,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
List<Long> cameraIds = records.parallelStream().map(SceneVo::getCameraId).collect(Collectors.toList());
|
|
|
cameraMap = cameraService.getByIds(cameraIds);
|
|
|
|
|
|
- if(param.getType() == 2 ){
|
|
|
- ssSceneMap = laserService.list(sceneNumList,4);
|
|
|
+ if(param.getType() == 2 && laserMap.isEmpty()){
|
|
|
+ laserMap = laserService.list(sceneNumList,4);
|
|
|
}
|
|
|
- if(param.getType() == 6){
|
|
|
- ssSceneMap = laserService.list(sceneNumList,5);
|
|
|
+ if(param.getType() == 6 && laserMap.isEmpty()){
|
|
|
+ laserMap = laserService.list(sceneNumList,5);
|
|
|
}
|
|
|
+
|
|
|
List<String> modelingNumList = page.getRecords().stream().filter(e -> e.getStatus() == 0).map(SceneVo::getNum).collect(Collectors.toList());
|
|
|
if(!modelingNumList.isEmpty()){
|
|
|
mqSendLogMap = mqSendLogService.getByNumList(modelingNumList);
|
|
|
@@ -276,7 +276,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
}
|
|
|
for (SceneVo record : page.getRecords()) {
|
|
|
if(param.getType() == 2 || param.getType() == 6){
|
|
|
- JSONObject ssObj = ssSceneMap.get(record.getNum());
|
|
|
+ JSONObject ssObj = laserMap.get(record.getNum());
|
|
|
if(ssObj!=null){
|
|
|
record.setSceneName(ssObj.getString("title"));
|
|
|
record.setThumb(ssObj.getString("thumb"));
|
lyhzzz