From bb6f09aeedfd58b871ad0afa08392056da39e77f Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 24 四月 2023 19:06:10 +0800
Subject: [PATCH] 国际化告警滚动

---
 src/main/java/com/whyc/service/InterfaceService.java |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/whyc/service/InterfaceService.java b/src/main/java/com/whyc/service/InterfaceService.java
index c540838..7d8888d 100644
--- a/src/main/java/com/whyc/service/InterfaceService.java
+++ b/src/main/java/com/whyc/service/InterfaceService.java
@@ -12,6 +12,7 @@
 import com.whyc.mapper.*;
 import com.whyc.pojo.*;
 import com.whyc.util.ActionUtil;
+import com.whyc.util.MessageUtils;
 import com.whyc.util.RSAUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,13 +54,13 @@
     @Autowired(required = false)
     private InterfaceMapper interfaceMapper;
 
-    @Autowired
+    @Autowired(required = false)
     private BattMapInformationMapper mapMapper;
 
     @Autowired
     private Fbs9100SetparamService fbs9100SetparamService;
 
-    @Autowired
+    @Autowired(required = false)
     private Fbs9100SetparamMapper fbs9100SetparamMapper;
 
     public Response getBattinf(int pageNum, int pageSize, String interfaceNumber) {
@@ -92,7 +93,7 @@
 
     //鐢垫睜鍛婅瀹炴椂鏌ヨ-websocket浣跨敤
     @Transactional
-    public Response getBattAlarm(List battgroupIds, String interfaceNumber) {
+    public Response getBattAlarm(List battgroupIds, String interfaceNumber, String lang) {
         //鍏堥獙璇�
         int flag = decryptInterface(interfaceNumber);
         if (flag == 1) {
@@ -102,8 +103,8 @@
             for (AlarmRes a : list) {
                 List<BattalarmData> l = a.getAdatas();
                 for (BattalarmData adata : l) {
-                    adata.setAlmSignalIdName(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()));
-                    adata.setAlmLevelName(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()));
+                    adata.setAlmSignalIdName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()), lang));
+                    adata.setAlmLevelName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()), lang));
                 }
             }
 //        PageInfo<AlarmRes> pinfo=new PageInfo<AlarmRes>(list);
@@ -154,6 +155,7 @@
     //鐢垫睜鍛婅鍘嗗彶鏌ヨ
     @Transactional
     public Response getBattAlarmHistory(List battgroupIds, String interfaceNumber, int pageNum, int pageSize) {
+        String lang = ActionUtil.getLang();
         //鍏堥獙璇�
         int flag = decryptInterface(interfaceNumber);
         if (flag == 1) {
@@ -162,8 +164,8 @@
             for (AlarmRes a : list) {
                 List<BattalarmData> l = a.getAdatas();
                 for (BattalarmData adata : l) {
-                    adata.setAlmSignalIdName(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()));
-                    adata.setAlmLevelName(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()));
+                    adata.setAlmSignalIdName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()), lang));
+                    adata.setAlmLevelName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()), lang));
                 }
             }
             PageInfo<AlarmRes> pageInfo = new PageInfo<AlarmRes>(list);
@@ -297,7 +299,7 @@
     }
 
 
-    public Response getAlarmDiffMap(String interfaceNumber) {
+    public Response getAlarmDiffMap(String interfaceNumber, String lang) {
         //鍏堥獙璇�
         int flag = decryptInterface(interfaceNumber);
         if (flag == 1) {
@@ -306,7 +308,7 @@
             ServletContext application = ActionUtil.getApplication();
             Map<String, Object> alarmMap = (Map<String, Object>) application.getAttribute("alarmMap");
             //鑾峰彇褰撳墠鐨勫憡璀﹀垪琛�
-            Map<String, Object> alarmMapNow = getAlarmMap();
+            Map<String, Object> alarmMapNow = getAlarmMap(lang);
 
             List<BattalarmData> battAlarmList = (List<BattalarmData>) alarmMap.get("battAlarmList");
             List<DevalarmData> devAlarmList = (List<DevalarmData>) alarmMap.get("devAlarmList");
@@ -437,11 +439,11 @@
         }
     }
 
-    public Map<String, Object> getAlarmMap() {
+    public Map<String, Object> getAlarmMap(String lang) {
         List<BattalarmData> battAlarmList = battalarmDataMapper.getBattAlarm2();
         for (BattalarmData adata : battAlarmList) {
-            adata.setAlmSignalIdName(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()));
-            adata.setAlmLevelName(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()));
+            adata.setAlmSignalIdName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()), lang));
+            adata.setAlmLevelName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()), lang));
         }
 
         List devAlarmList = devalarmDataMapper.getDevAlarm2();
@@ -462,6 +464,7 @@
     }
 
     public Response getRealTimeAlarm(InterfaceParam param) {
+        String lang = ActionUtil.getLang();
         int flag = decryptInterface(param.getInterfaceNumber());
         if (flag == 1) {
             Map<String,List> map = new HashMap<>();
@@ -477,8 +480,8 @@
                 for (AlarmRes a : battAlarmList) {
                     List<BattalarmData> l = a.getAdatas();
                     for (BattalarmData adata : l) {
-                        adata.setAlmSignalIdName(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()));
-                        adata.setAlmLevelName(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()));
+                        adata.setAlmSignalIdName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmName(adata.getAlmSignalId()), lang));
+                        adata.setAlmLevelName(MessageUtils.getMessageSocket(AlarmDaoFactory.getAlarmType(adata.getAlmLevel()), lang));
                     }
                 }
                 map.put("battAlarmList",battAlarmList);

--
Gitblit v1.9.1