去掉电源故障和卷曲伺服故障和牵引伺服故障

ruoyi-admin/src/main/java/com/ruoyi/biz/service/impl/ApiServiceImpl.java

@@ -160,9 +160,8 @@ public class ApiServiceImpl implements IApiService {
                     continue;
                 }
                 for (int i = 1; i <= 26; i++) {
-                    if (i != 9 && i != 25) {
-                        // 2024-10-29  卷曲伺服故障 意义不明确，也不显示
-                        //电源故障暂时先不展示
+                    if (i != 9 && i != 25 && i != 24) {
+                        //去掉电源故障和卷曲伺服故障和牵引伺服故障
                         boolean flag = (boolean) map.get("Alarm_unit_" + i);
                         if (flag) {
                             IndexAlarm indexAlarm = new IndexAlarm();

ruoyi-admin/src/main/java/com/ruoyi/biz/service/impl/AsyncServiceImpl.java

@@ -369,8 +369,8 @@ public class AsyncServiceImpl {
         if (i == 1) {
             int j = 0;
             for (; j < index; j++) {
-                if ((j + 1) != 9 && (j + 1) != 25) {
-                    //去掉电源故障和卷曲故障
+                if ((j + 1) != 9 && (j + 1) != 25 && (j + 1) != 24) {
+                    //去掉电源故障和卷曲伺服故障和牵引伺服故障
                     boolean currV = curr.getBool(j + 12);
                     if (currV) {
                         flags[j] = false;
@@ -395,8 +395,8 @@ public class AsyncServiceImpl {
         }
         int j = 0;
         for (; j < index; j++) {
-            if ((j + 1) != 9 && (j + 1) != 25) {
-                //去掉电源故障和卷曲故障
+            if ((j + 1) != 9 && (j + 1) != 25 && (j + 1) != 24) {
+                //去掉电源故障和卷曲伺服故障和牵引伺服故障
                 if (flags[j]) {
                     boolean currV = curr.getBool(j + 12);
                     boolean lastV = last.getBool(j + 12);

ruoyi-admin/src/main/resources/my-application.yml

@@ -15,6 +15,7 @@ excel:
   stopsType: D:\twin\service\stopsType.xlsx
   alarms: D:\twin\service\alarms.xlsx
   yarn: D:\twin\service\yarn.xlsx
+  brokenYarn: D:\twin\service\brokenYarn.xlsx
 # 项目相关配置
 ruoyi:
   # 名称