修改首页铃铛进入的详情页面信息

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

@@ -74,4 +74,14 @@ public class BaseDeviceDynamicManagement extends BaseEntity implements Serializa
      * 相机状态(1在线2离线)
      */
     private Integer isDisable;
+
+    /**
+     *设备状态信息(1已读2未读)
+     */
+    private  Integer facilityState;
+
+    /**
+     *设备电量信息(1已读2未读)
+     */
+    private  Integer electricityState;
 }

business-service/src/main/java/com/ozs/service/entity/vo/DeviceStateResp.java

@@ -45,4 +45,17 @@ public class DeviceStateResp extends PageVo implements Serializable {
     private Date updateTime;
     private String railwayCode;
     private String deptId;
+    /**
+     * 设备状态信息(1已读2未读)
+     */
+    private  Integer facilityState;
+
+    /**
+     *设备电量信息(1已读2未读)
+     */
+    private  Integer electricityState;
+    /**
+     * 1电量2设备状态
+     */
+    private Integer category;
 }

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -139,7 +139,9 @@
         man.electricity,
         ca.camera_code AS cameraCode,
         ca.camera_sn AS cameraSn,
-        man.update_time AS updateTime
+        man.update_time AS updateTime,
+        man.facility_state AS facilityState,
+        man.electricity_state AS electricityState
         FROM
         base_camera_management AS ca
         LEFT JOIN base_railway_management AS ra ON ca.railway_code = ra.railway_code
@@ -155,6 +157,12 @@
             <if test="electricity != null and electricity != ''">
                 and man.electricity &lt;=#{electricity}
             </if>
+            <if test="facilityState != null and facilityState != 0">
+                and man.facilityState =#{facility_state}
+            </if>
+            <if test="electricityState != null and electricityState != 0">
+                and man.electricityState =#{electricity_state}
+            </if>
             <if test="lineDir != null and lineDir != 0">
                 and ca.line_dir =#{lineDir}
             </if>

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

@@ -62,6 +62,8 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static net.sf.jsqlparser.parser.feature.Feature.update;
+
 /**
  * <p>
  * 相机台账管理表 前端控制器
@@ -1022,5 +1024,27 @@ public class BaseCameraManagementController extends BaseController {
         map.put("count", isDisable + electricity);
         return AjaxResult.success(map);
     }
+
+    /**
+     * 修改设备状态信息(1已读2未读)
+     */
+    @PostMapping("/updateState")
+    public AjaxResult updateState(@RequestBody List<DeviceStateResp> deviceStateRespList) {
+        List<String> list = deviceStateRespList.stream().map(DeviceStateResp::getCameraCode).collect(Collectors.toList());
+        BaseDeviceDynamicManagement dynamicManagement = new BaseDeviceDynamicManagement();
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        wrapper.in(BaseDeviceDynamicManagement::getCameraCode, list);
+        if (deviceStateRespList.get(0).getCategory()==1){
+            dynamicManagement.setElectricityState(1);
+        }else {
+            dynamicManagement.setFacilityState(1);
+        }
+        boolean update = baseDeviceDynamicManagementService.update(dynamicManagement, wrapper);
+        if (update) {
+            return AjaxResult.success();
+        } else {
+            return AjaxResult.error();
+        }
+    }
 }
 

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -1085,6 +1085,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             // 执行批量修改操作
             BaseDeviceDynamicManagement update = new BaseDeviceDynamicManagement();
             update.setIsDisable(2);
+            update.setFacilityState(2);
             baseDeviceDynamicManagementService.update(update, updateWrapper);
         }
 
@@ -1097,6 +1098,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         // 执行批量修改操作
         BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
         baseDeviceDynamicManagement.setIsDisable(1);
+        baseDeviceDynamicManagement.setFacilityState(2);
         baseDeviceDynamicManagementService.update(baseDeviceDynamicManagement, wrapper);
     }
 

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -317,6 +317,7 @@ public class GeoHazardMonitorTokenController {
             }
             baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
             baseDynamicManagement.setUpdateBy(admin.getUserId());
+            baseDynamicManagement.setElectricityState(2);
             log.info("reqDeviceVo:{}", baseDynamicManagement);
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode", 1);