|
@@ -127,12 +127,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
|
|
|
|
|
|
for (SceneVo record : page.getRecords()) {
|
|
for (SceneVo record : page.getRecords()) {
|
|
- JSONObject ssObj = ssSceneMap.get(record.getNum());
|
|
|
|
- if(ssObj!=null){
|
|
|
|
- record.setSceneName(ssObj.getString("title"));
|
|
|
|
- record.setThumb(ssObj.getString("thumb"));
|
|
|
|
- record.setWebSite(ssObj.getString("webSite"));
|
|
|
|
- record.setIsObj(ssObj.getInteger("buildObjStatus"));
|
|
|
|
|
|
+ if(param.getType() == 2){
|
|
|
|
+ JSONObject ssObj = ssSceneMap.get(record.getNum());
|
|
|
|
+ if(ssObj!=null){
|
|
|
|
+ record.setSceneName(ssObj.getString("title"));
|
|
|
|
+ record.setThumb(ssObj.getString("thumb"));
|
|
|
|
+ record.setWebSite(ssObj.getString("webSite"));
|
|
|
|
+ record.setIsObj(ssObj.getInteger("buildObjStatus"));
|
|
|
|
+ }else{
|
|
|
|
+ record.setStatus(-1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
Company company = companyService.getByCameraId(record.getCameraId());
|
|
Company company = companyService.getByCameraId(record.getCameraId());
|