完善地域字典表

9 files changed, 104 insertions, 161 deletions

diff --git a/src/main/java/com/nis/galaxy/config/MyLoad.java b/src/main/java/com/nis/galaxy/config/MyLoad.java
index 141fa68..d1267b8 100644
--- a/src/main/java/com/nis/galaxy/config/MyLoad.java
+++ b/src/main/java/com/nis/galaxy/config/MyLoad.java
@@ -1,6 +1,8 @@
 package com.nis.galaxy.config;
 
 import com.nis.galaxy.domain.dict.*;
+import com.nis.galaxy.util.ConfigUtil;
+import com.nis.galaxy.util.DateUtils;
 import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.service.DictService;
 import org.slf4j.Logger;
@@ -47,21 +49,14 @@ public class MyLoad {
      */
     public Map<String, UiTagDictInfo> listUiTagDicInfo = new ConcurrentHashMap<>();
     /**
-     * 地域表
-     */
-//    public Map<String, UiAreaDictInfo> listUiAreaDicInfo = new ConcurrentHashMap<>();
-    /**
      * 运营商表
      */
-    public Map<String, UiCarrierDictInfo> listUiCarrierDictInfo = new ConcurrentHashMap<>();
+    public Map<String, UiCarrierDictInfo> listUiCarrierDictInfo = new HashMap<>();
 
     public Map<String, UiCarrierDictInfo> getListUiCarrierDictInfo() {
         return listUiCarrierDictInfo;
     }
 
-//    public Map<String, UiAreaDictInfo> getListUiAreaDicInfo() {
-//        return listUiAreaDicInfo;
-//    }
 
     public Map<String, UiTagDictInfo> getListUiTagDicInfo() {
         return listUiTagDicInfo;
@@ -75,20 +70,6 @@ public class MyLoad {
         return listNtcService;
     }
 
-//    @Scheduled(cron = "${dict.scheduled.cron.plan}")
-//    public void runMyLoadArea() {
-//        logger.info("执行初始化字典表：地域表\t运营商表\t业务表\t协议表");
-//        List<UiAreaDictInfo> uiAreaDictInfo = new ArrayList<>();
-//        try {
-//            uiAreaDictInfo = dictService.getUiAreaDictInfo();
-//        } catch (Exception e) {
-//            logger.error("地域表预加载出现异常", e);
-//        }
-//        for (UiAreaDictInfo areaDictInfo : uiAreaDictInfo) {
-//            listUiAreaDicInfo.put(areaDictInfo.getAreaId(), areaDictInfo);
-//        }
-//        logger.info("地域表的预加载结果\t" + listUiAreaDicInfo);
-//    }
 
     @Scheduled(cron = "${dict.service.cron.plan}")
     public void MyLoadService() {
@@ -112,36 +93,6 @@ public class MyLoad {
         }
     }
 
-    @Scheduled(cron = "${dict.entrance.cron.plan}")
-    public void MyLoadEntrance() {
-        List<UiCarrierDictInfo> uiCarrierDictInfo = new ArrayList<>();
-        Map<String, UiCarrierDictInfo> mapUiCarrierDictInfo = new HashMap<>();
-        try {
-            uiCarrierDictInfo = dictService.getUiCarrierDictInfo();
-        } catch (Exception e) {
-            logger.error("局点表加载出现异常", e);
-        }
-        if (!ListUtils.isEmptyList(uiCarrierDictInfo)) {
-            for (UiCarrierDictInfo carrierDictInfo : uiCarrierDictInfo) {
-                mapUiCarrierDictInfo.put(carrierDictInfo.getCarrierId(), carrierDictInfo);
-            }
-        }
-        if (dictMomentSwitch) {
-            mapUiCarrierDictInfo.put("0", new UiCarrierDictInfo("0", "Астана"));
-            mapUiCarrierDictInfo.put("1", new UiCarrierDictInfo("1", "Астана"));
-            mapUiCarrierDictInfo.put("2", new UiCarrierDictInfo("2", "Алматы"));
-            mapUiCarrierDictInfo.put("3", new UiCarrierDictInfo("3", "Астана"));
-        }
-        if (mapUiCarrierDictInfo != null && mapUiCarrierDictInfo.size() > 0) {
-            listUiCarrierDictInfo = mapUiCarrierDictInfo;
-        }
-        if (listNtcService != null) {
-            logger.info("局点加载个数为\t" + listUiCarrierDictInfo.size());
-        } else {
-            logger.info("listUiCarrierDictInfo为null");
-        }
-    }
-
     @Scheduled(cron = "${dict.protocol.cron.plan}")
     public void MyLoadProtocol() {
         List<ProtocolDict> protocolDict = new ArrayList<>();
@@ -191,8 +142,17 @@ public class MyLoad {
         if (a++ > 1) {
             return;
         }
+        if (ConfigUtil.languageChose == 3) {
+            listUiCarrierDictInfo.put("1", new UiCarrierDictInfo("1", "Астана"));
+            listUiCarrierDictInfo.put("2", new UiCarrierDictInfo("1", "Алматы"));
+        } else if (ConfigUtil.languageChose == 2) {
+            listUiCarrierDictInfo.put("1", new UiCarrierDictInfo("1", "Astana"));
+            listUiCarrierDictInfo.put("2", new UiCarrierDictInfo("2", "Almaty"));
+        } else {
+            listUiCarrierDictInfo.put("1", new UiCarrierDictInfo("1", "阿斯塔纳市"));
+            listUiCarrierDictInfo.put("2", new UiCarrierDictInfo("2", "阿拉木图市"));
+        }
         MyLoadService();
-        MyLoadEntrance();
         MyLoadProtocol();
         MyLoadTag();
     }
diff --git a/src/main/java/com/nis/galaxy/domain/NmsServerBean.java b/src/main/java/com/nis/galaxy/domain/NmsServerBean.java
index 5e9dc3a..a481fa4 100644
--- a/src/main/java/com/nis/galaxy/domain/NmsServerBean.java
+++ b/src/main/java/com/nis/galaxy/domain/NmsServerBean.java
@@ -27,15 +27,11 @@ public class NmsServerBean {
     private long abnormal;
     private List<AbnormalBean> abnormalmachines;
 
-    public void setTime(Date time) {
-        this.time =DateUtils.formatDateTime(time);
+    public String getTime() {
+        return time = DateUtils.getRangeOf1min(new Date());
     }
 
     public String getSystem() {
         return this.system = "ntc";
     }
-
-    public String getTime() {
-        return time=DateUtils.getDateTime();
-    }
 }
diff --git a/src/main/java/com/nis/galaxy/util/DateUtils.java b/src/main/java/com/nis/galaxy/util/DateUtils.java
index 789b755..1ce61da 100644
--- a/src/main/java/com/nis/galaxy/util/DateUtils.java
+++ b/src/main/java/com/nis/galaxy/util/DateUtils.java
@@ -70,7 +70,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * @return
      */
     public static String getAfter5min(String time) {
-        if(time ==null || time.isEmpty()){
+        if (time == null || time.isEmpty()) {
             return "";
         }
         Date date = DateUtils.parseDate(time);
@@ -80,6 +80,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return DateUtils.formatDateTime(gc.getTime());
         //return "2018-12-01 00:00:00";
     }
+
     /**
      * 距time 24h之后
      *
@@ -87,7 +88,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * @return
      */
     public static String getAfter24h(String time) {
-        if(time ==null || time.isEmpty()){
+        if (time == null || time.isEmpty()) {
             return "";
         }
         Date date = DateUtils.parseDate(time);
@@ -105,7 +106,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * @return
      */
     public static String getAfter1h(String time) {
-        if(time ==null || time.isEmpty()){
+        if (time == null || time.isEmpty()) {
             return "";
         }
         Date date = DateUtils.parseDate(time);
@@ -149,7 +150,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss）
      */
     public static String formatDateTime(Date date) {
-        if(date==null || "".equals(date)){
+        if (date == null || "".equals(date)) {
             return "";
         }
         return formatDate(date, "yyyy-MM-dd HH:mm:ss");
@@ -378,6 +379,23 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     }
 
     /**
+     * 获取time的整时间点：1min粒度
+     * eg:  2018-12-12 12:06:36 结果为：2018-12-12 12:06:00
+     * @param time
+     * @return
+     */
+    public static String getRangeOf1min(Date time) {
+        String timeString = DateUtils.formatDateTime(time);
+        if (timeString == null || timeString.length() < 19) {
+            return "";
+        }
+        timeString.length();
+        timeString = timeString.substring(0, 17);
+        timeString = timeString.concat("00");
+        return timeString;
+    }
+
+    /**
      * 获取距离time时间minute分钟的时间,之前需加符号-、之后为正+
      *
      * @param time
@@ -385,7 +403,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * @return
      */
     public static String getBeforeNminOfTime(String time, int minute) {
-        if(time ==null || time.isEmpty()){
+        if (time == null || time.isEmpty()) {
             return "";
         }
         Date date = DateUtils.parseDate(time);
@@ -403,7 +421,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * @return
      */
     public static String getRangeNhourOfTime(String time, int hour) {
-        if(time==null){
+        if (time == null) {
             return "";
         }
         Date date = DateUtils.parseDate(time);
@@ -421,7 +439,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
      * @return
      */
     public static String getRangeNdayOfTime(String time, int day) {
-        if(time ==null || time.isEmpty()){
+        if (time == null || time.isEmpty()) {
             return "";
         }
         Date date = DateUtils.parseDate(time);
diff --git a/src/main/java/com/nis/galaxy/web/service/DictService.java b/src/main/java/com/nis/galaxy/web/service/DictService.java
index 457cd70..4b320c0 100644
--- a/src/main/java/com/nis/galaxy/web/service/DictService.java
+++ b/src/main/java/com/nis/galaxy/web/service/DictService.java
@@ -16,9 +16,5 @@ public interface DictService {
 
     List<UiTagDictInfo> getUiTagDicInfo();
 
-    List<UiAreaDictInfo> getUiAreaDictInfo();
-
-    List<UiCarrierDictInfo> getUiCarrierDictInfo();
-
     int getNtcServiceDictCount();
 }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/DictServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/DictServiceImpl.java
index d0d5d1f..b745557 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/DictServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/DictServiceImpl.java
@@ -37,15 +37,6 @@ public class DictServiceImpl implements DictService {
         return dictDao.getUiTagDicInfo();
     }
 
-    @Override
-    public List<UiAreaDictInfo> getUiAreaDictInfo() {
-        return dictDao.getUiAreaDictInfo();
-    }
-
-    @Override
-    public List<UiCarrierDictInfo> getUiCarrierDictInfo() {
-        return dictDao.getUiCarrierDictInfo();
-    }
 
     @Override
     public int getNtcServiceDictCount() {
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
index 64b3408..fb53fe1 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
@@ -68,7 +68,7 @@ public class MonitorServiceImpl implements MonitorService {
             nmsServerBean.setArea("Астана");
             nmsServerBean.setNormal(8);
             nmsServerBean.setSystem("ntc");
-            nmsServerBean.setTime(new Date());
+            nmsServerBean.setTime(DateUtils.getRangeOf1min(new Date()));
             nmsServerBean.setTotal(10);
             AbnormalBean abnormalBean1 = new AbnormalBean("serverMachine01", "10.3.48.6");
             AbnormalBean abnormalBean2 = new AbnormalBean("serverMachine02", "10.3.48.8");
diff --git a/src/main/resources/mybatis/mapper/BlockingMapper.xml b/src/main/resources/mybatis/mapper/BlockingMapper.xml
index 9bd4f98..b6091d4 100644
--- a/src/main/resources/mybatis/mapper/BlockingMapper.xml
+++ b/src/main/resources/mybatis/mapper/BlockingMapper.xml
@@ -20,11 +20,7 @@
       	<![CDATA[
       	SELECT #{push} AS time,area,SUM(controlNum) AS controlNum,SUM(monitorNum) AS monitorNum,SUM(c.up) AS upstreamNum,SUM(c.dw) AS downstreamNum,(SUM(c.up)+SUM(c.dw)) AS networkFlowNum
       	FROM(
-      	    SELECT 1 AS area,0 AS entrance_id FROM ntc_entrance_report GROUP BY 1
-	        UNION ALL
 	        SELECT entrance_id AS area,entrance_id FROM ntc_device_info GROUP BY entrance_id
-	        UNION ALL
-	        SELECT 1 AS area,3 AS entrance_id FROM ntc_entrance_report  GROUP BY 1
 	        ) d
 	        LEFT JOIN
 	        (SELECT entrance_id,SUM(sum) AS controlNum
diff --git a/src/main/resources/mybatis/mapper/BlockingTopNMapper.xml b/src/main/resources/mybatis/mapper/BlockingTopNMapper.xml
index 92d7292..4ea3eef 100644
--- a/src/main/resources/mybatis/mapper/BlockingTopNMapper.xml
+++ b/src/main/resources/mybatis/mapper/BlockingTopNMapper.xml
@@ -8,44 +8,44 @@
     <!--24小时内区域阻断协议TOP10-->
     <select id="getAreaBlockTop10ProtocolOf24hOnly" resultType="com.nis.galaxy.domain.AreaBlockProtocol">
        <![CDATA[
-       SELECT #{push} time,entrance_id area,service type,sum(sum) count
-        FROM ntc_entrance_report
-          WHERE report_time >= #{start}
+       SELECT #{push} AS time,entrance_id AS area,service AS type,SUM(sum) AS count
+       FROM ntc_entrance_report
+       WHERE report_time >= #{start}
           AND report_time < #{end}
           AND (
-            service BETWEEN 16 AND 40
-		    or service BETWEEN 258 AND 273
-		     or service = 576
-          )
-		GROUP BY service , entrance_id
-		ORDER BY count desc
-		LIMIT 10;
-        ]]>
+              service BETWEEN 16 AND 40
+		      OR service BETWEEN 258 AND 273
+		      OR service = 576
+		      )
+	   GROUP BY type , area
+	   ORDER BY count DESC
+	   LIMIT 10;
+       ]]>
      </select>
     <!--1小时内全国阻断URLTOP10 1h/条 小时报-->
     <select id="getBlockTop10URLOf1h" resultType="com.nis.galaxy.domain.NtcRejectUrlStatistic">
         <![CDATA[
-        SELECT #{push} time,url type,SUM(sum) count
+        SELECT #{push} AS time,url AS type,SUM(sum) AS count
         FROM ntc_reject_url_statistic
-          WHERE stat_time >= #{start}
-          AND stat_time < #{end}
-        GROUP BY url
-        having trim(type)!=''
-        ORDER BY count desc
+        WHERE stat_time >= #{start}
+            AND stat_time < #{end}
+        GROUP BY type
+        HAVING trim(type)!=''
+        ORDER BY count DESC
         LIMIT 100;
         ]]>
     </select>
     <!--5分钟内全国阻断URLTOP10  5m/条 Top10-->
     <select id="getBlockTop10URLOf5m" resultType="com.nis.galaxy.domain.NtcUrlIpCount">
         <![CDATA[
-        SELECT #{push} time,url type,ip_addr ip,SUM(sum) count
-           FROM ntc_reject_url_statistic
-          WHERE stat_time >= #{start}
-          AND stat_time < #{end}
-           GROUP BY url,ip_addr
-           having trim(type)!=''
-           ORDER BY count desc
-           LIMIT 100;
+        SELECT #{push} AS time,url AS type,ip_addr AS ip,SUM(sum) AS count
+        FROM ntc_reject_url_statistic
+        WHERE stat_time >= #{start}
+            AND stat_time < #{end}
+        GROUP BY type,ip
+        HAVING trim(type)!=''
+        ORDER BY count desc
+        LIMIT 100;
         ]]>
     </select>
     <!--1小时内全国阻断网站TOP10 1h/条-->
@@ -55,8 +55,8 @@
         FROM ntc_reject_website_statistic
           WHERE stat_time >= #{start}
           AND stat_time < #{end}
-        group by website
-           having trim(type)!=''
+        GROUP BY website
+        HAVING trim(type)!=''
         ORDER BY count desc
         LIMIT 100;
         ]]>
@@ -64,14 +64,14 @@
     <!--5分钟内全国阻断网站TOP10 5min/条-->
     <select id="getBlockTop10WebsiteOf5m" resultType="com.nis.galaxy.domain.NtcWebIpCount">
         <![CDATA[
-      SELECT #{push} time,website type,ip_addr ip,sum count
-          FROM ntc_reject_website_statistic
-          WHERE stat_time >= #{start}
-          AND stat_time < #{end}
-          GROUP BY website ,ip_addr
-          having trim(website)!=''
-          ORDER BY count desc
-          LIMIT 100;
+        SELECT #{push} time,website type,ip_addr ip,sum count
+        FROM ntc_reject_website_statistic
+        WHERE stat_time >= #{start}
+            AND stat_time < #{end}
+        GROUP BY website ,ip_addr
+        HAVING trim(website)!=''
+        ORDER BY count desc
+        LIMIT 100;
         ]]>
     </select>
     <!--1.24小时内封堵标签TOP10 1h/条 粒度5min 1h的汇总_____映射-->
@@ -79,7 +79,7 @@
 		<![CDATA[
         SELECT #{push} time,tag type ,SUM(sum) count
         FROM ntc_tag_report
-          WHERE report_time >= #{start}
+        WHERE report_time >= #{start}
           AND report_time < #{end}
 		  GROUP BY tag
 		  ORDER BY count desc;
@@ -92,7 +92,7 @@
         SELECT  #{push} time,tag type ,SUM(sum) count
         FROM ntc_tag_report
         WHERE report_time >= #{start}
-        AND report_time < #{end}
+            AND report_time < #{end}
 		GROUP BY type
 		ORDER BY count desc
 		LIMIT 100;
@@ -103,62 +103,62 @@
     <!--时间：24小时区域阻断协议TOP10_分钟报-->
     <select id="getAreaBlockTop10ProtocolOf24hLastTime" resultType="java.util.Date">
         <![CDATA[
-        select max(report_time)
-          FROM ntc_entrance_report
-          WHERE report_time < #{end}
-          AND (
-            service BETWEEN 16 AND 40
-		    or service BETWEEN 258 AND 273
-		     or service = 576
-          )
+        SELECT MAX(report_time)
+        FROM ntc_entrance_report
+        WHERE report_time < #{end}
+            AND (
+                service BETWEEN 16 AND 40
+		        OR service BETWEEN 258 AND 273
+		        OR service = 576
+		        )
         ]]>
     </select>
     <!--时间：1小时内全国阻断URLTOP10-->
     <select id="getBlockTop10URLOf1hLastTime" resultType="java.util.Date">
         <![CDATA[
-        select max(stat_time)
-          FROM ntc_reject_url_statistic
-          WHERE stat_time < #{end}
+        SELECT MAX(stat_time)
+        FROM ntc_reject_url_statistic
+        WHERE stat_time < #{end}
         ]]>
     </select>
     <!--时间：1小时内全国阻断网站TOP10-->
     <select id="getBlockTop10WebsiteOf1hLastTime" resultType="java.util.Date">
         <![CDATA[
-        select max(stat_time)
-          FROM ntc_reject_website_statistic
-          WHERE stat_time < #{end}
+        SELECT MAX(stat_time)
+        FROM ntc_reject_website_statistic
+        WHERE stat_time < #{end}
         ]]>
     </select>
     <!--时间：24小时内封堵标签TOP10-->
     <select id="getBlockTop10Tag24hLastTime" resultType="java.util.Date">
         <![CDATA[
-        select max(report_time)
-          FROM ntc_tag_report
-          WHERE report_time < #{end}
+        SELECT MAX(report_time)
+        FROM ntc_tag_report
+        WHERE report_time < #{end}
         ]]>
     </select>
     <!--时间：5分钟内全国阻断URLTOP10-->
     <select id="getBlockTop10URLOf5mLastTime" resultType="java.util.Date">
         <![CDATA[
-        select max(stat_time)
-          FROM ntc_reject_url_statistic
-          WHERE stat_time < #{end}
+        SELECT MAX(stat_time)
+        FROM ntc_reject_url_statistic
+        WHERE stat_time < #{end}
         ]]>
     </select>
     <!--时间：5分钟内全国阻断websiteTOP10-->
     <select id="getBlockTop10WebsiteOf5mLastTime" resultType="java.util.Date">
         <![CDATA[
-        select max(stat_time)
-          FROM ntc_reject_website_statistic
-          WHERE stat_time < #{end}
+        SELECT MAX(stat_time)
+        FROM ntc_reject_website_statistic
+        WHERE stat_time < #{end}
         ]]>
     </select>
     <!--时间：1h内全国阻断标签TOP100-->
     <select id="getBlockTop10Tag5mOnlyLastTime" resultType="java.util.Date">
         <![CDATA[
-        select max(report_time)
-          FROM ntc_tag_report
-          WHERE report_time < #{end}
+        SELECT MAX(report_time)
+        FROM ntc_tag_report
+        WHERE report_time < #{end}
         ]]>
     </select>
 
diff --git a/src/main/resources/mybatis/mapper/DictMapper.xml b/src/main/resources/mybatis/mapper/DictMapper.xml
index dfe372d..1f3a9dc 100644
--- a/src/main/resources/mybatis/mapper/DictMapper.xml
+++ b/src/main/resources/mybatis/mapper/DictMapper.xml
@@ -3,20 +3,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.nis.galaxy.web.dao.DictDao">
-    <!--地域表-->
-    <select id="getUiAreaDictInfo" resultType="com.nis.galaxy.domain.dict.UiAreaDictInfo">
-      SELECT item_code areaId,item_value itemValue
-      FROM ui_sys_dict_info
-      WHERE item_type=1
-          AND is_valid=1;
-    </select>
-    <!--运行商表-->
-    <select id="getUiCarrierDictInfo" resultType="com.nis.galaxy.domain.dict.UiCarrierDictInfo">
-      SELECT item_code CarrierId,item_value itemValue
-      FROM ui_sys_dict_info
-      WHERE item_type=1
-          AND is_valid=1;
-    </select>
     <!--业务表-->
     <select id="getNtcServiceDict" resultType="com.nis.galaxy.domain.dict.NtcServiceDict">
         SELECT service_code serviceCode,service_name_zh serviceNameZh,service_name_en serviceNameEn,service_name_ru serviceNameRu