Commit 782f4bf3 authored by gaozhentao's avatar gaozhentao

去除测试数据和无用方法

parent b8fd0ef6
...@@ -3,6 +3,7 @@ package com.yingxin.prms.api; ...@@ -3,6 +3,7 @@ package com.yingxin.prms.api;
import com.yingxin.prms.domain.FlowLine; import com.yingxin.prms.domain.FlowLine;
import com.yingxin.prms.domain.FlowNode; import com.yingxin.prms.domain.FlowNode;
import com.yingxin.prms.service.business.Manager; import com.yingxin.prms.service.business.Manager;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
...@@ -88,15 +89,6 @@ public class ReliabilityApi { ...@@ -88,15 +89,6 @@ public class ReliabilityApi {
public Map selectTopology(){ public Map selectTopology(){
return manager.selectTopology(); return manager.selectTopology();
} }
/**
* 获取拓扑图线数据
*
* @return
*/
// @PostMapping("selectTopologyLine")
// public List<FlowLine> selectTopologyLine(){
// return manager.selectTopologyLine();
// }
/** /**
* 保存数据 * 保存数据
...@@ -111,19 +103,8 @@ public class ReliabilityApi { ...@@ -111,19 +103,8 @@ public class ReliabilityApi {
* @return * @return
*/ */
@GetMapping("getStatistics") @GetMapping("getStatistics")
public Map getStatistics() { public JSONObject getStatistics() {
Map map = new HashMap(); return manager.getStatistics();
Map ss = new HashMap();
ss.put("yearVistis",22701);
ss.put("monthVistis",22701);
ss.put("dayVistis",22701);
ss.put("avgDailyVisits",22701);
ss.put("weekVisits",22701);
map.put("code",0);
map.put("data",ss);
map.put("msg","成功");
// return manager.getStatistics();
return map;
} }
} }
...@@ -508,10 +508,11 @@ public class Manager { ...@@ -508,10 +508,11 @@ public class Manager {
} }
public Map getStatistics() { public JSONObject getStatistics() {
Server_Host_Info serverHostInfo = cassandraDao.getStatisticsUri(); Server_Host_Info serverHostInfo = cassandraDao.getStatisticsUri();
Map<String, String> map = SendHttpUtil.doGet(serverHostInfo.getService_path()); Map<String, String> map = SendHttpUtil.doGet(serverHostInfo.getService_path());
return map; JSONObject json = JSONObject.fromObject(map.get("body"));
return json;
} }
public Map<String,Map> getErrorCountCluster() { public Map<String,Map> getErrorCountCluster() {
/*线程池*/ /*线程池*/
...@@ -546,13 +547,7 @@ public class Manager { ...@@ -546,13 +547,7 @@ public class Manager {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
// for (SingleHostStatus singleHostStatus : result) {
// SingleHostStatus singleHostStatus = (SingleHostStatus) future.get();
// hostStatusList.add(singleHostStatus);
// }
} }
// Server_Host_Info serverHostInfo = cassandraDao.getStatisticsUri();
// Map<String, String> map = SendHttpUtil.doGet(serverHostInfo.getService_path());
Map<String,Map> map = new HashMap(); Map<String,Map> map = new HashMap();
map.put("total",totalMap); map.put("total",totalMap);
map.put("error",errorMap); map.put("error",errorMap);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment