Merge branch 'dev' into sky_v2

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/KwsAlarmService.java

@@ -130,13 +130,13 @@ public class KwsAlarmService {
         if (StringUtils.isNotBlank(query.getProjectId())) {
             wrapper.eq(KwsAlarm::getProjectId, Long.parseLong(query.getProjectId()));
         }
-        if (Objects.nonNull(query.getAlarmLevel())) {
+        if (Objects.nonNull(query.getAlarmLevel()) && (0 != query.getAlarmLevel())) {
             wrapper.eq(KwsAlarm::getLevel, query.getAlarmLevel());
         }
         if (StringUtils.isNotBlank(query.getAlarmInfo())) {
             wrapper.eq(KwsAlarm::getTitle, query.getAlarmInfo());
         }
-        if (StringUtils.isNotBlank(query.getDeviceId())){
+        if (StringUtils.isNotBlank(query.getDeviceId())) {
             wrapper.like(KwsAlarm::getDeviceId, query.getDeviceId());
         }
         wrapper.orderByDesc(KwsAlarm::getCreateTime);
@@ -792,13 +792,13 @@ public class KwsAlarmService {
                 vo.setPhone(kwsThreshold.getPhones());
                 KwsDevice kwsDevice = deviceMapper.selectById(kwsThreshold.getDeviceId());
                 StringBuilder location = new StringBuilder();
-                if (StringUtils.isNotBlank(kwsDevice.getLogicAlt())){
+                if (StringUtils.isNotBlank(kwsDevice.getLogicAlt())) {
                     location.append(kwsDevice.getLogicAlt()).append(";");
                 }
-                if (StringUtils.isNotBlank(kwsDevice.getLogicLat())){
+                if (StringUtils.isNotBlank(kwsDevice.getLogicLat())) {
                     location.append(kwsDevice.getLogicLat()).append(";");
                 }
-                if (StringUtils.isNotBlank(kwsDevice.getLogicLng())){
+                if (StringUtils.isNotBlank(kwsDevice.getLogicLng())) {
                     location.append(kwsDevice.getLogicLng());
                 }
                 vo.setLocation(location.toString());