异物侵限报警修改

business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java

@@ -261,12 +261,14 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 版本号
      */
+    @Excel(name = "版本号")
     @TableField(exist = false)
     private String versionNum;
 
     /**
      * 版本名称
      */
+    @Excel(name = "版本名称")
     @TableField(exist = false)
     private String versionName;
 

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseDeviceResumeController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -33,10 +34,11 @@ public class BaseDeviceResumeController extends BaseController {
     @GetMapping("/getBaseDeviceResume")
     @Log(title = "设备状态履历", businessType = BusinessType.SELECT)
     public AjaxResult getBaseDeviceResume(@RequestParam(value = "cameraCode") String cameraCode,
-                                          @RequestParam(value ="startTime", required = false) String startTime,
-                                          @RequestParam(value ="endTime", required = false) String endTime) {
+                                          @RequestParam(value = "startTime", required = false) String startTime,
+                                          @RequestParam(value = "endTime", required = false) String endTime) {
         List<BaseDeviceResumeVo> baseDevicResumeVoList = baseDeviceResumeService.getBaseDeviceResume(cameraCode, startTime, endTime);
-        return AjaxResult.success(baseDevicResumeVoList);
+        List<BaseDeviceResumeVo> baseDeviceResumeVos = removeAdjacentFaults(baseDevicResumeVoList);
+        return AjaxResult.success(baseDeviceResumeVos);
     }
 
     /**
@@ -53,4 +55,15 @@ public class BaseDeviceResumeController extends BaseController {
         ExcelUtil<DeviceResumeResp> util = new ExcelUtil<>(DeviceResumeResp.class);
         util.exportExcel(response, deviceResumeRespList, "设备状态履历数据");
     }
+
+
+    public static List<BaseDeviceResumeVo> removeAdjacentFaults(List<BaseDeviceResumeVo> records) {
+        List<BaseDeviceResumeVo> resultList = new ArrayList<>();
+        for (int i = 0; i < records.size(); i++) {
+            if (i == 0 || !records.get(i).getIsDisable().equals(records.get(i - 1).getIsDisable()) || "正常".equals(records.get(i).getIsDisable())) {
+                resultList.add(records.get(i));
+            }
+        }
+        return resultList;
+    }
 }

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -484,9 +484,13 @@ public class MsgAlarmController extends BaseController {
             if (!ObjectUtils.isEmpty(baseCameraVersion)) {
                 if (!StringUtils.isEmpty(baseCameraVersion.getVersionName())) {
                     msgAlarmResp.setVersionName(baseCameraVersion.getVersionName());
+                }else {
+                    msgAlarmResp.setVersionName(" ");
                 }
                 if (!StringUtils.isEmpty(baseCameraVersion.getVersionNum())) {
                     msgAlarmResp.setVersionNum(baseCameraVersion.getVersionNum());
+                }else {
+                    msgAlarmResp.setVersionNum(" ");
                 }
             }
             return AjaxResult.success(msgAlarmResp);