fix:提交

kongdeqiang

8 天以前 c5d77a67a20575dc9754dec40947ad652376f0cc

fix:提交

 src/main/java/com/wgcloud/controller/dp/DpController.java

@@ -2,9 +2,11 @@

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;
@@ -31,6 +33,8 @@
    @Autowired
    private OspfInfoService ospfInfoService;
    @Autowired
    private OspfMonitorService ospfMonitorService;
    @Autowired
    private OspfErrorLogService ospfErrorLogService;

    @GetMapping("/getTop")
@@ -55,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);
@@ -116,8 +118,8 @@
        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("ipAddress","主监测设备IP");
        hxMap.put("name","主监测设备");
        hxMap.put("status","0");
        list.add(hxMap);
        for (OspfInfo ospfInfo : ospfInfos) {

 src/main/resources/templates/common/aside.html

@@ -38,100 +38,100 @@
                    </a>
                </li>

                <th:block th:if="${#strings.startsWith(session.menuActive,'1')}">
                    <li class="nav-item has-treeview menu-open">
                        <a href="javascript:void(0);" class="nav-link active">
                </th:block>
                <th:block th:unless="${#strings.startsWith(session.menuActive,'1')}">
                    <li class="nav-item has-treeview">
                        <a  href="javascript:void(0);" class="nav-link">
                </th:block>
                        <i class="nav-icon fas fa-tachometer-alt"></i>
                        <p>
                            资源管理
                            <i class="right fas fa-angle-left"></i>
                        </p>
                    </a>
                    <ul class="nav nav-treeview">
                        <li class="nav-item">
                            <th:block th:if="${session.menuActive eq '12'}">
                                <a th:href="@{'/systemInfo/systemInfoList'}" class="nav-link active">
                            </th:block>
                            <th:block th:unless="${session.menuActive eq '12'}">
                                <a th:href="@{'/systemInfo/systemInfoList'}" class="nav-link">
                            </th:block>
                                <i class="fas fa-desktop nav-icon"></i>
                                <p>主机管理</p>
                            </a>
                        </li>
                        <li class="nav-item">
                            <th:block th:if="${session.menuActive eq '13'}">
                                <a th:href="@{'/appInfo/list'}" class="nav-link active">
                            </th:block>
                            <th:block th:unless="${session.menuActive eq '13'}">
                                <a th:href="@{'/appInfo/list'}" class="nav-link">
                            </th:block>
                                <i class="fas fa-tasks nav-icon"></i>
                                <p>进程管理</p>
                            </a>
                        </li>
                        <li class="nav-item">
                            <th:block th:if="${session.menuActive eq '15'}">
                                <a th:href="@{'/portInfo/list'}" class="nav-link active">
                            </th:block>
                            <th:block th:unless="${session.menuActive eq '15'}">
                                <a th:href="@{'/portInfo/list'}" class="nav-link">
                            </th:block>
                            <i class="fas fa-leaf nav-icon"></i>
                            <p>端口管理</p>
                            </a>
                        </li>
                        <li class="nav-item">
                            <th:block th:if="${session.menuActive eq '16'}">
                                <a th:href="@{'/fileWarnInfo/list'}" class="nav-link active">
                            </th:block>
                            <th:block th:unless="${session.menuActive eq '16'}">
                                <a th:href="@{'/fileWarnInfo/list'}" class="nav-link">
                            </th:block>
                            <i class="fas fa-comment nav-icon"></i>
                            <p>日志监控</p>
                            </a>
                        </li>
                        <li class="nav-item">
                            <th:block th:if="${session.menuActive eq '17'}">
                                <a th:href="@{'/fileSafe/list'}" class="nav-link active">
                            </th:block>
                            <th:block th:unless="${session.menuActive eq '17'}">
                                <a th:href="@{'/fileSafe/list'}" class="nav-link">
                            </th:block>
                            <i class="fas fa-shield-alt nav-icon"></i>
                            <p>文件防篡改</p>
                            </a>
                        </li>
                        <li class="nav-item">
                            <th:block th:if="${session.menuActive eq '14'}">
                                <a th:href="@{'/dockerInfo/list'}" class="nav-link active">
                            </th:block>
                            <th:block th:unless="${session.menuActive eq '14'}">
                                <a th:href="@{'/dockerInfo/list'}" class="nav-link">
                            </th:block>
                            <i class="fab fa-docker nav-icon"></i>
                            <p>DOCKER管理</p>
                            </a>
                        </li>
                        <li class="nav-item">
                            <th:block th:if="${session.menuActive eq '18'}">
                                <a th:href="@{'/customInfo/list'}" class="nav-link active">
                            </th:block>
                            <th:block th:unless="${session.menuActive eq '18'}">
                                <a th:href="@{'/customInfo/list'}" class="nav-link">
                            </th:block>
                            <i class="fas fa-star nav-icon"></i>
                            <p>自定义监控项</p>
                            </a>
                        </li>
                    </ul>
                </li>
<!--                <th:block th:if="${#strings.startsWith(session.menuActive,'1')}">-->
<!--                    <li class="nav-item has-treeview menu-open">-->
<!--                        <a href="javascript:void(0);" class="nav-link active">-->
<!--                </th:block>-->
<!--                <th:block th:unless="${#strings.startsWith(session.menuActive,'1')}">-->
<!--                    <li class="nav-item has-treeview">-->
<!--                        <a  href="javascript:void(0);" class="nav-link">-->
<!--                </th:block>-->
<!--                        <i class="nav-icon fas fa-tachometer-alt"></i>-->
<!--                        <p>-->
<!--                            资源管理-->
<!--                            <i class="right fas fa-angle-left"></i>-->
<!--                        </p>-->
<!--                    </a>-->
<!--                    <ul class="nav nav-treeview">-->
<!--                        <li class="nav-item">-->
<!--                            <th:block th:if="${session.menuActive eq '12'}">-->
<!--                                <a th:href="@{'/systemInfo/systemInfoList'}" class="nav-link active">-->
<!--                            </th:block>-->
<!--                            <th:block th:unless="${session.menuActive eq '12'}">-->
<!--                                <a th:href="@{'/systemInfo/systemInfoList'}" class="nav-link">-->
<!--                            </th:block>-->
<!--                                <i class="fas fa-desktop nav-icon"></i>-->
<!--                                <p>主机管理</p>-->
<!--                            </a>-->
<!--                        </li>-->
<!--                        <li class="nav-item">-->
<!--                            <th:block th:if="${session.menuActive eq '13'}">-->
<!--                                <a th:href="@{'/appInfo/list'}" class="nav-link active">-->
<!--                            </th:block>-->
<!--                            <th:block th:unless="${session.menuActive eq '13'}">-->
<!--                                <a th:href="@{'/appInfo/list'}" class="nav-link">-->
<!--                            </th:block>-->
<!--                                <i class="fas fa-tasks nav-icon"></i>-->
<!--                                <p>进程管理</p>-->
<!--                            </a>-->
<!--                        </li>-->
<!--                        <li class="nav-item">-->
<!--                            <th:block th:if="${session.menuActive eq '15'}">-->
<!--                                <a th:href="@{'/portInfo/list'}" class="nav-link active">-->
<!--                            </th:block>-->
<!--                            <th:block th:unless="${session.menuActive eq '15'}">-->
<!--                                <a th:href="@{'/portInfo/list'}" class="nav-link">-->
<!--                            </th:block>-->
<!--                            <i class="fas fa-leaf nav-icon"></i>-->
<!--                            <p>端口管理</p>-->
<!--                            </a>-->
<!--                        </li>-->
<!--                        <li class="nav-item">-->
<!--                            <th:block th:if="${session.menuActive eq '16'}">-->
<!--                                <a th:href="@{'/fileWarnInfo/list'}" class="nav-link active">-->
<!--                            </th:block>-->
<!--                            <th:block th:unless="${session.menuActive eq '16'}">-->
<!--                                <a th:href="@{'/fileWarnInfo/list'}" class="nav-link">-->
<!--                            </th:block>-->
<!--                            <i class="fas fa-comment nav-icon"></i>-->
<!--                            <p>日志监控</p>-->
<!--                            </a>-->
<!--                        </li>-->
<!--                        <li class="nav-item">-->
<!--                            <th:block th:if="${session.menuActive eq '17'}">-->
<!--                                <a th:href="@{'/fileSafe/list'}" class="nav-link active">-->
<!--                            </th:block>-->
<!--                            <th:block th:unless="${session.menuActive eq '17'}">-->
<!--                                <a th:href="@{'/fileSafe/list'}" class="nav-link">-->
<!--                            </th:block>-->
<!--                            <i class="fas fa-shield-alt nav-icon"></i>-->
<!--                            <p>文件防篡改</p>-->
<!--                            </a>-->
<!--                        </li>-->
<!--                        <li class="nav-item">-->
<!--                            <th:block th:if="${session.menuActive eq '14'}">-->
<!--                                <a th:href="@{'/dockerInfo/list'}" class="nav-link active">-->
<!--                            </th:block>-->
<!--                            <th:block th:unless="${session.menuActive eq '14'}">-->
<!--                                <a th:href="@{'/dockerInfo/list'}" class="nav-link">-->
<!--                            </th:block>-->
<!--                            <i class="fab fa-docker nav-icon"></i>-->
<!--                            <p>DOCKER管理</p>-->
<!--                            </a>-->
<!--                        </li>-->
<!--                        <li class="nav-item">-->
<!--                            <th:block th:if="${session.menuActive eq '18'}">-->
<!--                                <a th:href="@{'/customInfo/list'}" class="nav-link active">-->
<!--                            </th:block>-->
<!--                            <th:block th:unless="${session.menuActive eq '18'}">-->
<!--                                <a th:href="@{'/customInfo/list'}" class="nav-link">-->
<!--                            </th:block>-->
<!--                            <i class="fas fa-star nav-icon"></i>-->
<!--                            <p>自定义监控项</p>-->
<!--                            </a>-->
<!--                        </li>-->
<!--                    </ul>-->
<!--                </li>-->


                <th:block th:if="${#strings.startsWith(session.menuActive,'4')}">
@@ -298,58 +298,58 @@
                </ul>
                </li>

                <th:block th:if="${#strings.startsWith(session.menuActive,'7')}">
                    <li class="nav-item has-treeview menu-open">
                        <a  href="javascript:void(0);" class="nav-link active">
                </th:block>
                <th:block th:unless="${#strings.startsWith(session.menuActive,'7')}">
                    <li class="nav-item has-treeview">
                        <a  href="javascript:void(0);" class="nav-link">
                </th:block>
                <i class="nav-icon fas fa-network-wired"></i>
                <p title="自动绘制网络拓扑图">
                    拓扑图
                    <i class="fas fa-angle-left right"></i>
                </p>
                </a>
                <ul class="nav nav-treeview">
                    <li class="nav-item">
                        <th:block th:if="${session.menuActive eq '71'}">
                            <a th:href="@{'/tuopu/tuopuListHost'}" class="nav-link active">
                        </th:block>
                        <th:block th:unless="${session.menuActive eq '71'}">
                            <a th:href="@{'/tuopu/tuopuListHost'}" class="nav-link">
                        </th:block>
                        <i class="nav-icon far fa-circle text-info"></i>
                        <p>主机拓扑图</p>
                        </a>
                    </li>
                    <li class="nav-item">
                        <th:block th:if="${session.menuActive eq '72'}">
                            <a th:href="@{'/tuopu/tuopuListSt'}" class="nav-link active">
                        </th:block>
                        <th:block th:unless="${session.menuActive eq '72'}">
                            <a th:href="@{'/tuopu/tuopuListSt'}" class="nav-link">
                        </th:block>
                        <i class="far fa-circle nav-icon"></i>
                        <p>数通拓扑图</p>
                        </a>
                    </li>
<!--                <th:block th:if="${#strings.startsWith(session.menuActive,'7')}">-->
<!--                    <li class="nav-item has-treeview menu-open">-->
<!--                        <a  href="javascript:void(0);" class="nav-link active">-->
<!--                </th:block>-->
<!--                <th:block th:unless="${#strings.startsWith(session.menuActive,'7')}">-->
<!--                    <li class="nav-item has-treeview">-->
<!--                        <a  href="javascript:void(0);" class="nav-link">-->
<!--                </th:block>-->
<!--                <i class="nav-icon fas fa-network-wired"></i>-->
<!--                <p title="自动绘制网络拓扑图">-->
<!--                    拓扑图-->
<!--                    <i class="fas fa-angle-left right"></i>-->
<!--                </p>-->
<!--                </a>-->
<!--                <ul class="nav nav-treeview">-->
<!--                    <li class="nav-item">-->
<!--                        <th:block th:if="${session.menuActive eq '71'}">-->
<!--                            <a th:href="@{'/tuopu/tuopuListHost'}" class="nav-link active">-->
<!--                        </th:block>-->
<!--                        <th:block th:unless="${session.menuActive eq '71'}">-->
<!--                            <a th:href="@{'/tuopu/tuopuListHost'}" class="nav-link">-->
<!--                        </th:block>-->
<!--                        <i class="nav-icon far fa-circle text-info"></i>-->
<!--                        <p>主机拓扑图</p>-->
<!--                        </a>-->
<!--                    </li>-->
<!--                    <li class="nav-item">-->
<!--                        <th:block th:if="${session.menuActive eq '72'}">-->
<!--                            <a th:href="@{'/tuopu/tuopuListSt'}" class="nav-link active">-->
<!--                        </th:block>-->
<!--                        <th:block th:unless="${session.menuActive eq '72'}">-->
<!--                            <a th:href="@{'/tuopu/tuopuListSt'}" class="nav-link">-->
<!--                        </th:block>-->
<!--                        <i class="far fa-circle nav-icon"></i>-->
<!--                        <p>数通拓扑图</p>-->
<!--                        </a>-->
<!--                    </li>-->

                </ul>
                </li>
<!--                </ul>-->
<!--                </li>-->

                <li class="nav-item">
                    <th:block th:if="${session.menuActive eq '91'}">
                        <a th:href="@{'/report/index'}" class="nav-link active">
                    </th:block>
                    <th:block th:unless="${session.menuActive eq '91'}">
                        <a th:href="@{'/report/index'}" class="nav-link">
                    </th:block>
                    <i class="nav-icon  fas fa-chart-pie"></i>
                    <p>统计报表</p>
                    </a>
                </li>
<!--                <li class="nav-item">-->
<!--                    <th:block th:if="${session.menuActive eq '91'}">-->
<!--                        <a th:href="@{'/report/index'}" class="nav-link active">-->
<!--                    </th:block>-->
<!--                    <th:block th:unless="${session.menuActive eq '91'}">-->
<!--                        <a th:href="@{'/report/index'}" class="nav-link">-->
<!--                    </th:block>-->
<!--                    <i class="nav-icon  fas fa-chart-pie"></i>-->
<!--                    <p>统计报表</p>-->
<!--                    </a>-->
<!--                </li>-->


                <th:block th:if="${#strings.startsWith(session.menuActive,'2')}">
@@ -389,17 +389,17 @@
                        <p>邮件告警</p>
                        </a>
                    </li>
                    <li class="nav-item">
                        <th:block th:if="${session.menuActive eq '23'}">
                            <a th:href="@{'/shellInfo/list'}" class="nav-link active">
                        </th:block>
                        <th:block th:unless="${session.menuActive eq '23'}">
                            <a th:href="@{'/shellInfo/list'}" class="nav-link">
                        </th:block>
                        <i class="nav-icon fas fa-terminal"></i>
                        <p>指令下发</p>
                        </a>
                    </li>
<!--                    <li class="nav-item">-->
<!--                        <th:block th:if="${session.menuActive eq '23'}">-->
<!--                            <a th:href="@{'/shellInfo/list'}" class="nav-link active">-->
<!--                        </th:block>-->
<!--                        <th:block th:unless="${session.menuActive eq '23'}">-->
<!--                            <a th:href="@{'/shellInfo/list'}" class="nav-link">-->
<!--                        </th:block>-->
<!--                        <i class="nav-icon fas fa-terminal"></i>-->
<!--                        <p>指令下发</p>-->
<!--                        </a>-->
<!--                    </li>-->
                    <li class="nav-item" th:if="${application.hostGroup == 'true'  && session.LOGIN_KEY.role == 'admin'}">
                        <th:block th:if="${session.menuActive eq '24'}">
                            <a th:href="@{'/hostGroup/list'}" class="nav-link active">
@@ -437,45 +437,45 @@
                    </a>
                </li>

                <th:block th:if="${#strings.startsWith(session.menuActive,'c')}">
                    <li class="nav-item has-treeview menu-open">
                        <a  href="javascript:void(0);" class="nav-link active">
                </th:block>
                <th:block th:unless="${#strings.startsWith(session.menuActive,'c')}">
                    <li class="nav-item has-treeview">
                        <a  href="javascript:void(0);" class="nav-link">
                </th:block>
                <i class="nav-icon fas fa-table"></i>
                <p title="巡检管理">
                    巡检管理
                    <i class="fas fa-angle-left right"></i>
                </p>
                </a>
                <ul class="nav nav-treeview">
                    <li class="nav-item">
                        <th:block th:if="${session.menuActive eq 'c1'}">
                            <a th:href="@{'/inspectionTask/list'}" class="nav-link active">
                        </th:block>
                        <th:block th:unless="${session.menuActive eq 'c1'}">
                            <a th:href="@{'/inspectionTask/list'}" class="nav-link">
                        </th:block>
                        <i class="nav-icon far fa-circle text-info"></i>
                        <p>巡检计划</p>
                        </a>
                    </li>
                    <li class="nav-item">
                        <th:block th:if="${session.menuActive eq 'c2'}">
                            <a th:href="@{'/failurelogging/list'}" class="nav-link active">
                        </th:block>
                        <th:block th:unless="${session.menuActive eq 'c2'}">
                            <a th:href="@{'/failurelogging/list'}" class="nav-link">
                        </th:block>
                        <i class="far fa-circle nav-icon"></i>
                        <p>备件更换</p>
                        </a>
                    </li>
<!--                <th:block th:if="${#strings.startsWith(session.menuActive,'c')}">-->
<!--                    <li class="nav-item has-treeview menu-open">-->
<!--                        <a  href="javascript:void(0);" class="nav-link active">-->
<!--                </th:block>-->
<!--                <th:block th:unless="${#strings.startsWith(session.menuActive,'c')}">-->
<!--                    <li class="nav-item has-treeview">-->
<!--                        <a  href="javascript:void(0);" class="nav-link">-->
<!--                </th:block>-->
<!--                <i class="nav-icon fas fa-table"></i>-->
<!--                <p title="巡检管理">-->
<!--                    巡检管理-->
<!--                    <i class="fas fa-angle-left right"></i>-->
<!--                </p>-->
<!--                </a>-->
<!--                <ul class="nav nav-treeview">-->
<!--                    <li class="nav-item">-->
<!--                        <th:block th:if="${session.menuActive eq 'c1'}">-->
<!--                            <a th:href="@{'/inspectionTask/list'}" class="nav-link active">-->
<!--                        </th:block>-->
<!--                        <th:block th:unless="${session.menuActive eq 'c1'}">-->
<!--                            <a th:href="@{'/inspectionTask/list'}" class="nav-link">-->
<!--                        </th:block>-->
<!--                        <i class="nav-icon far fa-circle text-info"></i>-->
<!--                        <p>巡检计划</p>-->
<!--                        </a>-->
<!--                    </li>-->
<!--                    <li class="nav-item">-->
<!--                        <th:block th:if="${session.menuActive eq 'c2'}">-->
<!--                            <a th:href="@{'/failurelogging/list'}" class="nav-link active">-->
<!--                        </th:block>-->
<!--                        <th:block th:unless="${session.menuActive eq 'c2'}">-->
<!--                            <a th:href="@{'/failurelogging/list'}" class="nav-link">-->
<!--                        </th:block>-->
<!--                        <i class="far fa-circle nav-icon"></i>-->
<!--                        <p>备件更换</p>-->
<!--                        </a>-->
<!--                    </li>-->

                </ul>
<!--                </ul>-->
                </li>