修正升压站报警异常

alarm-service/src/main/java/com/gyee/alarm/service/AlarmBtService.java

@@ -416,6 +416,11 @@ public class AlarmBtService {
                         alarmTagls.add(alarm);
                     }
                 }
+//                else
+//                {
+//                    alarm.setSuperTalbe(AlarmSuperTalbeType.BT.getCode());
+//                    alarmTagls.add(alarm);
+//                }
             }
 
             if (StringUtils.notEmp(alarmTagls) && !alarmTagls.isEmpty()) {

alarm-service/src/main/java/com/gyee/alarm/service/AlarmCtService.java

@@ -676,6 +676,11 @@ public class AlarmCtService {
                             alarmTagls.add(alarm);
                         }
                     }
+//                    else
+//                    {
+//                        alarm.setSuperTalbe(AlarmSuperTalbeType.BT.getCode());
+//                        alarmTagls.add(alarm);
+//                    }
                 }
                 if (StringUtils.notEmp(alarmTagls) && !alarmTagls.isEmpty()) {
                     alarmTsService.insertList(alarmTagls);

alarm-service/src/main/java/com/gyee/alarm/service/AlarmInService.java

@@ -471,6 +471,11 @@ public class AlarmInService {
 
                     }
                 }
+//                else
+//                {
+//                    alarm.setSuperTalbe(AlarmSuperTalbeType.BT.getCode());
+//                    alarmTagls.add(alarm);
+//                }
             }
 
             if (StringUtils.notEmp(alarmTagls) && !alarmTagls.isEmpty()) {

alarm-service/src/main/java/com/gyee/alarm/service/AlarmWtService.java

@@ -507,6 +507,11 @@ public class AlarmWtService {
 
                     }
                 }
+//                else
+//                {
+//                    alarm.setSuperTalbe(AlarmSuperTalbeType.BT.getCode());
+//                    alarmTagls.add(alarm);
+//                }
             }
 
             if (StringUtils.notEmp(alarmTagls) && !alarmTagls.isEmpty()) {

alarm-service/src/main/java/com/gyee/alarm/service/auto/impl/AlarmTsServiceImpl.java

@@ -198,7 +198,7 @@ public class AlarmTsServiceImpl extends ServiceImpl<AlarmTsMapper, AlarmTs> impl
             sb.append(" select last_row(ts) as ts, last_row(val) as val, last_row(confirmed) as confirmed, last_row(endts) as endts, last_row(timelong) as timelong,tbname from ")
             .append(superTableName).append(" where tbname in( ");
             sb.append(tbnames)
-                    .append(" ) group by tbname");
+                    .append(" ) and endts is null group by tbname");
 
             ls= alarmTsMapper.selectLastRowByTbname(String.valueOf(sb));
         }