添加预警类

refined-manager/src/main/java/com/mortals/xhx/common/code/ReadEnum.java

-package com.mortals.xhx.common.code;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
-* 是否已读 (0.否,1.是)枚举类
-*
-* @author zxfei
-*/
-public enum ReadEnum {
-;
-    private Date value;
-    private String desc;
-
-    ReadEnum(Date value, String desc) {
-        this.value = value;
-        this.desc = desc;
-    }
-
-    public Date getValue() {
-        return this.value;
-    }
-
-    public String getDesc() {
-        return this.desc;
-    }
-
-    public static ReadEnum getByValue(Date value) {
-        for (ReadEnum readEnum : ReadEnum.values()) {
-            if (readEnum.getValue() == value) {
-                return readEnum;
-            }
-        }
-        return null;
-    }
-
-    /**
-    * 获取Map集合
-    *
-    * @param eItem 不包含项
-    * @return
-    */
-    public static Map<String, String> getEnumMap(Date... eItem) {
-        Map<String, String> resultMap = new LinkedHashMap<>();
-        for (ReadEnum item : ReadEnum.values()) {
-            try {
-                boolean hasE = false;
-                for (Date e : eItem) {
-                    if (item.getValue() == e) {
-                        hasE = true;
-                        break;
-                    }
-                }
-                if (!hasE) {
-                    resultMap.put(item.getValue() + "", item.getDesc());
-                }
-            } catch (Exception ex) {
-
-            }
-        }
-        return resultMap;
-    }
-}
\ No newline at end of file

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

@@ -10,6 +10,9 @@ import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.module.hik.event.model.req.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;
+import com.mortals.xhx.module.hik.face.model.rsp.group.FaceGroupDataInfo;
+import com.mortals.xhx.module.hik.face.service.IHikFaceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -27,11 +30,13 @@ public class SubEventStartedService implements IApplicationStartedService {
 
     @Autowired
     private IHikEventService hikEventService;
+    @Autowired
+    private IHikFaceService hikFaceService;
 
     @Override
     public void start() {
-        log.info("开始服务..[事件订阅服务]");
         ThreadPool.getInstance().init(20);
+        log.info("开始服务..[事件订阅服务]");
         String eventtypes = GlobalSysInfo.getParamValue(Constant.PARAM_EVENTTYPES, "1644175361");
         List<Integer> eventTypes = StrUtil.split(eventtypes, ",".charAt(0), -1, false, Integer::parseInt);
 
@@ -40,10 +45,15 @@ public class SubEventStartedService implements IApplicationStartedService {
         eventSubReq.setEventDest(callback);
         Rest<String> rest = hikEventService.subEvent(eventSubReq);
         log.info("sub events resp==>{}", JSON.toJSONString(rest));
-
         Rest<List<EventInfo>> events = hikEventService.getEvents();
         log.info("get events resp==>{}", JSON.toJSONString(events));
 
+        log.info("创建人脸分组...");
+        FaceGroupReq faceGroupReq = new FaceGroupReq();
+//        faceGroupReq.setName();
+//        faceGroupReq.setDescription();
+        Rest<FaceGroupDataInfo> faceGroupDataInfoRest = hikFaceService.faceGroupSingleAdd(faceGroupReq);
+
     }
 
     @Override

refined-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserToHikTaskImpl.java

@@ -11,10 +11,15 @@ import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.code.GenderEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.feign.user.IUserFeign;
+import com.mortals.xhx.module.hik.face.model.req.face.FaceInfo;
+import com.mortals.xhx.module.hik.face.model.req.face.FacePic;
+import com.mortals.xhx.module.hik.face.model.req.face.FaceReq;
+import com.mortals.xhx.module.hik.face.model.rsp.face.FaceDataInfo;
 import com.mortals.xhx.module.hik.face.service.IHikFaceService;
 import com.mortals.xhx.module.person.model.PersonEntity;
 import com.mortals.xhx.module.person.model.PersonQuery;
@@ -26,6 +31,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,6 +60,31 @@ public class SyncUserToHikTaskImpl implements ITaskExcuteService {
                     byte[] bytes = FileUtil.readBytes(filePath);
                     if (bytes.length > 0) {
                         String picBase64Data = Base64.encode(bytes);
+                        FaceReq faceReq = new FaceReq();
+                        FaceInfo faceInfo = new FaceInfo();
+                        faceInfo.setName(personEntity.getName());
+                        faceInfo.setSex(personEntity.getGender() == GenderEnum.男.getValue() ? "1" : "2");
+                        faceInfo.setCertificateType("111");
+                        faceInfo.setCertificateNum(personEntity.getIdCard());
+                        faceReq.setFaceInfo(faceInfo);
+                        FacePic facePic = new FacePic();
+                        facePic.setFaceBinaryData(picBase64Data);
+                        faceReq.setFacePic(facePic);
+
+
+                        Rest<FaceDataInfo> faceDataInfoRest = hikFaceService.faceSingleAdd(faceReq);
+
+                        if(faceDataInfoRest.getCode()==YesNoEnum.YES.getValue()){
+                            personEntity.setIndexCode(faceDataInfoRest.getData().getIndexCode());
+                            personEntity.setIfaceGroupIndexCode(faceDataInfoRest.getData().getFaceGroupIndexCode());
+                            personEntity.setUpdateTime(new Date());
+                            personEntity.setUpdateUser("admin");
+                            personEntity.setUpdateUserId(1L);
+                            personService.update(personEntity);
+
+                        }
+
+
 
                         //log.info("picBase64Data=>{}", picBase64Data);
 

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

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###设备业务列表
 POST {{baseUrl}}/device/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {

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

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###监测预警记录列表
 POST {{baseUrl}}/monitor/alarm/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {