状态异常的相机开发

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

@@ -1,6 +1,7 @@
 package com.ozs.service.entity;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -218,6 +219,18 @@ public class BaseCameraManagement extends BaseEntity implements Serializable ,Co
     @TableField(exist = false)
     private Integer isDisable;
 
+    /**
+     * 最后心跳时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime heartTime;
+
+    /**
+     * 剩余电量
+     */
+    @TableField(exist = false)
+    private Integer electricity;
+
     @Override
     public int compareTo(BaseCameraManagement o) {
         int i =o.getRailwayName().compareTo(o.railwayName);

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

@@ -22,18 +22,9 @@ import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.framework.config.ServerConfig;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseDeviceDynamicManagement;
-import com.ozs.service.entity.BaseRailwayManagement;
-import com.ozs.service.entity.BaseUser;
-import com.ozs.service.entity.CameraTree;
-import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.*;
-import com.ozs.service.service.BaseCameraManagementService;
-import com.ozs.service.service.BaseDeviceDynamicManagementService;
-import com.ozs.service.service.BaseRailwayManagementService;
-import com.ozs.service.service.BaseUserService;
-import com.ozs.service.service.MsgAlarmService;
+import com.ozs.service.service.*;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictTypeService;
@@ -60,6 +51,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -104,6 +96,8 @@ public class BaseCameraManagementController extends BaseController {
     private ISysDictTypeService dictTypeService;
     @Autowired
     private CameraUtil cameraUtil;
+    @Autowired
+    private MqLogService  mqLogService;
 
 
     /**
@@ -144,6 +138,15 @@ public class BaseCameraManagementController extends BaseController {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 baseCameraManagement.setBeginMiles(begin);
             }
+            BaseDeviceDynamicManagement deviceDynamicManagement = baseDeviceDynamicManagementService.getOne(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
+                    .eq(BaseDeviceDynamicManagement::getCameraCode, cameraCode));
+            if (deviceDynamicManagement.getIsDisable()==2) {
+                baseCameraManagement.setIsDisable(deviceDynamicManagement.getIsDisable());
+                baseCameraManagement.setElectricity(deviceDynamicManagement.getElectricity());
+                LocalDateTime createTime = mqLogService.getOne(new LambdaQueryWrapper<MqLog>()
+                        .eq(MqLog::getCameraCode, cameraCode).orderByDesc(MqLog::getCreateTime).last("limit 1")).getCreateTime();
+                baseCameraManagement.setHeartTime(createTime);
+            }
             return AjaxResult.success(baseCameraManagement);
         } else if (!StringUtils.isEmpty(isLock) && isLock == 2 && !StringUtils.isEmpty(cameraCode)) {
             MsgAlarm msgAlarm = msgAlarmService.selectByCameraCode(cameraCode);