调度

src/main/java/com/iden/bms/controller/TraceController.java

@@ -57,8 +57,8 @@ public class TraceController {
     }
 
 
-    @GetMapping("/listTrace")
-    @ApiOperation(value = "目标轨迹列表，地图打点划线 ")
+    @GetMapping("/listUploadImagesTrace")
+    @ApiOperation(value = "使用上传图像获取目标轨迹列表（地图打点划线） ")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(paramType = "query", name = "images", value = "图像名称，多个用逗号分割"),
             @ApiImplicitParam(paramType = "query", name = "beginTime", value = "开始时间(yyyy-MM-dd HH:mm:ss)"),
@@ -74,7 +74,7 @@ public class TraceController {
             List<TraceVO> datas = this.traceService.listUploadImagesTrace(images,beginTime,endTime,loginUser);
             return Result.success(datas);
         }catch (Exception e) {
-            log.error("轨迹管理: 目标轨迹列表查询出现异常",e);
+            log.error("轨迹管理: 使用上传图像获取目标轨迹列表出现异常",e);
             return Result.error( "获取列表失败");
         }
     }
@@ -82,6 +82,8 @@ public class TraceController {
 
 
 
+
+
 //    @GetMapping("/cameraPlay/{id}")
 //    @ApiOperation(value = "摄像机播放")
 //    public Result<TraceVO> cameraPlay(HttpServletRequest request, @RequestHeader("token") String token, @PathVariable("id") Long id){

src/main/java/com/iden/bms/face/FaceIdenSchedule.java

@@ -1,6 +1,7 @@
-package com.iden.bms.face;
+package com.iden.bms.schedule;
 
 
+import com.iden.bms.face.FaceIdenService;
 import com.iden.common.cache.RedisKeyConstant;
 import com.iden.common.cache.RedisUtil;
 import org.springframework.context.annotation.Configuration;
@@ -29,7 +30,7 @@ public class FaceIdenSchedule {
      * 处理摄像头上传的图像
      */
     @Async
-    @Scheduled(cron = "10 0/5 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     public void handleCameraImage() {
         String key = RedisKeyConstant.HANDLE_CAMERA_IMAGE;
         String requestId = UUID.randomUUID().toString();
@@ -50,7 +51,7 @@ public class FaceIdenSchedule {
      * 处理摄像头上传的视频
      */
     @Async
-    @Scheduled(cron = "20 0/5 * * * ?")
+    @Scheduled(cron = "10 0/5 * * * ?")
     public void handleCameraVideo() {
         String key = RedisKeyConstant.HANDLE_CAMERA_VIDEO;
         String requestId = UUID.randomUUID().toString();

src/main/java/com/iden/bms/schedule/WarningPersonTraceSchedule.java

@@ -0,0 +1,51 @@
+package com.iden.bms.schedule;
+
+
+import com.iden.bms.face.FaceIdenService;
+import com.iden.bms.service.TraceService;
+import com.iden.common.cache.RedisKeyConstant;
+import com.iden.common.cache.RedisUtil;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.util.UUID;
+
+/**
+ * 把预警人员的轨迹入库
+ */
+@Configuration
+@EnableScheduling
+@EnableAsync
+public class WarningPersonTraceSchedule {
+
+    @Resource
+    private TraceService traceService;
+    @Resource
+    private RedisUtil redisUtil;
+
+    /**
+     * 把预警人员的轨迹入库
+     */
+    @Async
+    @Scheduled(cron = "20 0/5 * * * ?")
+    public void handleWarningPersonTrace() {
+        String key = RedisKeyConstant.HANDLE_WARNING_PERSION_TRACE;
+        String requestId = UUID.randomUUID().toString();
+        boolean result = redisUtil.tryLock(key,requestId,5 * 60);
+        try {
+            if (result) {
+                traceService.handleWarningPersonTrace();
+            }
+        } catch (Exception e) {
+            e.getMessage();
+        }  finally {
+            redisUtil.releaseLock(key,requestId);
+        }
+    }
+
+
+}

src/main/java/com/iden/bms/service/TraceService.java

@@ -149,4 +149,12 @@ public class TraceService {
         File[] resuit = new File[list.size()];
         return list.toArray(resuit);
     }
+
+    /**
+     * 预警人员轨迹数据入库
+     * 图像识别，使用特征码查询图像库，得到图库表中对应的数据列表
+     */
+    public  void handleWarningPersonTrace() {
+
+    }
 }

src/main/java/com/iden/common/cache/RedisKeyConstant.java

@@ -18,4 +18,5 @@ public class RedisKeyConstant {
 
     public static final String HANDLE_CAMERA_IMAGE = "HANDLE_CAMERA_IMAGE";
     public static final String HANDLE_CAMERA_VIDEO = "HANDLE_CAMERA_VIDEO";
+    public static final String HANDLE_WARNING_PERSION_TRACE = "HANDLE_WARNING_PERSION_TRACE";
 }

src/main/java/com/iden/common/entity/IdenTrace.java

@@ -19,25 +19,30 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 轨迹表(IdenTrace)实体类
+ * 预警人员轨迹表(IdenWarningPersonTrace)实体类
  *
  * @author makejava
- * @since 2021-12-24 14:55:25
+ * @since 2021-12-28 13:37:38
  */
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("iden_trace")
-@ApiModel(value = "轨迹表", description = "")
-public class IdenTrace implements Serializable {
-    private static final long serialVersionUID = 776029183432133610L;
+@TableName("iden_warning_person_trace")
+@ApiModel(value = "预警人员轨迹表", description = "")
+public class IdenWarningPersonTrace implements Serializable {
+    private static final long serialVersionUID = 592277343349493024L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
 
-    @ApiModelProperty("图像")
+    @ApiModelProperty("预警人员表ID")
+    @TableField("WARNING_PERSON_ID")
+    private Long warningPersonId;
+
+
+    @ApiModelProperty("图像编码")
     @TableField("IMAGE")
     private String image;
 

src/main/java/com/iden/common/mapper/IdenTraceMapper.java

@@ -1,15 +0,0 @@
-package com.iden.common.mapper;
-
-import com.iden.common.entity.IdenTrace;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 轨迹表(IdenTrace)表数据库访问层
- *
- * @author makejava
- * @since 2021-12-24 14:55:27
- */
-public interface IdenTraceMapper extends BaseMapper<IdenTrace> {
-
-}

src/main/java/com/iden/common/mapper/IdenWarningPersonTraceMapper.java

@@ -0,0 +1,15 @@
+package com.iden.common.mapper;
+
+import com.iden.common.entity.IdenWarningPersonTrace;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 预警人员轨迹表(IdenWarningPersonTrace)表数据库访问层
+ *
+ * @author makejava
+ * @since 2021-12-28 13:37:38
+ */
+public interface IdenWarningPersonTraceMapper extends BaseMapper<IdenWarningPersonTrace> {
+
+}

src/main/java/com/iden/common/service/IdenTraceService.java

@@ -1,14 +0,0 @@
-package com.iden.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.iden.common.entity.IdenTrace;
-
-/**
- * 轨迹表(IdenTrace)表服务接口
- *
- * @author makejava
- * @since 2021-12-24 14:55:28
- */
-public interface IdenTraceService extends IService<IdenTrace> {
-
-}

src/main/java/com/iden/common/service/IdenWarningPersonTraceService.java

@@ -0,0 +1,14 @@
+package com.iden.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.iden.common.entity.IdenWarningPersonTrace;
+
+/**
+ * 预警人员轨迹表(IdenWarningPersonTrace)表服务接口
+ *
+ * @author makejava
+ * @since 2021-12-28 13:37:38
+ */
+public interface IdenWarningPersonTraceService extends IService<IdenWarningPersonTrace> {
+
+}

src/main/java/com/iden/common/service/impl/IdenTraceServiceImpl.java

@@ -1,18 +0,0 @@
-package com.iden.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iden.common.mapper.IdenTraceMapper;
-import com.iden.common.entity.IdenTrace;
-import com.iden.common.service.IdenTraceService;
-import org.springframework.stereotype.Service;
-
-/**
- * 轨迹表(IdenTrace)表服务实现类
- *
- * @author makejava
- * @since 2021-12-24 14:55:31
- */
-@Service
-public class IdenTraceServiceImpl extends ServiceImpl<IdenTraceMapper, IdenTrace> implements IdenTraceService {
-
-}

src/main/java/com/iden/common/service/impl/IdenWarningPersonTraceServiceImpl.java

@@ -0,0 +1,18 @@
+package com.iden.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iden.common.mapper.IdenWarningPersonTraceMapper;
+import com.iden.common.entity.IdenWarningPersonTrace;
+import com.iden.common.service.IdenWarningPersonTraceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 预警人员轨迹表(IdenWarningPersonTrace)表服务实现类
+ *
+ * @author makejava
+ * @since 2021-12-28 13:37:39
+ */
+@Service
+public class IdenWarningPersonTraceServiceImpl extends ServiceImpl<IdenWarningPersonTraceMapper, IdenWarningPersonTrace> implements IdenWarningPersonTraceService {
+
+}

src/main/java/com/iden/common/vo/TraceVO.java

@@ -22,6 +22,9 @@ public class TraceVO implements Serializable {
 
     private Long id;
 
+    @ApiModelProperty("预警人员表ID")
+    private Long warningPersonId;
+
     @ApiModelProperty("图像")
     private String image;
 
@@ -31,6 +34,7 @@ public class TraceVO implements Serializable {
     @ApiModelProperty("小区ID")
     private Long communityId;
 
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("抓拍时间")
     private Date photographTime;

src/main/resources/mybatis/IdenTraceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iden.common.mapper.IdenTraceMapper">
+<mapper namespace="com.iden.common.mapper.IdenWarningPersonTraceMapper">
 
 
 </mapper>