From 55f4c8cda0f426e3a8d31908018a6b9c890bc006 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang@960204@163.com>
Date: 星期二, 02 十二月 2025 20:04:09 +0800
Subject: [PATCH] fix：完善逻辑
---
src/main/java/com/wgcloud/controller/dp/DpController.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/wgcloud/controller/dp/DpController.java b/src/main/java/com/wgcloud/controller/dp/DpController.java
index e56b21c..63a6ae0 100644
--- a/src/main/java/com/wgcloud/controller/dp/DpController.java
+++ b/src/main/java/com/wgcloud/controller/dp/DpController.java
@@ -1,7 +1,9 @@
package com.wgcloud.controller.dp;
+import com.wgcloud.entity.OspfErrorLog;
import com.wgcloud.entity.OspfInfo;
import com.wgcloud.entity.SnmpInfo;
+import com.wgcloud.service.OspfErrorLogService;
import com.wgcloud.service.OspfInfoService;
import com.wgcloud.service.SnmpInfoService;
import com.wgcloud.util.R;
@@ -27,6 +29,8 @@
@Autowired
private OspfInfoService ospfInfoService;
+ @Autowired
+ private OspfErrorLogService ospfErrorLogService;
@GetMapping("/getTop")
public R getTop5() throws Exception {
@@ -68,14 +72,20 @@
SimpleDateFormat sdf = new SimpleDateFormat("MM/dd");
String format = sdf.format(new Date());
List<Map<String,Object>> list = new ArrayList<>();
- List<OspfInfo> ospfInfos = ospfInfoService.selectAllByParams(null);
+ Map<String,Object> query = new HashMap<>();
+ query.put("state","1");
+ List<OspfErrorLog> ospfErrorLogs = ospfErrorLogService.selectAllByParams(query);
+ Map<String,Object> query2 = new HashMap<>();
+ query2.put("state","0");
+ List<OspfErrorLog> ospfErrorLogs2 = ospfErrorLogService.selectAllByParams(query2);
+ ospfErrorLogs.addAll(ospfErrorLogs2);
- for (OspfInfo ospfInfo : ospfInfos) {
+ for (OspfErrorLog ospfInfo : ospfErrorLogs) {
HashMap<String, Object> map = new HashMap<>();
- map.put("date",format);
+ map.put("date",sdf.format(ospfInfo.getCreateTime()));
map.put("name",ospfInfo.getInfoContent());
map.put("ipaddress",ospfInfo.getHostname());
- map.put("status",1);
+ map.put("status",ospfInfo.getState());
list.add(map);
}
return R.ok(list);
@@ -83,13 +93,16 @@
@GetMapping("/getCount")
public R getCount() throws Exception {
+ Map<String,Object> queryMap = new HashMap<>();
+ queryMap.put("state","1");
List<OspfInfo> ospfInfos = ospfInfoService.selectAllByParams(null);
+ List<OspfInfo> errorOspfInfos = ospfInfoService.selectAllByParams(queryMap);
Map<String,Object> map = new HashMap<>();
map.put("allCount",ospfInfos.size());
- map.put("normalCount",ospfInfos.size()-2);
- map.put("errorCount",2);
- double i = (double)(ospfInfos.size() - 2) /(double) ospfInfos.size();
- double o = (double)2 /(double) ospfInfos.size();
+ map.put("normalCount",ospfInfos.size()-errorOspfInfos.size());
+ map.put("errorCount",errorOspfInfos.size());
+ double i = (double)(ospfInfos.size()-errorOspfInfos.size()) /(double) ospfInfos.size();
+ double o = (double)errorOspfInfos.size() /(double) ospfInfos.size();
BigDecimal n = new BigDecimal(i).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal e = new BigDecimal(o).setScale(2, BigDecimal.ROUND_HALF_UP);
map.put("normalProp",n);
@@ -100,10 +113,16 @@
public R getInfo() throws Exception {
List<Map<String,Object>> list = new ArrayList<>();
List<OspfInfo> ospfInfos = ospfInfoService.selectAllByParams(null);
+ HashMap<String, Object> hxMap = new HashMap<>();
+ hxMap.put("ipAddress","\n鐢典俊锛�192.168.1.1\n 鑱旈�氾細192.168.2.1\n 绉诲姩锛�192.168.3.1");
+ hxMap.put("name","鍖楀浗鏍稿績");
+ hxMap.put("status","0");
+ list.add(hxMap);
for (OspfInfo ospfInfo : ospfInfos) {
HashMap<String, Object> map = new HashMap<>();
map.put("ipAddress",ospfInfo.getHostname());
- map.put("status",1);
+ map.put("name",ospfInfo.getInfoContent());
+ map.put("status",ospfInfo.getState());
list.add(map);
}
return R.ok(list);
--
Gitblit v1.9.1