From c5d77a67a20575dc9754dec40947ad652376f0cc Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 29 四月 2026 10:49:53 +0800
Subject: [PATCH] fix:提交
---
src/main/java/com/wgcloud/controller/dp/DpController.java | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 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..e52c207 100644
--- a/src/main/java/com/wgcloud/controller/dp/DpController.java
+++ b/src/main/java/com/wgcloud/controller/dp/DpController.java
@@ -1,12 +1,17 @@
package com.wgcloud.controller.dp;
+import com.wgcloud.entity.OspfErrorLog;
import com.wgcloud.entity.OspfInfo;
+import com.wgcloud.entity.OspfMonitor;
import com.wgcloud.entity.SnmpInfo;
+import com.wgcloud.service.OspfErrorLogService;
import com.wgcloud.service.OspfInfoService;
+import com.wgcloud.service.OspfMonitorService;
import com.wgcloud.service.SnmpInfoService;
import com.wgcloud.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -27,6 +32,10 @@
@Autowired
private OspfInfoService ospfInfoService;
+ @Autowired
+ private OspfMonitorService ospfMonitorService;
+ @Autowired
+ private OspfErrorLogService ospfErrorLogService;
@GetMapping("/getTop")
public R getTop5() throws Exception {
@@ -50,14 +59,12 @@
@GetMapping("/getWb")
public R getWb() throws Exception {
List<Map<String,Object>> list = new ArrayList<>();
- List<OspfInfo> ospfInfos = ospfInfoService.selectAllByParams(null);
-
- for (OspfInfo ospfInfo : ospfInfos) {
+ List<OspfMonitor> ospfMonitors = ospfMonitorService.selectAllByParams(null);
+ for (OspfMonitor ospfInfo : ospfMonitors) {
HashMap<String, Object> map = new HashMap<>();
map.put("name",ospfInfo.getInfoContent());
map.put("ipaddress",ospfInfo.getHostname());
- map.put("type",1);
- map.put("status",1);
+ map.put("remoteType",ospfInfo.getRemoteType());
list.add(map);
}
return R.ok(list);
@@ -68,14 +75,21 @@
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("id",ospfInfo.getId());
map.put("ipaddress",ospfInfo.getHostname());
- map.put("status",1);
+ map.put("status",ospfInfo.getState());
list.add(map);
}
return R.ok(list);
@@ -83,13 +97,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,14 +117,32 @@
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","涓荤洃娴嬭澶嘔P");
+ 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);
}
+ @GetMapping("/handle")
+ public R handle(String id) throws Exception {
+ OspfErrorLog ospfErrorLog = ospfErrorLogService.selectById(id);
+ if(ospfErrorLog.getState().equals("1")){
+ ospfErrorLog.setState("0");
+ ospfErrorLogService.updateById(ospfErrorLog);
+ return R.ok();
+ }else {
+ return R.ok();
+ }
+ }
+
}
--
Gitblit v1.9.1