|
|
@@ -149,31 +149,19 @@ public class GasCommonController {
|
|
|
return AjaxResult.success(Convert.toList(IllegalInfo.class, stringObjectMap.get("pageList")));
|
|
|
}
|
|
|
|
|
|
-// @GetMapping("/third/queryIllegalInfoList")
|
|
|
-// @ApiOperation("提供第三方：获取嫌疑或违规船舶信息")
|
|
|
-// public AjaxResult thirdQueryIllegalInfoList(@RequestParam String mmsi, @RequestParam(required = false, defaultValue = "2") Integer size) {
|
|
|
-// Map<String, Object> equalsCondition = new HashMap<>();
|
|
|
-// equalsCondition.put("mmsi", mmsi);
|
|
|
-// equalsCondition.put("")
|
|
|
-// List<String> orderBy = new ArrayList<>();
|
|
|
-// orderBy.add("-createTime");
|
|
|
-// Map<String, Object> stringObjectMap = client.searchDocument(equalsCondition,
|
|
|
-// null,
|
|
|
-// orderBy,
|
|
|
-// 1,
|
|
|
-// size,
|
|
|
-// ElasticConstants.AIS_ILLEGAL_SHIP,
|
|
|
-// ElasticConstants.SO2_ALERT,
|
|
|
-// ElasticConstants.HEIYAN_SHIP_RECOGNITION);
|
|
|
-//
|
|
|
-// return AjaxResult.success(Convert.toList(IllegalInfo.class, stringObjectMap.get("pageList")));
|
|
|
-// }
|
|
|
-
|
|
|
@GetMapping("/queryDeviceList")
|
|
|
@ApiOperation("获取所有设备数据")
|
|
|
public AjaxResult queryDeviceList(@RequestParam(required = false) String monitor) {
|
|
|
if (redisCache.hasKey(CacheConstants.DEVICE_LIST_STATIC)) {
|
|
|
- return AjaxResult.success(redisCache.getCacheMap(CacheConstants.DEVICE_LIST_STATIC));
|
|
|
+ Map<String, Object> cacheMap = redisCache.getCacheMap(CacheConstants.DEVICE_LIST_STATIC);
|
|
|
+ Map<String, Object> data = MapUtil.newHashMap(6, true);
|
|
|
+ data.put("南京三桥", cacheMap.get("南京三桥"));
|
|
|
+ data.put("南京四桥", cacheMap.get("南京四桥"));
|
|
|
+ data.put("润扬大桥", cacheMap.get("润扬大桥"));
|
|
|
+ data.put("泰州大桥", cacheMap.get("泰州大桥"));
|
|
|
+ data.put("江阴大桥", cacheMap.get("江阴大桥"));
|
|
|
+ data.put("苏通大桥", cacheMap.get("苏通大桥"));
|
|
|
+ return AjaxResult.success(data);
|
|
|
}
|
|
|
List<DeviceBo> njsanq = new ArrayList<>();
|
|
|
List<DeviceBo> njsiq = new ArrayList<>();
|
459242451@qq.com