预警

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

@@ -92,7 +92,7 @@ public class WarningPersonController {
             List<TraceVO> datas = this.traceService.listTrace(uid,beginDate,endDate,loginUser);
             return Result.success(datas);
         }catch (Exception e) {
-            log.error("轨迹管理: 使用上传图像获取目标轨迹列表出现异常",e);
+            log.error("预警管理: 点击预警人员获取目标轨迹列表出现异常",e);
             return Result.error( "获取列表失败");
         }
     }
@@ -107,35 +107,34 @@ public class WarningPersonController {
     public Result<Object> handleWarning(@RequestHeader("token") String token,
                                          @RequestBody WarningPersonVO vo){
         try {
-            warningPersonService.handleWarning(vo);
-            return Result.success("操作成功！");
+            if(warningPersonService.handleWarning(vo)){
+                return Result.success("处理预警成功！");
+            } else {
+                return Result.error("处理预警失败！");
+            }
+
         }catch (BDException e) {
-            log.error("更新备注出现异常",e);
+            log.error("处理预警出现异常",e);
             return Result.error(e.getMessage());
         } catch (Exception e) {
-            log.error("预警管理: 更新备注出现异常",e);
-            return Result.error("更新备注失败！");
+            log.error("预警管理: 处理预警出现异常",e);
+            return Result.error("处理预警失败！");
         }
     }
 
     @GetMapping("/listEventTimes")
     @ApiOperation(value = "预警事件时间列表")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(paramType = "query", name = "uid", value = "唯一生物学标识"),
-            @ApiImplicitParam(paramType = "query", name = "beginDate", value = "开始时间(yyyyMMdd)"),
-            @ApiImplicitParam(paramType = "query", name = "endDate", value = "结束时间(yyyyMMdd)")
-
+            @ApiImplicitParam(paramType = "query", name = "id", value = "该条数据主键")
     })
-    public Result<List<TraceVO>> listEventTimes(HttpServletRequest request, @RequestHeader(value = "token") String token,
-                                           @RequestParam(value = "uid", required = true) String uid,
-                                           @RequestParam(value = "beginDate", required = false) String beginDate,
-                                           @RequestParam(value = "endDate", required = false) String endDate){
+    public Result<List<WarningEventVO>> listEventTimes(HttpServletRequest request, @RequestHeader(value = "token") String token,
+                                           @RequestParam(value = "id", required = true) Long id){
         try {
             UserLoginedConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
-            List<TraceVO> datas = this.traceService.listTrace(uid,beginDate,endDate,loginUser);
+            List<WarningEventVO> datas = this.warningPersonService.listEventTimes(id,loginUser);
             return Result.success(datas);
         }catch (Exception e) {
-            log.error("轨迹管理: 使用上传图像获取目标轨迹列表出现异常",e);
+            log.error("预警管理: 预警事件时间列表查询出现异常",e);
             return Result.error( "获取列表失败");
         }
     }

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

@@ -10,6 +10,7 @@ import com.iden.common.entity.*;
 import com.iden.common.enums.*;
 import com.iden.common.exception.BDException;
 import com.iden.common.service.*;
+import com.iden.common.util.MyBeanUtils;
 import com.iden.common.vo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -33,7 +34,10 @@ public class WarningPersonService {
     private IdenPersonService idenPersonService;
     @Resource
     private IdenWarningPersonService idenWarningPersonService;
-
+    @Resource
+    private IdenWarningPersonHisService idenWarningPersonHisService;
+    @Resource
+    private IdenWarningEventService idenWarningEventService;
     @Resource
     private IdenPersonCrowdRefService idenPersonCrowdRefService;
     @Resource
@@ -148,10 +152,32 @@ public class WarningPersonService {
                 this.idenPersonService.save(idenPerson);
             }
         }
-        BeanUtil.copyProperties(vo,idenWarningPerson);
+        MyBeanUtils.copyProperties(vo,idenWarningPerson);
         idenWarningPerson.setModifyTime(new Date());
         idenWarningPerson.setHandleStatus(HandleWarningStatusEnum.HANDLED.getValue());
+
+        //生成一套历史数据
+        IdenWarningPersonHis idenWarningPersonHis = new IdenWarningPersonHis();
+        BeanUtil.copyProperties(idenWarningPerson,idenWarningPersonHis,"id");
+        idenWarningPersonHisService.save(idenWarningPersonHis);
+
         return idenWarningPersonService.updateById(idenWarningPerson);
 
+
+    }
+
+    public List<WarningEventVO> listEventTimes(Long id, UserLoginedConvertVO loginUser){
+        List<WarningEventVO> res = new ArrayList<>();
+        QueryWrapper<IdenWarningEvent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(IdenWarningEvent::getWarningPersonId,id).orderByAsc(IdenWarningEvent::getAppearTime);
+        List<IdenWarningEvent> list = this.idenWarningEventService.list(queryWrapper);
+        if(CollUtil.isNotEmpty(list)){
+            list.forEach(item->{
+                WarningEventVO vo = new WarningEventVO();
+                BeanUtil.copyProperties(item,vo);
+                res.add(vo);
+            });
+        }
+        return res;
     }
 }

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

@@ -4,11 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iden.common.entity.IdenWarningRuleEventComming;
+import com.iden.common.entity.IdenWarningRuleEveningComming;
 import com.iden.common.entity.IdenWarningRuleResident;
 import com.iden.common.entity.IdenWarningRuleStranger;
 import com.iden.common.enums.WarningTypeEnum;
-import com.iden.common.service.IdenWarningRuleEventCommingService;
+import com.iden.common.service.IdenWarningRuleEveningCommingService;
 import com.iden.common.service.IdenWarningRuleResidentService;
 import com.iden.common.service.IdenWarningRuleStrangerService;
 import com.iden.common.vo.*;
@@ -33,7 +33,7 @@ public class WarningRuleService {
     @Resource
     private IdenWarningRuleResidentService idenWarningRuleResidentService;
     @Resource
-    private IdenWarningRuleEventCommingService idenWarningRuleEventCommingService;
+    private IdenWarningRuleEveningCommingService idenWarningRuleEveningCommingService;
 
 
     /**
@@ -63,18 +63,18 @@ public class WarningRuleService {
         }
 
 
-        QueryWrapper<IdenWarningRuleEventComming> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.lambda().orderByAsc(IdenWarningRuleEventComming::getCreateTime);
-       List<IdenWarningRuleEventComming> idenWarningRuleEventCommings = this.idenWarningRuleEventCommingService.list(queryWrapper2);
-        if (CollUtil.isNotEmpty(idenWarningRuleEventCommings)){
-            List<WarningRuleEventCommingVO> vos = new ArrayList<>();
-            idenWarningRuleEventCommings.forEach(item-> {
-                WarningRuleEventCommingVO warningRuleEventCommingVO = new WarningRuleEventCommingVO();
-                BeanUtil.copyProperties(item,warningRuleEventCommingVO);
-                vos.add(warningRuleEventCommingVO);
+        QueryWrapper<IdenWarningRuleEveningComming> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.lambda().orderByAsc(IdenWarningRuleEveningComming::getCreateTime);
+       List<IdenWarningRuleEveningComming> idenWarningRuleEveningCommings = this.idenWarningRuleEveningCommingService.list(queryWrapper2);
+        if (CollUtil.isNotEmpty(idenWarningRuleEveningCommings)){
+            List<WarningRuleEveningCommingVO> vos = new ArrayList<>();
+            idenWarningRuleEveningCommings.forEach(item-> {
+                WarningRuleEveningCommingVO warningRuleEveningCommingVO = new WarningRuleEveningCommingVO();
+                BeanUtil.copyProperties(item, warningRuleEveningCommingVO);
+                vos.add(warningRuleEveningCommingVO);
 
             });
-            resVO.setWarningRuleEventCommingVO(vos);
+            resVO.setWarningRuleEveningCommingVO(vos);
         }
 
         return resVO;
@@ -113,20 +113,20 @@ public class WarningRuleService {
             return resVO;
         }
 
-        if(WarningTypeEnum.EVENT_COMMING.getValue().equals(type)) {
+        if(WarningTypeEnum.EVENING_COMMING.getValue().equals(type)) {
             WarningRuleVO resVO = new WarningRuleVO();
-            QueryWrapper<IdenWarningRuleEventComming> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.lambda().orderByAsc(IdenWarningRuleEventComming::getCreateTime);
-            List<IdenWarningRuleEventComming> idenWarningRuleEventCommings = this.idenWarningRuleEventCommingService.list(queryWrapper2);
-            if (CollUtil.isNotEmpty(idenWarningRuleEventCommings)) {
-                List<WarningRuleEventCommingVO> vos = new ArrayList<>();
-                idenWarningRuleEventCommings.forEach(item -> {
-                    WarningRuleEventCommingVO warningRuleEventCommingVO = new WarningRuleEventCommingVO();
-                    BeanUtil.copyProperties(item, warningRuleEventCommingVO);
-                    vos.add(warningRuleEventCommingVO);
+            QueryWrapper<IdenWarningRuleEveningComming> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.lambda().orderByAsc(IdenWarningRuleEveningComming::getCreateTime);
+            List<IdenWarningRuleEveningComming> idenWarningRuleEveningCommings = this.idenWarningRuleEveningCommingService.list(queryWrapper2);
+            if (CollUtil.isNotEmpty(idenWarningRuleEveningCommings)) {
+                List<WarningRuleEveningCommingVO> vos = new ArrayList<>();
+                idenWarningRuleEveningCommings.forEach(item -> {
+                    WarningRuleEveningCommingVO warningRuleEveningCommingVO = new WarningRuleEveningCommingVO();
+                    BeanUtil.copyProperties(item, warningRuleEveningCommingVO);
+                    vos.add(warningRuleEveningCommingVO);
 
                 });
-                resVO.setWarningRuleEventCommingVO(vos);
+                resVO.setWarningRuleEveningCommingVO(vos);
             }
             return resVO;
         }
@@ -152,18 +152,18 @@ public class WarningRuleService {
         BeanUtil.copyProperties(warningRuleResidentVO,idenWarningRuleResident);
         this.idenWarningRuleResidentService.updateById(idenWarningRuleResident);
 
-        List<WarningRuleEventCommingVO>  warningRuleEventCommingVOS = vo.getWarningRuleEventCommingVO();
-        if(CollUtil.isNotEmpty(warningRuleEventCommingVOS)){
-            List<IdenWarningRuleEventComming> idenWarningRuleEventCommings = new ArrayList<>();
-            warningRuleEventCommingVOS.forEach(item->{
-                IdenWarningRuleEventComming idenWarningRuleEventComming = new IdenWarningRuleEventComming();
-                BeanUtil.copyProperties(item,idenWarningRuleEventComming);
-                idenWarningRuleEventCommings.add(idenWarningRuleEventComming);
+        List<WarningRuleEveningCommingVO> warningRuleEveningCommingVOS = vo.getWarningRuleEveningCommingVO();
+        if(CollUtil.isNotEmpty(warningRuleEveningCommingVOS)){
+            List<IdenWarningRuleEveningComming> idenWarningRuleEveningCommings = new ArrayList<>();
+            warningRuleEveningCommingVOS.forEach(item->{
+                IdenWarningRuleEveningComming idenWarningRuleEveningComming = new IdenWarningRuleEveningComming();
+                BeanUtil.copyProperties(item,idenWarningRuleEveningComming);
+                idenWarningRuleEveningCommings.add(idenWarningRuleEveningComming);
             });
-            QueryWrapper<IdenWarningRuleEventComming> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<IdenWarningRuleEveningComming> queryWrapper = new QueryWrapper<>();
             //删除原来的,添加新的
-            if(this.idenWarningRuleEventCommingService.remove(queryWrapper)){
-                this.idenWarningRuleEventCommingService.saveBatch(idenWarningRuleEventCommings);
+            if(this.idenWarningRuleEveningCommingService.remove(queryWrapper)){
+                this.idenWarningRuleEveningCommingService.saveBatch(idenWarningRuleEveningCommings);
             }
         }
     }

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

@@ -51,7 +51,7 @@ public class WarningService {
     @Resource
     private IdenWarningRuleResidentService idenWarningRuleResidentService;
     @Resource
-    private IdenWarningRuleEventCommingService idenWarningRuleEventCommingService;
+    private IdenWarningRuleEveningCommingService idenWarningRuleEveningCommingService;
 
     @Resource
     private IdenPersonService idenPersonService;
@@ -112,8 +112,8 @@ public class WarningService {
 
             if (StringUtils.isNotEmpty(type) && type.contains(PersonTypeEnum.STRANGER.getValue())) { //陌生人员
                 handleStranger(idenFaceImage);//陌生人员识别预警
-            }  else if (StringUtils.isNotEmpty(type) && type.contains(PersonTypeEnum.EVENT_COMMING.getValue())) { //昼伏夜出人员
-                handleEventComming(idenFaceImage);//昼伏夜出人员识别预警
+            }  else if (StringUtils.isNotEmpty(type) && type.contains(PersonTypeEnum.EVENING_COMMING.getValue())) { //昼伏夜出人员
+                handleEveningComming(idenFaceImage);//昼伏夜出人员识别预警
             }
         }
 
@@ -402,34 +402,34 @@ public class WarningService {
     }
 
     //昼伏夜出人员识别预警
-    private void handleEventComming(IdenFaceImage idenFaceImage) {
+    private void handleEveningComming(IdenFaceImage idenFaceImage) {
         Long communityId = idenFaceImage.getCommunityId();
         if (communityId == null) {
             return;
         }
 
         //设置默认
-        List<IdenWarningRuleEventComming> idenWarningRuleEventCommings = new ArrayList<>();
-        IdenWarningRuleEventComming idenWarningRuleEventComming = new IdenWarningRuleEventComming();
-        idenWarningRuleEventComming.setStartTime("23:00:00");
-        idenWarningRuleEventComming.setEndTime("04:00:00");
-        idenWarningRuleEventComming.setStatus(AppearStatusEnum.APPEAR.getValue());
-        idenWarningRuleEventComming.setContinueDays(7);
-        idenWarningRuleEventCommings.add(idenWarningRuleEventComming);
-
-        idenWarningRuleEventComming.setStartTime("08:00:00");
-        idenWarningRuleEventComming.setEndTime("23:00:00");
-        idenWarningRuleEventComming.setStatus(AppearStatusEnum.DISAPPEAR.getValue());
-        idenWarningRuleEventComming.setContinueDays(7);
-        idenWarningRuleEventCommings.add(idenWarningRuleEventComming);
-
-        QueryWrapper<IdenWarningRuleEventComming> queryWrapper3 = new QueryWrapper<>();
-        List<IdenWarningRuleEventComming> idenWarningRuleEventCommingsDb = idenWarningRuleEventCommingService.list(queryWrapper3);
-        if (CollUtil.isNotEmpty(idenWarningRuleEventCommingsDb)) {
-            idenWarningRuleEventCommings = idenWarningRuleEventCommingsDb;
+        List<IdenWarningRuleEveningComming> idenWarningRuleEveningCommings = new ArrayList<>();
+        IdenWarningRuleEveningComming idenWarningRuleEveningComming = new IdenWarningRuleEveningComming();
+        idenWarningRuleEveningComming.setStartTime("23:00:00");
+        idenWarningRuleEveningComming.setEndTime("04:00:00");
+        idenWarningRuleEveningComming.setStatus(AppearStatusEnum.APPEAR.getValue());
+        idenWarningRuleEveningComming.setContinueDays(7);
+        idenWarningRuleEveningCommings.add(idenWarningRuleEveningComming);
+
+        idenWarningRuleEveningComming.setStartTime("08:00:00");
+        idenWarningRuleEveningComming.setEndTime("23:00:00");
+        idenWarningRuleEveningComming.setStatus(AppearStatusEnum.DISAPPEAR.getValue());
+        idenWarningRuleEveningComming.setContinueDays(7);
+        idenWarningRuleEveningCommings.add(idenWarningRuleEveningComming);
+
+        QueryWrapper<IdenWarningRuleEveningComming> queryWrapper3 = new QueryWrapper<>();
+        List<IdenWarningRuleEveningComming> idenWarningRuleEveningCommingsDb = idenWarningRuleEveningCommingService.list(queryWrapper3);
+        if (CollUtil.isNotEmpty(idenWarningRuleEveningCommingsDb)) {
+            idenWarningRuleEveningCommings = idenWarningRuleEveningCommingsDb;
         }
 
-        int continueDays = idenWarningRuleEventCommings.get(0).getContinueDays();
+        int continueDays = idenWarningRuleEveningCommings.get(0).getContinueDays();
         String beforeDate = DateUtils.formatToDateStr(DateUtils.getBeforeDates(continueDays + 1),"yyyyMMdd");
         String yestoday = DateUtils.getYestodayYyyyMMddDate();
         //查询此人长期晚上某时段出现（时间期间可设）且白天未出现，视为昼伏夜出人员，进行预警
@@ -440,15 +440,15 @@ public class WarningService {
                 .ge(IdenFaceImage::getDataDate,beforeDate)
                 .le(IdenFaceImage::getDataDate,yestoday);
 
-        for(IdenWarningRuleEventComming idenWarningRuleEventComming1 : idenWarningRuleEventCommings) {
-            String startTime = idenWarningRuleEventComming1.getStartTime();
-            String endTime = idenWarningRuleEventComming1.getEndTime();
+        for(IdenWarningRuleEveningComming idenWarningRuleEveningComming1 : idenWarningRuleEveningCommings) {
+            String startTime = idenWarningRuleEveningComming1.getStartTime();
+            String endTime = idenWarningRuleEveningComming1.getEndTime();
             Map<String, Date> map = DateUtils.convertDate(startTime,endTime);
             Date startDate = map.get("startDate");
             Date endDate = map.get("endDate");
-            if (AppearStatusEnum.APPEAR.getValue().equals(idenWarningRuleEventComming1.getStatus())) {
+            if (AppearStatusEnum.APPEAR.getValue().equals(idenWarningRuleEveningComming1.getStatus())) {
                 queryWrapper.apply(" photograph_time > " + startDate + " and  photograph_time < " + endDate + "");
-            } else if (AppearStatusEnum.DISAPPEAR.getValue().equals(idenWarningRuleEventComming1.getStatus())) {
+            } else if (AppearStatusEnum.DISAPPEAR.getValue().equals(idenWarningRuleEveningComming1.getStatus())) {
                 queryWrapper.apply(" not exists (select 1 from iden_face_image a where a.data_date = iden_face_image.data_date" +
                         " and a.photograph_time > " + startDate + " and a.photograph_time <  " + endDate +  ") ");
             }
@@ -462,7 +462,7 @@ public class WarningService {
             queryWrapper0.lambda()
                     .eq(IdenWarningPerson::getCommunityId,communityId)
                     .eq(IdenWarningPerson::getUid,idenFaceImage.getUid())
-                    .eq(IdenWarningPerson::getType,WarningTypeEnum.EVENT_COMMING.getValue());
+                    .eq(IdenWarningPerson::getType,WarningTypeEnum.EVENING_COMMING.getValue());
             IdenWarningPerson idenWarningPerson = this.idenWarningPersonService.getOne(queryWrapper0);
             if (idenWarningPerson != null) {
                 idenWarningPerson.setAppearFrequency(count);
@@ -500,7 +500,7 @@ public class WarningService {
                     idenWarningPerson.setEarliestAppearTime(idenFaceImage1.getPhotographTime());
                 }
 
-                idenWarningPerson.setType(WarningTypeEnum.EVENT_COMMING.getValue());
+                idenWarningPerson.setType(WarningTypeEnum.EVENING_COMMING.getValue());
                 idenWarningPerson.setCreateTime(idenFaceImage.getCreateTime());
                 this.idenWarningPersonService.save(idenWarningPerson);
 
@@ -515,7 +515,7 @@ public class WarningService {
             idenWarningEvent.setDistrict(idenWarningPerson.getDistrict());
             idenWarningEvent.setSubdistrict(idenWarningPerson.getSubdistrict());
             idenWarningEvent.setAppearTime(idenFaceImage.getPhotographTime());
-            idenWarningEvent.setType(WarningTypeEnum.EVENT_COMMING.getValue());
+            idenWarningEvent.setType(WarningTypeEnum.EVENING_COMMING.getValue());
             idenWarningEvent.setCreateTime(idenFaceImage.getCreateTime());
             this.idenWarningEventService.save(idenWarningEvent);
         }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
+import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 
@@ -18,26 +19,23 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 昼伏夜出人口识别预警规则表(WarningRuleEventCommingVO)实体类
+ * 昼伏夜出人口识别预警规则表(IdenWarningRuleEveningComming)实体类
  *
  * @author makejava
- * @since 2021-12-30 22:29:49
+ * @since 2022-01-03 14:39:27
  */
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("iden_warning_rule_event_comming")
+@TableName("iden_warning_rule_evening_comming")
 @ApiModel(value = "昼伏夜出人口识别预警规则表", description = "")
-public class IdenWarningRuleEventComming implements Serializable {
-    private static final long serialVersionUID = -60553155302887995L;
+public class IdenWarningRuleEveningComming implements Serializable {
+    private static final long serialVersionUID = 804280044148557517L;
 
     @TableId(value = "ID", type = IdType.AUTO)
     private Long id;
 
-    @ApiModelProperty("持续多少天")
-    @TableField("CONTINUE_DAYS")
-    private int continueDays;
 
     @ApiModelProperty("开始时间(HH:mm:00),精确到分钟")
     @TableField("START_TIME")
@@ -54,6 +52,11 @@ public class IdenWarningRuleEventComming implements Serializable {
     private String status;
 
 
+    @ApiModelProperty("持续多少天")
+    @TableField("CONTINUE_DAYS")
+    private Integer continueDays;
+
+
     @ApiModelProperty("备注")
     @TableField("REMARK")
     private String remark;

src/main/java/com/iden/common/enums/PersonTypeEnum.java

@@ -14,7 +14,7 @@ public enum PersonTypeEnum {
     STRANGER("1","陌生人员"),
     KEYNOTE("2","重点人员"),
     COMMUNITY("3","小区人员"),
-    EVENT_COMMING("4","昼伏夜出人员");
+    EVENING_COMMING("4","昼伏夜出人员");
     private String value;
     private String name;
     PersonTypeEnum(String value, String name) {
@@ -40,8 +40,8 @@ public enum PersonTypeEnum {
                     names += KEYNOTE.name + ",";
                 } else if (COMMUNITY.getValue().equals(type)){
                     names += COMMUNITY.name + ",";
-                } else if (EVENT_COMMING.getValue().equals(type)){
-                    names += EVENT_COMMING.name + ",";
+                } else if (EVENING_COMMING.getValue().equals(type)){
+                    names += EVENING_COMMING.name + ",";
                 }
             }
         }

src/main/java/com/iden/common/enums/WarningTypeEnum.java

@@ -14,7 +14,7 @@ public enum WarningTypeEnum {
     STRANGER("1","陌生人员预警"),
     KEYNOTE("2","重点人员预警"),
     RESIDENT("3","常住人员预警"),
-    EVENT_COMMING("4","昼伏夜出人员预警");
+    EVENING_COMMING("4","昼伏夜出人员预警");
     private String value;
     private String name;
     WarningTypeEnum(String value, String name) {
@@ -40,8 +40,8 @@ public enum WarningTypeEnum {
                     names += KEYNOTE.name + ",";
                 } else if (RESIDENT.getValue().equals(type)){
                     names += RESIDENT.name + ",";
-                } else if (EVENT_COMMING.getValue().equals(type)){
-                    names += EVENT_COMMING.name + ",";
+                } else if (EVENING_COMMING.getValue().equals(type)){
+                    names += EVENING_COMMING.name + ",";
                 }
             }
         }

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

@@ -0,0 +1,15 @@
+package com.iden.common.mapper;
+
+import com.iden.common.entity.IdenWarningRuleEveningComming;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 昼伏夜出人口识别预警规则表(IdenWarningRuleEveningComming)表数据库访问层
+ *
+ * @author makejava
+ * @since 2022-01-03 14:39:27
+ */
+public interface IdenWarningRuleEveningCommingMapper extends BaseMapper<IdenWarningRuleEveningComming> {
+
+}

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

@@ -1,15 +0,0 @@
-package com.iden.common.mapper;
-
-import com.iden.common.entity.IdenWarningRuleEventComming;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-
-/**
- * 昼伏夜出人口识别预警规则表(WarningRuleEventCommingVO)表数据库访问层
- *
- * @author makejava
- * @since 2021-12-30 22:29:49
- */
-public interface IdenWarningRuleEventCommingMapper extends BaseMapper<IdenWarningRuleEventComming> {
-
-}

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

@@ -0,0 +1,14 @@
+package com.iden.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.iden.common.entity.IdenWarningRuleEveningComming;
+
+/**
+ * 昼伏夜出人口识别预警规则表(IdenWarningRuleEveningComming)表服务接口
+ *
+ * @author makejava
+ * @since 2022-01-03 14:39:27
+ */
+public interface IdenWarningRuleEveningCommingService extends IService<IdenWarningRuleEveningComming> {
+
+}

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

@@ -1,14 +0,0 @@
-package com.iden.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.iden.common.entity.IdenWarningRuleEventComming;
-
-/**
- * 昼伏夜出人口识别预警规则表(WarningRuleEventCommingVO)表服务接口
- *
- * @author makejava
- * @since 2021-12-30 22:29:49
- */
-public interface IdenWarningRuleEventCommingService extends IService<IdenWarningRuleEventComming> {
-
-}

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

@@ -0,0 +1,18 @@
+package com.iden.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.iden.common.mapper.IdenWarningRuleEveningCommingMapper;
+import com.iden.common.entity.IdenWarningRuleEveningComming;
+import com.iden.common.service.IdenWarningRuleEveningCommingService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 昼伏夜出人口识别预警规则表(IdenWarningRuleEveningComming)表服务实现类
+ *
+ * @author makejava
+ * @since 2022-01-03 14:39:27
+ */
+@Service
+public class IdenWarningRuleEveningCommingServiceImpl extends ServiceImpl<IdenWarningRuleEveningCommingMapper, IdenWarningRuleEveningComming> implements IdenWarningRuleEveningCommingService {
+
+}

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

@@ -1,18 +0,0 @@
-package com.iden.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.iden.common.mapper.IdenWarningRuleEventCommingMapper;
-import com.iden.common.entity.IdenWarningRuleEventComming;
-import com.iden.common.service.IdenWarningRuleEventCommingService;
-import org.springframework.stereotype.Service;
-
-/**
- * 昼伏夜出人口识别预警规则表(WarningRuleEventCommingVO)表服务实现类
- *
- * @author makejava
- * @since 2021-12-30 22:29:49
- */
-@Service
-public class IdenWarningRuleEventCommingServiceImpl extends ServiceImpl<IdenWarningRuleEventCommingMapper, IdenWarningRuleEventComming> implements IdenWarningRuleEventCommingService {
-
-}

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

@@ -0,0 +1,86 @@
+package com.iden.common.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 预警事件表(IdenWarningEvent)实体类
+ *
+ * @author makejava
+ * @since 2021-12-27 12:50:32
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "预警事件表", description = "")
+public class WarningEventVO implements Serializable {
+    private static final long serialVersionUID = -81590341884306474L;
+
+    private Long id;
+
+    @ApiModelProperty("唯一生物学标识")
+    private String uid;
+
+    @ApiModelProperty("预警人员表ID")
+    private Long warningPersonId;
+
+    @ApiModelProperty("数据时间")
+    private Date dataTime;
+
+
+    @ApiModelProperty("图像")
+    private String image;
+
+
+    @ApiModelProperty("出现小区id")
+    private Long communityId;
+
+
+    @ApiModelProperty("出现小区编号")
+    private String communityCode;
+
+
+    @ApiModelProperty("出现小区名称")
+    private String communityName;
+
+
+    @ApiModelProperty("出现区域")
+    private String district;
+
+
+    @ApiModelProperty("出现街道")
+    private String subdistrict;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("出现时间")
+    private Date appearTime;
+
+
+    @ApiModelProperty("预警类型，1 陌生人员预警 2重点人员预警 3常住人员预警 4昼伏夜出人员预警")
+    private String type;
+
+
+    @ApiModelProperty("人员ID")
+    private Long personId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("createTime")
+    private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("modifyTime")
+    private Date modifyTime;
+
+
+}

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

@@ -12,7 +12,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 昼伏夜出人口识别预警规则表(WarningRuleEventCommingVO)实体类
+ * 昼伏夜出人口识别预警规则表(WarningRuleEveningCommingVO)实体类
  *
  * @author makejava
  * @since 2021-12-30 22:29:49
@@ -22,7 +22,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @ApiModel(value = "昼伏夜出人口识别预警规则表", description = "")
-public class WarningRuleEventCommingVO implements Serializable {
+public class WarningRuleEveningCommingVO implements Serializable {
     private static final long serialVersionUID = -60553155302887995L;
 
     private Long id;

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

@@ -28,7 +28,7 @@ public class WarningRuleVO implements Serializable {
 
 
     @ApiModelProperty("昼伏夜出人口识别预警规则")
-    private List<WarningRuleEventCommingVO> warningRuleEventCommingVO;
+    private List<WarningRuleEveningCommingVO> warningRuleEveningCommingVO;
 
 
 }

src/main/resources/mybatis/IdenWarningRuleEventCommingMapper.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.IdenWarningRuleEventCommingMapper">
+<mapper namespace="com.iden.common.mapper.IdenWarningRuleEveningCommingMapper">
 
 
 </mapper>