Browse Source

摄像机监控开发

gao.qiang 1 year ago
parent
commit
d33661f10b

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

@@ -168,10 +168,16 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     private Integer isStartRecording;
 
     /**
-     * 是否在线 0.离线 1.在线
+     * 是否在线 1.离线 2.在线
      */
     private Integer online;
 
+    /**
+     * 是否在线 1.离线 2.在线
+     */
+    @TableField(exist = false)
+    private String onlineName;
+
     /**
      * 视频url
      */

+ 3 - 3
business-service/src/main/java/com/ozs/service/impl/BaseCameraManagementServiceImpl.java

@@ -352,17 +352,17 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                 SkynetHeartbeatLog skynetHeartbeatLog = baseCameraManagementMapper.selectSkynetHeartbeatLogByCameraCode(baseCameraManagement.getCameraCode());
                 if (StringUtils.isEmptySunhh(skynetHeartbeatLog)) {
                     offline++;
-                    baseCameraManagement.setOnline(0);
+                    baseCameraManagement.setOnline(1);
                 } else {
                     long timeNow = System.currentTimeMillis();
                     long createTime = skynetHeartbeatLog.getCreateTime().getTime();
                     long thereHourMillis = 60 * 60 * 1000 * 3;
                     long timeNew = timeNow - thereHourMillis;
                     if (timeNew <= createTime) {
-                        baseCameraManagement.setOnline(1);
+                        baseCameraManagement.setOnline(2);
                         online++;
                     } else {
-                        baseCameraManagement.setOnline(0);
+                        baseCameraManagement.setOnline(1);
                         offline++;
                     }
                 }

+ 3 - 0
business-service/src/main/resources/mapper/BaseCameraManagementMapper.xml

@@ -21,6 +21,9 @@
             <if test="endMile != null and endMile != 0">
                 and end_mile &lt;= #{endMile}
             </if>
+            <if test="online != null and online != 0">
+                and online = #{online}
+            </if>
             <if test="ids != null and ids.size>0">
                 and id in
                 <foreach item="items" collection="ids" separator="," open="(" close=")" index="">

+ 3 - 0
vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -196,6 +196,9 @@ public class BaseCameraManagementController extends BaseController {
                 if (!ObjectUtils.isEmpty(o.getRailwayCode())) {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
                 }
+                if (!ObjectUtils.isEmpty(o.getOnline())) {
+                    o.setOnlineName(o.getOnline() == 2 ? "在线" : "离线");
+                }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
 //                SysDept sysDept = deptService.selectDeptById(o.getDeptId());
 //                o.setDeptName(sysDept.getDeptName());