bihuisong 1 year ago
parent
commit
4bbf8c9379

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

@@ -1,15 +1,10 @@
 package com.ruoyi.web.controller.visual;
 
 
-import com.ruoyi.system.domain.UnableToAccessWebsiteListToday;
+import com.ruoyi.system.domain.*;
 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 com.ruoyi.system.dto.VisitingWebsiteRankingDTO;
+import com.ruoyi.system.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +22,8 @@ public class VisualController {
     private IWebSiteTenDaysHitsService webSiteTenDaysHitsService;
     @Autowired
     private IVisitingWebsiteRankingService visitingWebsiteRankingService;
+    @Autowired
+    private IColumnPageViewService columnPageViewService;
 
 
     /**
@@ -64,8 +61,18 @@ public class VisualController {
      */
     @PostMapping("putVisitingWebsiteRanking")
     @ResponseBody
-    public Result<?> insertBatchVisitingWebsiteRanking(List<VisitingWebsiteRanking> list) {
-        visitingWebsiteRankingService.insertBatch(list);
+    public Result<?> insertBatchVisitingWebsiteRanking(VisitingWebsiteRankingDTO dto) {
+        visitingWebsiteRankingService.insertBatch(dto);
+        return Result.ok();
+    }
+
+    /**
+     * 市政府门户网站访问情况监测-门户网站栏目浏览量-数据推送接口
+     */
+    @PostMapping("putColumnPageViewg")
+    @ResponseBody
+    public Result<?> insertColumnPageView(List<ColumnPageView> list) {
+        columnPageViewService.insertBatch(list);
         return Result.ok();
     }
 

+ 18 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/ColumnPageView.java

@@ -0,0 +1,18 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+
+@Data
+public class ColumnPageView {
+
+    private Long id;
+
+    private String columnRanking;
+
+    private String ranking;
+
+    private String browse;
+
+
+}

+ 14 - 0
ruoyi-system/src/main/java/com/ruoyi/system/dto/VisitingWebsiteRankingDTO.java

@@ -0,0 +1,14 @@
+package com.ruoyi.system.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class VisitingWebsiteRankingDTO {
+
+    private List<String> deptNames;
+
+    private List<String> deptDatas;
+}

+ 20 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ColumnPageViewMapper.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.ColumnPageView;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface ColumnPageViewMapper {
+
+    List<ColumnPageView> selectColumnPageViewList();
+
+    void deleteColumnPageViewAll();
+
+    void insertBatch(@Param("list") List<ColumnPageView> list);
+
+
+
+}

+ 14 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IColumnPageViewService.java

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

+ 4 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/IVisitingWebsiteRankingService.java

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

+ 33 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ColumnPageViewServiceImpl.java

@@ -0,0 +1,33 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.ColumnPageView;
+import com.ruoyi.system.domain.WebSiteTenDaysHits;
+import com.ruoyi.system.mapper.ColumnPageViewMapper;
+import com.ruoyi.system.mapper.WebSiteTenDaysHitsMapper;
+import com.ruoyi.system.service.IColumnPageViewService;
+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 ColumnPageViewServiceImpl implements IColumnPageViewService {
+
+
+    @Autowired
+    private ColumnPageViewMapper columnPageViewMapper;
+
+
+    @Override
+    public List<ColumnPageView> selectColumnPageViewList() {
+        return columnPageViewMapper.selectColumnPageViewList();
+    }
+
+    @Override
+    public void insertBatch(List<ColumnPageView> list) {
+        columnPageViewMapper.deleteColumnPageViewAll();
+        columnPageViewMapper.insertBatch(list);
+    }
+}

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

@@ -4,6 +4,7 @@ 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.dto.VisitingWebsiteRankingDTO;
 import com.ruoyi.system.mapper.VisitingWebsiteRankingMapper;
 import com.ruoyi.system.mapper.WebsiteAvailabilityMonitorMapper;
 import com.ruoyi.system.service.IVisitingWebsiteRankingService;
@@ -11,7 +12,10 @@ import com.ruoyi.system.service.IWebsiteAvailabilityMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -23,13 +27,30 @@ public class VisitingWebsiteRankingServiceImpl implements IVisitingWebsiteRankin
 
 
     @Override
-    public List<VisitingWebsiteRanking> selectVisitingWebsiteRankingList() {
-        return visitingWebsiteRankingMapper.selectVisitingWebsiteRankingList();
+    public Map<String, List<String>> selectVisitingWebsiteRankingList() {
+        List<String> deptNamesList = new ArrayList<>();
+        List<String> deptDatasList = new ArrayList<>();
+        List<VisitingWebsiteRanking> list = visitingWebsiteRankingMapper.selectVisitingWebsiteRankingList();
+        for (VisitingWebsiteRanking var : list) {
+            deptNamesList.add(var.getDeptNames());
+            deptDatasList.add(var.getDeptDatas());
+        }
+        Map<String, List<String>> returnMap = new HashMap<>();
+        returnMap.put("deptNames",deptNamesList);
+        returnMap.put("deptDatas",deptDatasList);
+        return returnMap;
     }
 
     @Override
-    public void insertBatch(List<VisitingWebsiteRanking> list) {
+    public void insertBatch(VisitingWebsiteRankingDTO dto) {
         visitingWebsiteRankingMapper.deleteVisitingWebsiteRankingAll();
-        visitingWebsiteRankingMapper.insertBatch(list);
+        List<VisitingWebsiteRanking> saveList = new ArrayList<>();
+        for (int i = 0; i < dto.getDeptNames().size(); i++) {
+            VisitingWebsiteRanking visitingWebsiteRanking = new VisitingWebsiteRanking();
+            visitingWebsiteRanking.setDeptNames(dto.getDeptNames().get(i));
+            visitingWebsiteRanking.setDeptDatas(dto.getDeptDatas().get(i));
+            saveList.add(visitingWebsiteRanking);
+        }
+        visitingWebsiteRankingMapper.insertBatch(saveList);
     }
 }

+ 34 - 0
ruoyi-system/src/main/resources/mapper/system/ColumnPageViewMapper.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.ColumnPageViewMapper">
+    
+    <resultMap type="ColumnPageView" id="ColumnPageViewResult">
+    	<id     property="id"      column="id"      />
+        <result property="columnRanking"    column="column_ranking"    />
+        <result property="ranking"     column="ranking"     />
+        <result property="browse"     column="browse"     />
+    </resultMap>
+    
+    <sql id="selectColumnPageViewVo">
+        select id, time_names, time_datas from sooka_column_pageview
+    </sql>
+
+    <select id="selectColumnPageViewList" parameterType="ColumnPageView" resultMap="ColumnPageViewResult">
+        <include refid="selectColumnPageViewVo"/>
+    </select>
+
+	<delete id="deleteColumnPageViewAll" parameterType="Long">
+		delete from sooka_column_pageview
+	</delete>
+
+	<insert id="insertBatch">
+		insert into sooka_column_pageview (column_ranking, ranking, browse) values
+		<foreach item="item" collection="list" separator=",">
+			(#{item.columnRanking},#{item.ranking},#{item.browse})
+		</foreach>
+	</insert>
+
+
+</mapper>

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

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectUnableToAccessWebsiteListTodayVo">
-        select id, site_name, access_count_fail, last_monitor_time from put_unable_to_access_website_list_today
+        select id, site_name, access_count_fail, last_monitor_time from sooka_unable_to_access_website_list_today
     </sql>
 
     <select id="selectUnableToAccessWebsiteListTodayList" parameterType="UnableToAccessWebsiteListToday" resultMap="UnableToAccessWebsiteListTodayResult">
@@ -20,11 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 	<delete id="deleteUnableToAccessWebsiteListTodayAll" parameterType="Long">
-		delete from put_unable_to_access_website_list_today
+		delete from sooka_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
+		insert into sooka_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>

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

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectVisitingWebsiteRankingVo">
-        select id, dept_names, dept_datas from put_visiting_website_ranking
+        select id, dept_names, dept_datas from sooka_visiting_website_ranking
     </sql>
 
     <select id="selectVisitingWebsiteRankingList" parameterType="VisitingWebsiteRanking" resultMap="VisitingWebsiteRankingResult">
@@ -19,11 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 	<delete id="deleteVisitingWebsiteRankingAll" parameterType="Long">
-		delete from put_visiting_website_ranking
+		delete from sooka_visiting_website_ranking
 	</delete>
 
 	<insert id="insertBatch">
-		insert into put_visiting_website_ranking (dept_names, dept_datas) values
+		insert into sooka_visiting_website_ranking (dept_names, dept_datas) values
 		<foreach item="item" collection="list" separator=",">
 			(#{item.deptNames},#{item.deptDatas})
 		</foreach>

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

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectWebSiteTenDaysHitsVo">
-        select id, time_names, time_datas from put_visiting_website_ranking
+        select id, time_names, time_datas from sooka_visiting_website_ranking
     </sql>
 
     <select id="selectWebSiteTenDaysHitsList" parameterType="WebSiteTenDaysHits" resultMap="WebSiteTenDaysHitsResult">
@@ -19,11 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 	<delete id="deleteWebSiteTenDaysHitsAll" parameterType="Long">
-		delete from put_visiting_website_ranking
+		delete from sooka_visiting_website_ranking
 	</delete>
 
 	<insert id="insertBatch">
-		insert into put_web_site_ten_days_hits (time_names, time_datas) values
+		insert into sooka_web_site_ten_days_hits (time_names, time_datas) values
 		<foreach item="item" collection="list" separator=",">
 			(#{item.timeNames},#{item.timeDatas})
 		</foreach>

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

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectWebsiteAvailabilityMonitorVo">
-        select id, site_name, status, monitor_time from put_website_availability_monitor
+        select id, site_name, status, monitor_time from sooka_website_availability_monitor
     </sql>
 
     <select id="selectWebsiteAvailabilityMonitorList" parameterType="WebsiteAvailabilityMonitor" resultMap="WebsiteAvailabilityMonitorResult">
@@ -21,11 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!--网站可用性实时监测-数据推送接口-->
 	<delete id="deleteWebsiteAvailabilityMonitorAll" parameterType="Long">
-		delete from put_website_availability_monitor
+		delete from sooka_website_availability_monitor
 	</delete>
     <!--网站可用性实时监测-数据推送接口-->
 	<insert id="insertBatch">
-		insert into put_website_availability_monitor (site_name,status,monitor_time) values
+		insert into sooka_website_availability_monitor (site_name,status,monitor_time) values
 		<foreach item="item" collection="list" separator=",">
 			(#{item.siteName},#{item.status},#{item.monitorTime})
 		</foreach>