添加识别计划类

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/Params.java

-package com.mortals.xhx.busiz.req.event;
-
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class Params{
-	private String ability;
-	private List<EventsItem> events;
-	private String sendTime;
-}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/busiz/web/HikCallbackController.java

 package com.mortals.xhx.busiz.web;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
-import com.mortals.xhx.busiz.req.event.EventRecognBlackInfo;
-import com.mortals.xhx.common.code.ApiRespCodeEnum;
+import com.mortals.xhx.module.hik.event.model.req.callback.EventRecognBlackReq;
+import com.mortals.xhx.module.hik.event.service.IHikEventService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,18 +16,26 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RequestMapping("hik")
 public class HikCallbackController {
+
+    @Autowired
+    private IHikEventService hikEventService;
+
     @PostMapping("eventRcv")
     @UnAuth
-    public Rest<String> refreshMessage(@RequestBody EventRecognBlackInfo req) {
+    public Rest<String> refreshMessage(@RequestBody EventRecognBlackReq req) {
         log.info("【接收事件数据】【请求体】-->  " + JSONObject.toJSONString(req));
         try {
+            if ("OnEventNotify".equals(req.getMethod())) {
+                Rest<String> rest = hikEventService.handleEvent(req);
+                return rest;
+            }
+
+            return Rest.ok("接收成功");
             //todo
         } catch (Exception e) {
             log.error("接收数据失败", e);
             return Rest.fail();
         }
-        return Rest.ok();
     }
 
-
 }

refined-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/SubEventStartedService.java

@@ -6,7 +6,6 @@ import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
 import com.mortals.framework.util.ThreadPool;
-import com.mortals.xhx.common.code.RecognitionPlanTypeEnum;
 import com.mortals.xhx.common.code.RecognitionResourceEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
@@ -20,7 +19,7 @@ import com.mortals.xhx.module.face.model.FacePlanEntity;
 import com.mortals.xhx.module.face.model.FacePlanQuery;
 import com.mortals.xhx.module.face.service.FaceGroupService;
 import com.mortals.xhx.module.face.service.FacePlanService;
-import com.mortals.xhx.module.hik.event.model.req.EventSubReq;
+import com.mortals.xhx.module.hik.event.model.req.sub.EventSubReq;
 import com.mortals.xhx.module.hik.event.model.rsp.EventInfo;
 import com.mortals.xhx.module.hik.event.service.IHikEventService;
 import com.mortals.xhx.module.hik.face.model.req.group.FaceGroupReq;

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/EventData.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/EventData.java

-package com.mortals.xhx.busiz.req.event;
+package com.mortals.xhx.module.hik.event.model.req.callback;
 
 import java.util.List;
 import lombok.Data;

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/EventRecognBlackInfo.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/EventRecognBlackReq.java

-package com.mortals.xhx.busiz.req.event;
+package com.mortals.xhx.module.hik.event.model.req.callback;
 
 import lombok.Data;
 
 @Data
-public class EventRecognBlackInfo{
+public class EventRecognBlackReq {
 	private String method;
 	private Params params;
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/EventsItem.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/EventsItem.java

-package com.mortals.xhx.busiz.req.event;
+package com.mortals.xhx.module.hik.event.model.req.callback;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class EventsItem {
     private String eventId;
@@ -11,6 +15,8 @@ public class EventsItem {
     private String ability;
     private String srcType;
     private int timeout;
-    private String happenTime;
+    @JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXXX")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    private Date happenTime;
     private int status;
 }
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/FaceMatchItem.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/FaceMatchItem.java

-package com.mortals.xhx.busiz.req.event;
+package com.mortals.xhx.module.hik.event.model.req.callback;
 
 import lombok.Data;
 
@@ -6,7 +6,7 @@ import lombok.Data;
 public class FaceMatchItem{
 	private String faceGroupName;
 	private String faceInfoSex;
-	private double similarity;
+	private Double similarity;
 	private String facePicUrl;
 	private String certificate;
 	private String faceGroupCode;

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/FaceRecognitionResult.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/FaceRecognitionResult.java

-package com.mortals.xhx.busiz.req.event;
+package com.mortals.xhx.module.hik.event.model.req.callback;
 
 import java.util.List;
 import lombok.Data;

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/Params.java

+package com.mortals.xhx.module.hik.event.model.req.callback;
+
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+@Data
+public class Params{
+	private String ability;
+	private List<EventsItem> events;
+	@JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXXX")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+	private Date sendTime;
+}
\ No newline at end of file

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/ResInfoItem.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/ResInfoItem.java

-package com.mortals.xhx.busiz.req.event;
+package com.mortals.xhx.module.hik.event.model.req.callback;
 
 import lombok.Data;
 

refined-manager/src/main/java/com/mortals/xhx/busiz/req/event/Snap.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/callback/Snap.java

-package com.mortals.xhx.busiz.req.event;
+package com.mortals.xhx.module.hik.event.model.req.callback;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class Snap{
 	private String faceUrl;
-	private String faceTime;
+	private Date faceTime;
 	private String glass;
 	private String gender;
 	private String ageGroup;

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/EventSubReq.java → refined-manager/src/main/java/com/mortals/xhx/module/hik/event/model/req/sub/EventSubReq.java

-package com.mortals.xhx.module.hik.event.model.req;
+package com.mortals.xhx.module.hik.event.model.req.sub;
 
 import java.util.List;
 import lombok.Data;

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/IHikEventService.java

@@ -2,10 +2,9 @@ package com.mortals.xhx.module.hik.event.service;
 
 
 import com.mortals.framework.common.Rest;
-import com.mortals.xhx.module.hik.event.model.req.EventSubReq;
+import com.mortals.xhx.module.hik.event.model.req.callback.EventRecognBlackReq;
+import com.mortals.xhx.module.hik.event.model.req.sub.EventSubReq;
 import com.mortals.xhx.module.hik.event.model.rsp.EventInfo;
-import com.mortals.xhx.module.hik.person.model.req.person.PersonReq;
-import com.mortals.xhx.module.hik.person.model.rsp.person.PersonDataInfo;
 
 import java.util.List;
 
@@ -39,4 +38,13 @@ public interface IHikEventService {
      */
     Rest<String> cancelEvent(EventSubReq eventSubReq);
 
+
+    /**
+     * 处理回调事件
+     *
+     * @param eventRecognBlackReq
+     * @return
+     */
+    Rest<String> handleEvent(EventRecognBlackReq eventRecognBlackReq);
+
 }

refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/HikEventServiceImpl.java

@@ -7,10 +7,10 @@ import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.module.hik.AbstractHikService;
 import com.mortals.xhx.module.hik.HikApiRest;
-import com.mortals.xhx.module.hik.event.model.req.EventSubReq;
+import com.mortals.xhx.module.hik.event.model.req.callback.EventRecognBlackReq;
+import com.mortals.xhx.module.hik.event.model.req.sub.EventSubReq;
 import com.mortals.xhx.module.hik.event.model.rsp.EventInfo;
 import com.mortals.xhx.module.hik.event.service.IHikEventService;
-import com.mortals.xhx.module.hik.face.model.rsp.plan.PlanRecognBlackInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -90,4 +90,11 @@ public class HikEventServiceImpl extends AbstractHikService implements IHikEvent
             return Rest.fail(e.getMessage());
         }
     }
+
+    @Override
+    public Rest<String> handleEvent(EventRecognBlackReq eventRecognBlackReq) {
+        //处理识别业务 todo
+
+        return Rest.ok("处理成功！");
+    }
 }

refined-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeEntity.java

@@ -8,11 +8,11 @@ import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.notice.model.vo.NoticeVo;
 /**
-* 用户消息实体对象
-*
-* @author zxfei
-* @date 2023-04-15
-*/
+ * 用户消息实体对象
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
 
 public class NoticeEntity extends NoticeVo {
     private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public class NoticeEntity extends NoticeVo {
      * 是否已读 (0.否,1.是)
      */
     @Excel(name = "是否已读 ", readConverterExp = "0=否,1.是")
-    private Date read;
+    private Integer read;
     /**
      * 消息的优先级，越高表示越紧急，不为空
      */
@@ -98,16 +98,16 @@ public class NoticeEntity extends NoticeVo {
     }
     /**
      * 获取 是否已读 (0.否,1.是)
-    * @return Date
+     * @return Integer
      */
-    public Date getRead(){
+    public Integer getRead(){
         return read;
     }
     /**
      * 设置 是否已读 (0.否,1.是)
      * @param read
      */
-    public void setRead(Date read){
+    public void setRead(Integer read){
         this.read = read;
     }
     /**
@@ -192,7 +192,7 @@ public class NoticeEntity extends NoticeVo {
 
         this.content = "";
 
-            this.read = null;
+        this.read = 0;
 
         this.priority = 0;
 

refined-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeQuery.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.List;
 import com.mortals.xhx.module.notice.model.NoticeEntity;
 /**
-* 用户消息查询对象
-*
-* @author zxfei
-* @date 2023-04-15
-*/
+ * 用户消息查询对象
+ *
+ * @author zxfei
+ * @date 2023-04-16
+ */
 public class NoticeQuery extends NoticeEntity {
     /** 开始 主键ID */
     private Long idStart;
@@ -51,10 +51,19 @@ public class NoticeQuery extends NoticeEntity {
     /** 消息的内容排除列表 */
     private List <String> contentNotList;
     /** 开始 是否已读 (0.否,1.是) */
-    private String readStart;
+    private Integer readStart;
 
     /** 结束 是否已读 (0.否,1.是) */
-    private String readEnd;
+    private Integer readEnd;
+
+    /** 增加 是否已读 (0.否,1.是) */
+    private Integer readIncrement;
+
+    /** 是否已读 (0.否,1.是)列表 */
+    private List <Integer> readList;
+
+    /** 是否已读 (0.否,1.是)排除列表 */
+    private List <Integer> readNotList;
 
     /** 开始 消息的优先级，越高表示越紧急，不为空 */
     private Integer priorityStart;
@@ -362,7 +371,7 @@ public class NoticeQuery extends NoticeEntity {
      * 获取 开始 是否已读 (0.否,1.是)
      * @return readStart
      */
-    public String getReadStart(){
+    public Integer getReadStart(){
         return this.readStart;
     }
 
@@ -370,15 +379,15 @@ public class NoticeQuery extends NoticeEntity {
      * 设置 开始 是否已读 (0.否,1.是)
      * @param readStart
      */
-    public void setReadStart(String readStart){
+    public void setReadStart(Integer readStart){
         this.readStart = readStart;
     }
 
     /**
      * 获取 结束 是否已读 (0.否,1.是)
-    * @return readEnd
+     * @return $readEnd
      */
-    public String getReadEnd(){
+    public Integer getReadEnd(){
         return this.readEnd;
     }
 
@@ -386,10 +395,59 @@ public class NoticeQuery extends NoticeEntity {
      * 设置 结束 是否已读 (0.否,1.是)
      * @param readEnd
      */
-    public void setReadEnd(String readEnd){
+    public void setReadEnd(Integer readEnd){
         this.readEnd = readEnd;
     }
 
+    /**
+     * 获取 增加 是否已读 (0.否,1.是)
+     * @return readIncrement
+     */
+    public Integer getReadIncrement(){
+        return this.readIncrement;
+    }
+
+    /**
+     * 设置 增加 是否已读 (0.否,1.是)
+     * @param readIncrement
+     */
+    public void setReadIncrement(Integer readIncrement){
+        this.readIncrement = readIncrement;
+    }
+
+    /**
+     * 获取 是否已读 (0.否,1.是)
+     * @return readList
+     */
+    public List<Integer> getReadList(){
+        return this.readList;
+    }
+
+    /**
+     * 设置 是否已读 (0.否,1.是)
+     * @param readList
+     */
+    public void setReadList(List<Integer> readList){
+        this.readList = readList;
+    }
+
+    /**
+     * 获取 是否已读 (0.否,1.是)
+     * @return readNotList
+     */
+    public List<Integer> getReadNotList(){
+        return this.readNotList;
+    }
+
+    /**
+     * 设置 是否已读 (0.否,1.是)
+     * @param readNotList
+     */
+    public void setReadNotList(List<Integer> readNotList){
+        this.readNotList = readNotList;
+    }
+
+
     /**
      * 获取 开始 消息的优先级，越高表示越紧急，不为空
      * @return priorityStart
@@ -907,6 +965,59 @@ public class NoticeQuery extends NoticeEntity {
         return this;
     }
 
+    /**
+     * 设置  是否已读 (0.否,1.是)
+     * @param read
+     */
+    public NoticeQuery read(Integer read){
+        setRead(read);
+        return this;
+    }
+
+    /**
+     * 设置 开始 是否已读 (0.否,1.是)
+     * @param readStart
+     */
+    public NoticeQuery readStart(Integer readStart){
+        this.readStart = readStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 是否已读 (0.否,1.是)
+     * @param readEnd
+     */
+    public NoticeQuery readEnd(Integer readEnd){
+        this.readEnd = readEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 是否已读 (0.否,1.是)
+     * @param readIncrement
+     */
+    public NoticeQuery readIncrement(Integer readIncrement){
+        this.readIncrement = readIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 是否已读 (0.否,1.是)
+     * @param readList
+     */
+    public NoticeQuery readList(List<Integer> readList){
+        this.readList = readList;
+        return this;
+    }
+
+    /**
+     * 设置 是否已读 (0.否,1.是)
+     * @param readNotList
+     */
+    public NoticeQuery readNotList(List<Integer> readNotList){
+        this.readNotList = readNotList;
+        return this;
+    }
 
     /**
      * 设置  消息的优先级，越高表示越紧急，不为空

refined-manager/src/test/java/com/mortals/httpclient/EventCallbackController.http

+
+
+
+
+###重点识别计划回调
+POST {{baseUrl}}/hik/eventRcv
+Content-Type: application/json
+
+{
+  "method": "OnEventNotify",
+  "params": {
+    "sendTime": "2023-04-15T19:31:54.951+08:00",
+    "ability": "event_face_recognition",
+    "events": [{
+      "eventType": 1644175361,
+      "eventId": "ba49eeef-8c17-4c1a-8eab-53a0c9eb06fe",
+      "srcIndex": "eb82bf1b-a3dc-4e3d-8bfd-ff52e42245c9",
+      "ability": "event_frs",
+      "data": {
+        "faceRecognitionResult": {
+          "snap": {
+            "ageGroup": "young",
+            "gender": "male",
+            "glass": "yes",
+            "bkgUrl": "http://10.67.184.149:80/picture/Streaming/tracks/203/?006853427200019404 & size = 19404",
+            "faceUrl": "http://10.66.165.124:6120/pic?7dd489324-7doc81l*3dec1=--87zd61fa3e614idb1*=2d0i0s1*=idp1*=*d4i1t=pe7m5517641",
+            "faceTime": "2023-04-15 19:32:02"
+          },
+          "faceMatch": [{
+            "faceGroupCode": "eb82bf1b-a3dc-4e3d-8bfd-ff52e42245c9",
+            "faceGroupName": "ghc",
+            "faceInfoCode": "98c83004-c390-4d8b-a97a-34a3218a5ac7",
+            "faceInfoName": "233",
+            "faceInfoSex": "unknown",
+            "certificate": "32423",
+            "certificateType": "111",
+            "similarity": 0.05,
+            "facePicUrl": "http://10.33.47.14:6040/pic?=d2ei666i31f6935-f775aa--cf835d1a6d0ccidp= 89 d1"
+          }]
+        },
+        "srcEventId": "B89C250C-B8C2-4215-9A6C-09CC34DF25A7",
+        "resInfo": [{
+          "resourceType": "camera",
+          "indexCode": "f3b8b0ab19d043929e9985736ea31270",
+          "cn": "184.128_7627_人脸抓拍"
+        }]
+      },
+      "happenTime": "2023-04-15T19:32:02.000+08:00",
+      "srcType": "faceGroup",
+      "status": 0,
+      "timeout": 0
+    }]
+  }
+}
+
+