refactor(业务字典表):重构业务字典表映射逻辑

6 files changed, 32 insertions, 61 deletions

diff --git a/src/main/java/com/nis/galaxy/config/MyLoad.java b/src/main/java/com/nis/galaxy/config/MyLoad.java
index 4d50c68..ebbb776 100644
--- a/src/main/java/com/nis/galaxy/config/MyLoad.java
+++ b/src/main/java/com/nis/galaxy/config/MyLoad.java
@@ -63,6 +63,13 @@ public class MyLoad {
         }
         if (!ListUtils.isEmptyList(ntcServiceDict)) {
             for (NtcServiceDict serviceDict : ntcServiceDict) {
+                if (ConfigUtil.languageChose == 3) {
+                    serviceDict.setServiceValue(serviceDict.getServiceNameRu());
+                } else if (ConfigUtil.languageChose == 2) {
+                    serviceDict.setServiceValue(serviceDict.getServiceNameEn());
+                } else {
+                    serviceDict.setServiceValue(serviceDict.getServiceNameZh());
+                }
                 mapNtcService.put(String.valueOf(serviceDict.getServiceCode()), serviceDict);
             }
             listNtcService = mapNtcService;
diff --git a/src/main/java/com/nis/galaxy/domain/dict/NtcServiceDict.java b/src/main/java/com/nis/galaxy/domain/dict/NtcServiceDict.java
index ddc9ef7..8dd3fb9 100644
--- a/src/main/java/com/nis/galaxy/domain/dict/NtcServiceDict.java
+++ b/src/main/java/com/nis/galaxy/domain/dict/NtcServiceDict.java
@@ -19,4 +19,5 @@ public class NtcServiceDict {
     private String serviceNameZh;
     private String serviceNameEn;
     private String serviceNameRu;
+    private String serviceValue;
 }
diff --git a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
index 014dc68..44900a4 100644
--- a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
@@ -152,7 +152,7 @@ public class ForEventsInterface {
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "trans.type", contentValue);
-        logger.info("开始推送=======>>{}\t请求头和请求体\t", logMark, httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
         logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
index be3f71e..a1ce79c 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
@@ -217,16 +217,7 @@ public class BlockingServiceImp implements BlockingService {
                     if (ntcServiceDict == null) {
                         continue;
                     }
-                    if (ConfigUtil.languageChose == 2) {
-                        //获取英文字段
-                        timeTypeCount.setType(ntcServiceDict.getServiceNameEn());
-                    } else if (ConfigUtil.languageChose == 1) {
-                        //中文
-                        timeTypeCount.setType(ntcServiceDict.getServiceNameZh());
-                    } else {
-                        //俄文
-                        timeTypeCount.setType(ntcServiceDict.getServiceNameRu());
-                    }
+                    timeTypeCount.setType(ntcServiceDict.getServiceValue());
                 }
             }
         }
@@ -344,13 +335,7 @@ public class BlockingServiceImp implements BlockingService {
                 if (ntcServiceDict == null) {
                     continue;
                 }
-                if (ConfigUtil.languageChose == 2) {
-                    next.setType(ntcServiceDict.getServiceNameEn());
-                } else if (ConfigUtil.languageChose == 3) {
-                    next.setType(ntcServiceDict.getServiceNameRu());
-                } else {
-                    next.setType(ntcServiceDict.getServiceNameZh());
-                }
+                next.setType(ntcServiceDict.getServiceValue());
             }
         }
         logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
@@ -391,6 +376,13 @@ public class BlockingServiceImp implements BlockingService {
                 }
                 if (!ntcServiceDict.isEmpty()) {
                     for (NtcServiceDict serviceDict : ntcServiceDict) {
+                        if (ConfigUtil.languageChose == 3) {
+                            serviceDict.setServiceValue(serviceDict.getServiceNameRu());
+                        } else if (ConfigUtil.languageChose == 2) {
+                            serviceDict.setServiceValue(serviceDict.getServiceNameEn());
+                        } else {
+                            serviceDict.setServiceValue(serviceDict.getServiceNameZh());
+                        }
                         mapNtcService.put(String.valueOf(serviceDict.getServiceCode()), serviceDict);
                     }
                     listNtcService = mapNtcService;
@@ -408,13 +400,7 @@ public class BlockingServiceImp implements BlockingService {
                     if (ntcServiceDict == null) {
                         continue;
                     }
-                    if (ConfigUtil.languageChose == 2) {
-                        pointMap.setType(ntcServiceDict.getServiceNameEn());
-                    } else if (ConfigUtil.languageChose == 1) {
-                        pointMap.setType(ntcServiceDict.getServiceNameZh());
-                    } else {
-                        pointMap.setType(ntcServiceDict.getServiceNameRu());
-                    }
+                    pointMap.setType(ntcServiceDict.getServiceValue());
                 }
             }
         }
@@ -507,13 +493,7 @@ public class BlockingServiceImp implements BlockingService {
                 if (ntcServiceDict == null) {
                     continue;
                 }
-                if (ConfigUtil.languageChose == 2) {
-                    cfgTypeCount.setType(ntcServiceDict.getServiceNameEn());
-                } else if (ConfigUtil.languageChose == 1) {
-                    cfgTypeCount.setType(ntcServiceDict.getServiceNameZh());
-                } else {
-                    cfgTypeCount.setType(ntcServiceDict.getServiceNameRu());
-                }
+                cfgTypeCount.setType(ntcServiceDict.getServiceValue());
             }
         }
         logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
@@ -534,7 +514,8 @@ public class BlockingServiceImp implements BlockingService {
         Map<String, NtcServiceDict> listNtcService = listNtcService();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = blockingDao.getBlockingGlobalProtocolConfigDay(start,end);;
+            list = blockingDao.getBlockingGlobalProtocolConfigDay(start, end);
+            ;
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
@@ -544,13 +525,7 @@ public class BlockingServiceImp implements BlockingService {
                 if (ntcServiceDict == null) {
                     continue;
                 }
-                if (ConfigUtil.languageChose == 2) {
-                    cfgTypeCount.setType(ntcServiceDict.getServiceNameEn());
-                } else if (ConfigUtil.languageChose == 1) {
-                    cfgTypeCount.setType(ntcServiceDict.getServiceNameZh());
-                } else {
-                    cfgTypeCount.setType(ntcServiceDict.getServiceNameRu());
-                }
+                cfgTypeCount.setType(ntcServiceDict.getServiceValue());
             }
         }
         logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
@@ -563,18 +538,19 @@ public class BlockingServiceImp implements BlockingService {
         List<PortStateInfo> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         try {
-            list = blockingDao.getPortStateInfo(start,start,end);;
+            list = blockingDao.getPortStateInfo(start, start, end);
+            ;
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
-        if(ListUtils.isEmptyList(list)){
+        if (ListUtils.isEmptyList(list)) {
             logger.warn("{}\tTRAFFIC_SERIESDEVICE_PORT_INFO\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
                 Date startLastTime = blockingDao.getPortStateInfoLastTime(end);
                 if (startLastTime != null) {
                     startLastTime = DateUtil.getFormatMinuteOne(startLastTime);
                     Date endLastTime = DateUtil.getSomeMinute(startLastTime, 1);
-                    list = blockingDao.getPortStateInfo(start,startLastTime, endLastTime);
+                    list = blockingDao.getPortStateInfo(start, startLastTime, endLastTime);
                 } else {
                     logger.warn(logMark + "\tTRAFFIC_SERIESDEVICE_PORT_INFO\t无数据");
                 }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
index 2c45757..c1ed8ba 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
@@ -223,13 +223,7 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
                 if (ntcServiceDict == null) {
                     continue;
                 }
-                if (ConfigUtil.languageChose == 2) {
-                    next.setType(ntcServiceDict.getServiceNameEn());
-                } else if (ConfigUtil.languageChose == 3) {
-                    next.setType(ntcServiceDict.getServiceNameRu());
-                } else {
-                    next.setType(ntcServiceDict.getServiceNameZh());
-                }
+                next.setType(ntcServiceDict.getServiceValue());
             }
             if (list.size() > 10) {
                 list = list.subList(0, 10);
@@ -265,7 +259,6 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingTopNDao.getBlockTop10URLOf5m(start, start, end);
-
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
index 81de433..f479c00 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
@@ -228,13 +228,7 @@ public class EventsServiceImpl implements EventsService {
                 String type = eventsServiceCount.getType();
                 NtcServiceDict ntcServiceDict = listNtcService.get(type);
                 if (ntcServiceDict != null) {
-                    if (ConfigUtil.languageChose == 2) {
-                        eventsServiceCount.setType(ntcServiceDict.getServiceNameEn());
-                    } else if (ConfigUtil.languageChose == 1) {
-                        eventsServiceCount.setType(ntcServiceDict.getServiceNameZh());
-                    } else if (ConfigUtil.languageChose == 3) {
-                        eventsServiceCount.setType(ntcServiceDict.getServiceNameRu());
-                    }
+                    eventsServiceCount.setType(ntcServiceDict.getServiceValue());
                 }
             }
         }
@@ -378,7 +372,7 @@ public class EventsServiceImpl implements EventsService {
         List<EventsMonitor> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = eventsDao.getCfgsMonitor(start,end);
+            list = eventsDao.getCfgsMonitor(start, end);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
@@ -405,11 +399,11 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsBlock> getCfgsBlock(Date start, Date end,String logMark) {
+    public List<EventsBlock> getCfgsBlock(Date start, Date end, String logMark) {
         List<EventsBlock> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = eventsDao.getCfgsBlock(start,end);
+            list = eventsDao.getCfgsBlock(start, end);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }