lchao 1 년 전
부모
커밋
fdb08712d4

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SecurityController.java

@@ -61,12 +61,12 @@ public class SecurityController {
     @ResponseBody
     public AjaxResult getToken(@RequestBody TokenRequest form) {
         //解密密码字符串
-        String privateKey = redisService.getCacheObject("remoteSecretKey");
-        try {
-            RsaUtil.decrypt(form.getUsername(), privateKey);
-        } catch (Exception e) {
-            return AjaxResult.error("获取token失败").put("data", null).put("code",40002);
-        }
+//        String privateKey = redisService.getCacheObject("remoteSecretKey");
+//        try {
+//            RsaUtil.decrypt(form.getUsername(), privateKey);
+//        } catch (Exception e) {
+//            return AjaxResult.error("获取token失败").put("data", null).put("code",40002);
+//        }
         SysUser user = userService.selectUserByLoginName(form.getUsername());
         String token = JwtUtils.createToken(form.getUsername(), user.getPassword());
         try {

+ 12 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java

@@ -4,6 +4,8 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.service.IWebsiteAvailabilityMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -25,6 +27,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.shiro.service.SysPasswordService;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysMenuService;
+import org.springframework.web.servlet.ModelAndView;
 
 /**
  * 首页 业务处理
@@ -181,24 +184,27 @@ public class SysIndexController extends BaseController
         mmap.put("version", RuoYiConfig.getVersion());
         return "staggeredChain";
     }
-
-    //吉林市政府网站可视化监测
+    @Autowired
+    private IWebsiteAvailabilityMonitorService websiteAvailabilityMonitorService;
+    //吉林市政府网站可用性监测
     @GetMapping("/usability")
-    public String usability(ModelMap mmap)
+    public Object usability(ModelMap mmap)
     {
+        ModelAndView modelAndView = new ModelAndView("usability.html");
+        modelAndView.addObject("dataSource",websiteAvailabilityMonitorService.selectWebsiteAvailabilityMonitorList());
         mmap.put("version", RuoYiConfig.getVersion());
-        return "usability";
+        return modelAndView;
     }
 
     //网站普查指标监测
     @GetMapping("/websiteAccess")
-    public String websiteAccess(ModelMap mmap)
+    public Object websiteAccess(ModelMap mmap)
     {
+
         mmap.put("version", RuoYiConfig.getVersion());
         return "websiteAccess";
     }
 
-    // content-main class
     public String contentMainClass(Boolean footer, Boolean tagsView)
     {
         if (!footer && !tagsView)

+ 24 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/visual/VisualController.java

@@ -233,5 +233,29 @@ public class VisualController {
         return Result.ok();
     }
 
+    /**
+     * 网站可用性实时监测
+     */
+    @GetMapping("/listWebsiteAvailabilityMonitor")
+    public List<WebsiteAvailabilityMonitor> selectWebsiteAvailabilityMonitorList() {
+        return websiteAvailabilityMonitorService.selectWebsiteAvailabilityMonitorList();
+    }
+
+    /**
+     * 本日无法访问网站列表
+     */
+    @GetMapping("/listUnableToAccessWebsiteListToday")
+    public List<UnableToAccessWebsiteListToday> selectUnableToAccessWebsiteListTodayList() {
+        return unableToAccessWebsiteListTodayService.selectUnableToAccessWebsiteListTodayList();
+    }
+
+    /**
+     * 市政府网站十日内点击量
+     */
+//    @GetMapping("/listWebSiteTenDaysHits")
+//    public List<WebSiteTenDaysHits> selectUnableToAccessWebsiteListTodayList() {
+//        return unableToAccessWebsiteListTodayService.selectUnableToAccessWebsiteListTodayList();
+//    }
+
 
 }

+ 19 - 108
ruoyi-admin/src/main/resources/templates/usability.html

@@ -1,17 +1,17 @@
-<!-- 吉林市政府网站可视化监测 -->
+<!-- 吉林市政府网站可用性实时监测 -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>吉林市政府网站可视化监测</title>
+    <title>吉林市政府网站可用性实时监测</title>
     <link rel="stylesheet" type="text/css" href="/style/html.css" />
     <link rel="stylesheet" type="text/css" href="/style/base.css" />
 </head>
 <body class="black-bg">
     <!-- 头部 Start -->
     <div class="header flex-row  flex-y-center">
-        <h1>吉林市政府网站可视化监测</h1>
+        <h1>吉林市政府网站可用性实时监测</h1>
     </div>
     <!-- 头部 End -->
     <!-- 内容 Start -->
@@ -35,7 +35,7 @@
 
        <!-- 正文 Start -->
        <div class="content">
-          <img class="x-line" src="img/bg-line.png" alt="">  
+          <img class="x-line" src="img/bg-line.png" alt="">
           <div class="content-list flex-row">
             <div class="content-list-left flex-col">
               <h4>可用性实时监测情况</h4>
@@ -46,75 +46,13 @@
                     <div class="w25"><h5>监测时间</h5></div>
                     <div class="w25"><h5>网站状态</h5></div>
                   </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>正常</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
+                  <li th:each="item : ${dataSource}">
+                      <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
+                    <div class="w25"><span class="h-span" th:text="${item.monitorTime}"></span></div>
+                      <div class="w25"><span class="h-span" th:text="${item.status}"></span></div>
+
+                      <img class="table-triangle-top" src="img/triangle.png">
+                      <img class="table-triangle-btm" src="img/triangle.png">
                   </li>
                 </ul>
               </div>
@@ -128,41 +66,14 @@
                     <div class="w25"><h5>最近一次检测时间</h5></div>
                     <div class="w25"><h5>本日无法访问次数</h5></div>
                   </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>0</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>0</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>0</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>0</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
-                  <li>
-                    <div class="w50"><span>市住建局</span></div>
-                    <div class="w25"><span>2024-1-16</span></div>
-                    <div class="w25"><span>0</span></div>
-                    <img class="table-triangle-top" src="img/triangle.png">
-                    <img class="table-triangle-btm" src="img/triangle.png">
-                  </li>
+                    <li th:each="item : ${dataSource}">
+                        <div class="w50"><span class="h-span" th:text="${item.siteName}"></span></div>
+                        <div class="w25"><span class="h-span" th:text="${item.monitorTime}"></span></div>
+                        <div class="w25"><span class="h-span" th:text="${item.status}"></span></div>
+                        <img class="table-triangle-top" src="img/triangle.png">
+                        <img class="table-triangle-btm" src="img/triangle.png">
+                    </li>
+
                 </ul>
               </div>
             </div>