|
@@ -239,8 +239,7 @@ public class AppCameraController extends AppBaseController {
|
|
|
List<Map<String, Object>> cameraUse = (List<Map<String, Object>>) remoteSystemBaseService.getSortByType("camera_use").get("data");
|
|
|
data.addAll(screenSort(cameraUse));
|
|
|
return result;
|
|
|
- }
|
|
|
- else {
|
|
|
+ } else {
|
|
|
return remoteSystemBaseService.getSortByType(dictType);
|
|
|
}
|
|
|
}
|
|
@@ -257,41 +256,36 @@ public class AppCameraController extends AppBaseController {
|
|
|
|
|
|
/**
|
|
|
* 查询视联网详情
|
|
|
- * @param id 视联网设备ID
|
|
|
+ *
|
|
|
+ * @param id 视联网设备ID
|
|
|
* @param type 请求的数据类型:1=视联网/2=物联网/3=云广播
|
|
|
* @return AjaxResult
|
|
|
*/
|
|
|
@GetMapping("/getCameraById")
|
|
|
- public AjaxResult getCameraByCameraId(@RequestParam("id") String id, @RequestParam("type") String type){
|
|
|
+ public AjaxResult getCameraByCameraId(@RequestParam("id") String id, @RequestParam("type") String type) {
|
|
|
AjaxResult result;
|
|
|
- if("1".equals(type)){
|
|
|
+ StringBuilder urlType = new StringBuilder();
|
|
|
+ if ("1".equals(type)) {
|
|
|
result = remoteMonitorBaseService.selectByCameraId(id);
|
|
|
- }else if("2".equals(type)){
|
|
|
+ urlType.append("cameraImagesList");
|
|
|
+ } else if ("2".equals(type)) {
|
|
|
result = remoteMonitorBaseService.selectByDeviceId(id);
|
|
|
- }else if("3".equals(type)){
|
|
|
+ urlType.append("deviceImagesList");
|
|
|
+ } else if ("3".equals(type)) {
|
|
|
result = remoteMonitorBaseService.selectByBroadcastId(id);
|
|
|
- }else{
|
|
|
+ urlType.append("broadcastImagesList");
|
|
|
+ } else {
|
|
|
return AjaxResult.error("Request type is not found!");
|
|
|
}
|
|
|
-
|
|
|
- if("200".equals(result.get("code").toString())){
|
|
|
- StringBuilder urlType = new StringBuilder();
|
|
|
- Map<String, Object> data = (Map<String, Object>) result.get("data");
|
|
|
- if("1".equals(type)){
|
|
|
- urlType.append("cameraImagesList");
|
|
|
- }else if("2".equals(type)){
|
|
|
- urlType.append("deviceImagesList");
|
|
|
- }else if("3".equals(type)){
|
|
|
- urlType.append("broadcastImagesList");
|
|
|
- }
|
|
|
+ if ("200".equals(result.get("code").toString())) {
|
|
|
+ Map<String, Object> data = (Map<String, Object>) result.get("data");
|
|
|
List<LinkedHashMap<String, Object>> dataList = (List<LinkedHashMap<String, Object>>) data.get(urlType.toString());
|
|
|
PictureReplaceAll.replaceAllPictureUrl(dataList, "url");
|
|
|
- data.put(urlType.toString(),dataList);
|
|
|
+ data.put(urlType.toString(), dataList);
|
|
|
return AjaxResult.success(data);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return result;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
}
|