接口

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

@@ -3,8 +3,12 @@ package com.ruoyi.web.controller.visual;
 
 import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
 import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.system.domain.VisitingWebsiteRanking;
 import com.ruoyi.system.domain.WebSiteTenDaysHits;
 import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
+import com.ruoyi.system.service.IUnableToAccessWebsiteListTodayService;
+import com.ruoyi.system.service.IVisitingWebsiteRankingService;
+import com.ruoyi.system.service.IWebSiteTenDaysHitsService;
 import com.ruoyi.system.service.IWebsiteAvailabilityMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,8 +21,12 @@ public class VisualController {
 
     @Autowired
     private IWebsiteAvailabilityMonitorService websiteAvailabilityMonitorService;
-
-
+    @Autowired
+    private IUnableToAccessWebsiteListTodayService unableToAccessWebsiteListTodayService;
+    @Autowired
+    private IWebSiteTenDaysHitsService webSiteTenDaysHitsService;
+    @Autowired
+    private IVisitingWebsiteRankingService visitingWebsiteRankingService;
 
 
     /**
@@ -37,7 +45,7 @@ public class VisualController {
     @PostMapping("putUnableToAccessWebsiteListToday")
     @ResponseBody
     public Result<?> insertBatchUnableToAccessWebsiteListToday(List<UnableToAccessWebsiteListToday> list) {
-        websiteAvailabilityMonitorService.insertBatchUnableToAccessWebsiteListToday(list);
+        unableToAccessWebsiteListTodayService.insertBatch(list);
         return Result.ok();
     }
 
@@ -47,8 +55,19 @@ public class VisualController {
     @PostMapping("putWebSiteTenDaysHits")
     @ResponseBody
     public Result<?> insertBatchWebSiteTenDaysHits(List<WebSiteTenDaysHits> list) {
-        websiteAvailabilityMonitorService.insertBatchWebSiteTenDaysHits(list);
+        webSiteTenDaysHitsService.insertBatch(list);
+        return Result.ok();
+    }
+
+    /**
+     * 市政府门户网站访问情况监测-全国各省访问吉林市政府网站排名-数据推送接口
+     */
+    @PostMapping("putVisitingWebsiteRanking")
+    @ResponseBody
+    public Result<?> putVisitingWebsiteRanking(List<VisitingWebsiteRanking> list) {
+        visitingWebsiteRankingService.insertBatch(list);
         return Result.ok();
     }
 
+
 }

ruoyi-common/pom.xml

@@ -107,11 +107,19 @@
             <artifactId>commons-pool2</artifactId>
         </dependency>
 
-        <!-- SpringBoot Websocket -->
+        <!-- jwt jar-->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.4.0</version>
         </dependency>
+
+        <!-- lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-framework/pom.xml

@@ -77,6 +77,11 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
+        <!-- SpringBoot Websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-system/src/main/java/com/ruoyi/system/domain/UnableToAccessWebsiteListToday.java

@@ -1,8 +1,10 @@
 package com.ruoyi.system.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+@Data
 public class UnableToAccessWebsiteListToday {
 
     private Long id;
@@ -12,7 +14,6 @@ public class UnableToAccessWebsiteListToday {
      */
     private String siteName;
 
-
     /**
      * 最近一次监测时间
      */
@@ -23,45 +24,5 @@ public class UnableToAccessWebsiteListToday {
      */
     private String accessCountFail;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getSiteName() {
-        return siteName;
-    }
-
-    public void setSiteName(String siteName) {
-        this.siteName = siteName;
-    }
-
-    public String getLastMonitorTime() {
-        return lastMonitorTime;
-    }
-
-    public void setLastMonitorTime(String lastMonitorTime) {
-        this.lastMonitorTime = lastMonitorTime;
-    }
-
-    public String getAccessCountFail() {
-        return accessCountFail;
-    }
-
-    public void setAccessCountFail(String accessCountFail) {
-        this.accessCountFail = accessCountFail;
-    }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("siteName", getSiteName())
-                .append("lastMonitorTime", getLastMonitorTime())
-                .append("accessCountFail", getAccessCountFail())
-                .toString();
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/VisitingWebsiteRanking.java

@@ -0,0 +1,15 @@
+package com.ruoyi.system.domain;
+
+
+import lombok.Data;
+
+@Data
+public class VisitingWebsiteRanking {
+
+    private Long id;
+
+    private String deptNames;
+
+    private String deptDatas;
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/WebSiteTenDaysHits.java

@@ -1,52 +1,21 @@
 package com.ruoyi.system.domain;
 
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.List;
 
+
+
+@Data
 public class WebSiteTenDaysHits {
 
     private Long id;
-    /**
-     * 日期(月日)
-     */
-    private List<String> timeNames;
-    /**
-     * 点击量
-     */
-    private List<String> timeDatas;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public List<String> getTimeNames() {
-        return timeNames;
-    }
-
-    public void setTimeNames(List<String> timeNames) {
-        this.timeNames = timeNames;
-    }
-
-    public List<String> getTimeDatas() {
-        return timeDatas;
-    }
-
-    public void setTimeDatas(List<String> timeDatas) {
-        this.timeDatas = timeDatas;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("timeNames", getTimeNames())
-                .append("timeDatas", getTimeDatas())
-                .toString();
-    }
+
+    private String timeNames;
+
+    private String timeDatas;
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/WebsiteAvailabilityMonitor.java

@@ -1,56 +1,17 @@
 package com.ruoyi.system.domain;
 
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
 
+@Data
 public class WebsiteAvailabilityMonitor {
 
     private Long id;
-    private String siteName;
-    private Integer status;
-    private String monitorTime;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
 
-    public String getSiteName() {
-        return siteName;
-    }
-
-    public void setSiteName(String siteName) {
-        this.siteName = siteName;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
+    private String siteName;
 
-    public String getMonitorTime() {
-        return monitorTime;
-    }
+    private Integer status;
 
-    public void setMonitorTime(String monitorTime) {
-        this.monitorTime = monitorTime;
-    }
+    private String monitorTime;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("siteName", getSiteName())
-                .append("status", getStatus())
-                .append("monitorTime", getMonitorTime())
-                .toString();
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/UnableToAccessWebsiteListTodayMapper.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface UnableToAccessWebsiteListTodayMapper {
+
+    List<UnableToAccessWebsiteListToday> selectUnableToAccessWebsiteListTodayList();
+
+    void deleteUnableToAccessWebsiteListTodayAll();
+    /**
+     * 网站可用性实时监测-数据推送接口
+     */
+    void insertBatch(@Param("list") List<UnableToAccessWebsiteListToday> list);
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/VisitingWebsiteRankingMapper.java

@@ -0,0 +1,24 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
+import com.ruoyi.system.domain.VisitingWebsiteRanking;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface VisitingWebsiteRankingMapper {
+
+    List<VisitingWebsiteRanking> selectVisitingWebsiteRankingList();
+
+    void deleteVisitingWebsiteRankingAll();
+    /**
+     * 网站可用性实时监测-数据推送接口
+     */
+    void insertBatch(@Param("list") List<VisitingWebsiteRanking> list);
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/WebSiteTenDaysHitsMapper.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.VisitingWebsiteRanking;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface WebSiteTenDaysHitsMapper {
+
+    List<WebSiteTenDaysHits> selectWebSiteTenDaysHitsList();
+
+    void deleteWebSiteTenDaysHitsAll();
+    /**
+     * 网站可用性实时监测-数据推送接口
+     */
+    void insertBatch(@Param("list") List<WebSiteTenDaysHits> list);
+
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/WebsiteAvailabilityMonitorMapper.java

@@ -13,37 +13,16 @@ public interface WebsiteAvailabilityMonitorMapper {
 
     List<WebsiteAvailabilityMonitor> selectWebsiteAvailabilityMonitorList();
 
-    List<UnableToAccessWebsiteListToday> selectUnableToAccessWebsiteListTodayList();
-
-    List<WebSiteTenDaysHits> selectWebSiteTenDaysHitsList();
     /**
      * 网站可用性实时监测-数据推送接口
      */
     void deleteWebsiteAvailabilityMonitorAll();
-    /**
-     * 网站可用性实时监测-数据推送接口
-     */
-    void insertBatch(@Param("item")List<WebsiteAvailabilityMonitor> list);
-
-    /**
-     * 本日无法访问网站列表-数据推送接口
-     */
-    void deleteUnableToAccessWebsiteListTodayAll();
 
     /**
-     * 本日无法访问网站列表-数据推送接口
-     */
-    void insertBatchUnableToAccessWebsiteListToday(@Param("item")List<UnableToAccessWebsiteListToday> list);
-
-    /**
-     * 本日无法访问网站列表-数据推送接口
+     * 网站可用性实时监测-数据推送接口
      */
-    void deleteWebSiteTenDaysHitsAll();
+    void insertBatch(@Param("list") List<WebsiteAvailabilityMonitor> list);
 
-    /**
-     * 本日无法访问网站列表-数据推送接口
-     */
-    void insertBatchWebSiteTenDaysHits(@Param("item")List<WebSiteTenDaysHits> list);
 
 
 

ruoyi-system/src/main/java/com/ruoyi/system/service/IUnableToAccessWebsiteListTodayService.java

@@ -0,0 +1,17 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface IUnableToAccessWebsiteListTodayService {
+
+    List<UnableToAccessWebsiteListToday> selectUnableToAccessWebsiteListTodayList();
+
+    /**
+     * 网站可用性实时监测-数据推送接口
+     */
+    void insertBatch(List<UnableToAccessWebsiteListToday> list);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IVisitingWebsiteRankingService.java

@@ -0,0 +1,14 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.VisitingWebsiteRanking;
+
+import java.util.List;
+
+public interface IVisitingWebsiteRankingService {
+
+    List<VisitingWebsiteRanking> selectVisitingWebsiteRankingList();
+
+
+    void insertBatch(List<VisitingWebsiteRanking> list);
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IWebSiteTenDaysHitsService.java

@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.VisitingWebsiteRanking;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface IWebSiteTenDaysHitsService {
+
+    List<WebSiteTenDaysHits> selectWebSiteTenDaysHitsList();
+
+    void insertBatch(List<WebSiteTenDaysHits> list);
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IWebsiteAvailabilityMonitorService.java

@@ -17,23 +17,5 @@ public interface IWebsiteAvailabilityMonitorService {
      */
     void insertBatch(List<WebsiteAvailabilityMonitor> list);
 
-    /**
-     * 本日无法访问网站列表-数据推送接口
-     */
-    List<UnableToAccessWebsiteListToday> selectUnableToAccessWebsiteListTodayList();
-
-    /**
-     * 本日无法访问网站列表-数据推送接口
-     */
-    void insertBatchUnableToAccessWebsiteListToday(List<UnableToAccessWebsiteListToday> list);
 
-    /**
-     * 市政府网站十日内点击量-数据推送接口
-     */
-    List<WebSiteTenDaysHits> selectWebSiteTenDaysHitsList();
-
-    /**
-     * 市政府网站十日内点击量-数据推送接口
-     */
-    void insertBatchWebSiteTenDaysHits(List<WebSiteTenDaysHits> list);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnableToAccessWebsiteListTodayImpl.java

@@ -0,0 +1,33 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import com.ruoyi.system.mapper.UnableToAccessWebsiteListTodayMapper;
+import com.ruoyi.system.mapper.WebSiteTenDaysHitsMapper;
+import com.ruoyi.system.service.IUnableToAccessWebsiteListTodayService;
+import com.ruoyi.system.service.IWebSiteTenDaysHitsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class UnableToAccessWebsiteListTodayImpl implements IUnableToAccessWebsiteListTodayService {
+
+
+    @Autowired
+    private UnableToAccessWebsiteListTodayMapper unableToAccessWebsiteListTodayMapper;
+
+
+    @Override
+    public List<UnableToAccessWebsiteListToday> selectUnableToAccessWebsiteListTodayList() {
+        return unableToAccessWebsiteListTodayMapper.selectUnableToAccessWebsiteListTodayList();
+    }
+
+    @Override
+    public void insertBatch(List<UnableToAccessWebsiteListToday> list) {
+        unableToAccessWebsiteListTodayMapper.deleteUnableToAccessWebsiteListTodayAll();
+        unableToAccessWebsiteListTodayMapper.insertBatch(list);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VisitingWebsiteRankingServiceImpl.java

@@ -0,0 +1,35 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
+import com.ruoyi.system.domain.VisitingWebsiteRanking;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
+import com.ruoyi.system.mapper.VisitingWebsiteRankingMapper;
+import com.ruoyi.system.mapper.WebsiteAvailabilityMonitorMapper;
+import com.ruoyi.system.service.IVisitingWebsiteRankingService;
+import com.ruoyi.system.service.IWebsiteAvailabilityMonitorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class VisitingWebsiteRankingServiceImpl implements IVisitingWebsiteRankingService {
+
+
+    @Autowired
+    private VisitingWebsiteRankingMapper visitingWebsiteRankingMapper;
+
+
+    @Override
+    public List<VisitingWebsiteRanking> selectVisitingWebsiteRankingList() {
+        return visitingWebsiteRankingMapper.selectVisitingWebsiteRankingList();
+    }
+
+    @Override
+    public void insertBatch(List<VisitingWebsiteRanking> list) {
+        visitingWebsiteRankingMapper.deleteVisitingWebsiteRankingAll();
+        visitingWebsiteRankingMapper.insertBatch(list);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WebSiteTenDaysHitsServiceImpl.java

@@ -0,0 +1,34 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.VisitingWebsiteRanking;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import com.ruoyi.system.domain.WebsiteAvailabilityMonitor;
+import com.ruoyi.system.mapper.VisitingWebsiteRankingMapper;
+import com.ruoyi.system.mapper.WebSiteTenDaysHitsMapper;
+import com.ruoyi.system.service.IVisitingWebsiteRankingService;
+import com.ruoyi.system.service.IWebSiteTenDaysHitsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class WebSiteTenDaysHitsServiceImpl implements IWebSiteTenDaysHitsService {
+
+
+    @Autowired
+    private WebSiteTenDaysHitsMapper webSiteTenDaysHitsMapper;
+
+
+    @Override
+    public List<WebSiteTenDaysHits> selectWebSiteTenDaysHitsList() {
+        return webSiteTenDaysHitsMapper.selectWebSiteTenDaysHitsList();
+    }
+
+    @Override
+    public void insertBatch(List<WebSiteTenDaysHits> list) {
+        webSiteTenDaysHitsMapper.deleteWebSiteTenDaysHitsAll();
+        webSiteTenDaysHitsMapper.insertBatch(list);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/WebsiteAvailabilityMonitorServiceImpl.java

@@ -23,16 +23,6 @@ public class WebsiteAvailabilityMonitorServiceImpl implements IWebsiteAvailabili
         return websiteAvailabilityMonitorMapper.selectWebsiteAvailabilityMonitorList();
     }
 
-    @Override
-    public List<UnableToAccessWebsiteListToday> selectUnableToAccessWebsiteListTodayList() {
-        return websiteAvailabilityMonitorMapper.selectUnableToAccessWebsiteListTodayList();
-    }
-
-    @Override
-    public List<WebSiteTenDaysHits> selectWebSiteTenDaysHitsList() {
-        return websiteAvailabilityMonitorMapper.selectWebSiteTenDaysHitsList();
-    }
-
     /**
      * 网站可用性实时监测-数据推送接口
      */
@@ -42,21 +32,4 @@ public class WebsiteAvailabilityMonitorServiceImpl implements IWebsiteAvailabili
         websiteAvailabilityMonitorMapper.insertBatch(list);
     }
 
-    /**
-     * 本日无法访问网站列表-数据推送接口
-     */
-    @Override
-    public void insertBatchUnableToAccessWebsiteListToday(List<UnableToAccessWebsiteListToday> list) {
-        websiteAvailabilityMonitorMapper.deleteUnableToAccessWebsiteListTodayAll();
-        websiteAvailabilityMonitorMapper.insertBatchUnableToAccessWebsiteListToday(list);
-    }
-
-    /**
-     * 本日无法访问网站列表-数据推送接口
-     */
-    @Override
-    public void insertBatchWebSiteTenDaysHits(List<WebSiteTenDaysHits> list) {
-        websiteAvailabilityMonitorMapper.deleteWebSiteTenDaysHitsAll();
-        websiteAvailabilityMonitorMapper.insertBatchWebSiteTenDaysHits(list);
-    }
 }

ruoyi-system/src/main/resources/mapper/system/UnableToAccessWebsiteListTodayMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.UnableToAccessWebsiteListTodayMapper">
+    
+    <resultMap type="UnableToAccessWebsiteListToday" id="UnableToAccessWebsiteListTodayResult">
+    	<id     property="id"      column="id"      />
+        <result property="siteName"    column="site_name"    />
+        <result property="accessCountFail"     column="access_count_fail"     />
+        <result property="lastMonitorTime"     column="last_monitor_time"     />
+    </resultMap>
+    
+    <sql id="selectUnableToAccessWebsiteListTodayVo">
+        select id, site_name, access_count_fail, last_monitor_time from put_unable_to_access_website_list_today
+    </sql>
+
+    <select id="selectUnableToAccessWebsiteListTodayList" parameterType="UnableToAccessWebsiteListToday" resultMap="UnableToAccessWebsiteListTodayResult">
+        <include refid="selectUnableToAccessWebsiteListTodayVo"/>
+    </select>
+
+	<delete id="deleteUnableToAccessWebsiteListTodayAll" parameterType="Long">
+		delete from put_unable_to_access_website_list_today
+	</delete>
+
+	<insert id="insertBatch">
+		insert into put_unable_to_access_website_list_today (site_name, access_count_fail,last_monitor_time) values
+		<foreach item="item" collection="list" separator=",">
+			(#{item.siteName},#{item.accessCountFail},#{item.lastMonitorTime})
+		</foreach>
+	</insert>
+
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/VisitingWebsiteRankingMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.VisitingWebsiteRankingMapper">
+    
+    <resultMap type="VisitingWebsiteRanking" id="VisitingWebsiteRankingResult">
+    	<id     property="id"      column="id"      />
+        <result property="deptNames"    column="dept_names"    />
+        <result property="deptDatas"     column="dept_datas"     />
+    </resultMap>
+    
+    <sql id="selectVisitingWebsiteRankingVo">
+        select id, dept_names, dept_datas from put_visiting_website_ranking
+    </sql>
+
+    <select id="selectVisitingWebsiteRankingList" parameterType="VisitingWebsiteRanking" resultMap="VisitingWebsiteRankingResult">
+        <include refid="selectVisitingWebsiteRankingVo"/>
+    </select>
+
+	<delete id="deleteVisitingWebsiteRankingAll" parameterType="Long">
+		delete from put_visiting_website_ranking
+	</delete>
+
+	<insert id="insertBatch">
+		insert into put_visiting_website_ranking (dept_names, dept_datas) values
+		<foreach item="item" collection="list" separator=",">
+			(#{item.deptNames},#{item.deptDatas})
+		</foreach>
+	</insert>
+
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/WebSiteTenDaysHitsMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.WebSiteTenDaysHitsMapper">
+    
+    <resultMap type="WebSiteTenDaysHits" id="WebSiteTenDaysHitsResult">
+    	<id     property="id"      column="id"      />
+        <result property="timeNames"    column="time_names"    />
+        <result property="timeDatas"     column="time_datas"     />
+    </resultMap>
+    
+    <sql id="selectWebSiteTenDaysHitsVo">
+        select id, time_names, time_datas from put_visiting_website_ranking
+    </sql>
+
+    <select id="selectWebSiteTenDaysHitsList" parameterType="WebSiteTenDaysHits" resultMap="WebSiteTenDaysHitsResult">
+        <include refid="selectWebSiteTenDaysHitsVo"/>
+    </select>
+
+	<delete id="deleteWebSiteTenDaysHitsAll" parameterType="Long">
+		delete from put_visiting_website_ranking
+	</delete>
+
+	<insert id="insertBatch">
+		insert into put_web_site_ten_days_hits (time_names, time_datas) values
+		<foreach item="item" collection="list" separator=",">
+			(#{item.timeNames},#{item.timeDatas})
+		</foreach>
+	</insert>
+
+
+</mapper>

ruoyi-system/src/main/resources/mapper/system/WebsiteAvailabilityMonitorMapper.xml

@@ -10,44 +10,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"     column="status"     />
         <result property="monitorTime"   column="monitor_time"   />
     </resultMap>
-
-    <resultMap type="UnableToAccessWebsiteListToday" id="UnableToAccessWebsiteListTodayResult">
-        <id     property="id"      column="id"      />
-        <result property="siteName"    column="site_name"    />
-        <result property="lastMonitorTime"     column="last_monitor_time"     />
-        <result property="accessCountFail"   column="access_count_fail"   />
-    </resultMap>
-
-    <resultMap type="WebSiteTenDaysHits" id="WebSiteTenDaysHitsResult">
-        <id     property="id"      column="id"      />
-        <result property="timeNames"    column="time_names"    />
-        <result property="timeDatas"     column="time_datas"     />
-    </resultMap>
     
     <sql id="selectWebsiteAvailabilityMonitorVo">
         select id, site_name, status, monitor_time from put_website_availability_monitor
     </sql>
 
-    <sql id="selectUnableToAccessWebsiteListTodayVo">
-        select id, site_name, last_monitor_time, access_count_fail from put_unable_to_access_website_list_today
-    </sql>
-
-    <sql id="selectWebSiteTenDaysHitsVo">
-        select id, time_names, time_datas from put_web_site_ten_days_hits
-    </sql>
-
     <select id="selectWebsiteAvailabilityMonitorList" parameterType="WebsiteAvailabilityMonitor" resultMap="WebsiteAvailabilityMonitorResult">
         <include refid="selectWebsiteAvailabilityMonitorVo"/>
     </select>
 
-    <select id="selectUnableToAccessWebsiteListTodayList" parameterType="UnableToAccessWebsiteListToday" resultMap="UnableToAccessWebsiteListTodayResult">
-        <include refid="selectUnableToAccessWebsiteListTodayVo"/>
-    </select>
-
-    <select id="selectWebSiteTenDaysHitsList" parameterType="WebSiteTenDaysHits" resultMap="WebSiteTenDaysHitsResult">
-        <include refid="selectWebSiteTenDaysHitsVo"/>
-    </select>
-
     <!--网站可用性实时监测-数据推送接口-->
 	<delete id="deleteWebsiteAvailabilityMonitorAll" parameterType="Long">
 		delete from put_website_availability_monitor
@@ -55,36 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--网站可用性实时监测-数据推送接口-->
 	<insert id="insertBatch">
 		insert into put_website_availability_monitor (site_name,status,monitor_time) values
-		<foreach item="item" collection="array" separator=",">
+		<foreach item="item" collection="list" separator=",">
 			(#{item.siteName},#{item.status},#{item.monitorTime})
 		</foreach>
 	</insert>
 
-    <!--本日无法访问网站列表-数据推送接口-->
-    <delete id="deleteUnableToAccessWebsiteListTodayAll" parameterType="Long">
-        delete from put_unable_to_access_website_list_today
-    </delete>
-
-    <!--本日无法访问网站列表-数据推送接口-->
-    <insert id="insertBatchUnableToAccessWebsiteListToday">
-        insert into put_unable_to_access_website_list_today (site_name,last_monitor_time,access_count_fail) values
-        <foreach item="item" collection="array" separator=",">
-            (#{item.siteName},#{item.lastMonitorTime},#{item.accessCountFail})
-        </foreach>
-    </insert>
-
-    <!--市政府网站十日内点击量-数据推送接口-->
-    <delete id="deleteWebSiteTenDaysHitsAll" parameterType="Long">
-        delete from put_web_site_ten_days_hits
-    </delete>
-
-    <!--市政府网站十日内点击量-数据推送接口-->
-    <insert id="insertBatchWebSiteTenDaysHits">
-        insert into put_web_site_ten_days_hits (time_names,time_datas) values
-        <foreach item="item" collection="array" separator=",">
-            (#{item.timeNames},#{item.timeDatas})
-        </foreach>
-    </insert>
-
-
 </mapper>