|
@@ -150,12 +150,12 @@ public class WebServiceImpl implements WebService {
|
|
|
List<AerialEntity> list = aerialService.list();
|
|
|
// 巡检数据
|
|
|
AerialEntity patrol = list.get(1);
|
|
|
- String data = patrol.getData();
|
|
|
- JSONObject dJson = JSONObject.parseObject(data);
|
|
|
- calcJsonPct(dJson);
|
|
|
+// String data = patrol.getData();
|
|
|
+// JSONObject dJson = JSONObject.parseObject(data);
|
|
|
+// calcJsonPct(dJson);
|
|
|
|
|
|
result.put("count", list.get(0)); // 巡检统计
|
|
|
- result.put("patrol", dJson); // 巡检管理
|
|
|
+ result.put("patrol", patrol.getData()); // 巡检管理
|
|
|
result.put("img", imgService.listByModule(TypeCode.MODULE_SITE)); //监控图
|
|
|
|
|
|
redisCache.setCacheObject(CACHE_AERIAL, result, CACHE_TIME, TimeUnit.MINUTES);
|