添加陌生人识别计划

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

@@ -100,9 +100,9 @@ public class CreateBlackPlanToHikByDayTaskImpl implements ITaskExcuteService {
         log.info("{}=>创建预约计划任务完成", DateUtils.getCurrStrDate());
     }
 
-    private void createStrangerPlanByDay(){
+    private void createStrangerPlanByDay() {
         int threshold = GlobalSysInfo.getParamIntValue(ParamKey.PARAM_FACE_THRESHOLD, 80);
-      //创建或者更新
+        //创建或者更新
         PlanRecognListReq planRecognListReq = new PlanRecognListReq();
         Rest<List<PlanRecognInfo>> planRecognWhiteListRest = hikPlanService.findPlanRecognWhiteList(planRecognListReq);
         if (planRecognWhiteListRest.getCode() == YesNoEnum.YES.getValue()) {
@@ -113,31 +113,29 @@ public class CreateBlackPlanToHikByDayTaskImpl implements ITaskExcuteService {
                 }
                 return null;
             }).filter(f -> f != null).findFirst().orElseGet(() -> null);
-
-            if(ObjectUtils.isEmpty(planRecognWhiteInfo)){
-                // todo 创建陌生人计划
-                //初始化新增取号监控识别计划
-                PlanRecognReq planRecognBlackReq = new PlanRecognReq();
-                planRecognBlackReq.setName(Constant.STRANGER_PLAN);
-                planRecognBlackReq.setDescription(Constant.STRANGER_PLAN);
-                planRecognBlackReq.setThreshold(threshold);
-                //设置人脸分组
-                FaceGroupEntity faceGroupEntity = faceGroupService.selectOne(new FaceGroupQuery().name(PARAM_FACE_GROUP_REGISTER));
-                List<String> faceGroupIndexCodes = new ArrayList<>();
-                faceGroupIndexCodes.add(faceGroupEntity.getIndexCode());
-                planRecognBlackReq.setFaceGroupIndexCodes(faceGroupIndexCodes);
-                //设置监控点
-                List<String> cameraIndexCodes = deviceService.find(new DeviceQuery()).stream().map(DeviceEntity::getDeviceCode).collect(Collectors.toList());
-                planRecognBlackReq.setCameraIndexCodes(cameraIndexCodes);
-                //设置识别方式
-                planRecognBlackReq.setRecognitionResourceType(RecognitionResourceEnum.COMPARISON.getValue());
-                //设置时间段 默认全天候
-                Rest<String> planRecognBlackAddRest = hikPlanService.planRecognBlackAdd(planRecognBlackReq);
-
-                if (planRecognBlackAddRest.getCode() == YesNoEnum.YES.getValue()) {
+            // todo 创建陌生人计划
+            //初始化新增取号监控识别计划
+            PlanRecognReq planRecognBlackReq = new PlanRecognReq();
+            planRecognBlackReq.setName(Constant.STRANGER_PLAN);
+            planRecognBlackReq.setDescription(Constant.STRANGER_PLAN);
+            planRecognBlackReq.setThreshold(threshold);
+            //设置人脸分组
+            FaceGroupEntity faceGroupEntity = faceGroupService.selectOne(new FaceGroupQuery().name(PARAM_FACE_GROUP_REGISTER));
+            List<String> faceGroupIndexCodes = new ArrayList<>();
+            faceGroupIndexCodes.add(faceGroupEntity.getIndexCode());
+            planRecognBlackReq.setFaceGroupIndexCodes(faceGroupIndexCodes);
+            //设置监控点
+            List<String> cameraIndexCodes = deviceService.find(new DeviceQuery()).stream().map(DeviceEntity::getDeviceCode).collect(Collectors.toList());
+            planRecognBlackReq.setCameraIndexCodes(cameraIndexCodes);
+            //设置识别方式
+            planRecognBlackReq.setRecognitionResourceType(RecognitionResourceEnum.COMPARISON.getValue());
+            //设置时间段 默认全天候
+            if (ObjectUtils.isEmpty(planRecognWhiteInfo)) {
+                Rest<String> planRecognWhiteAddRest = hikPlanService.planRecognWhiteAdd(planRecognBlackReq);
+                if (planRecognWhiteAddRest.getCode() == YesNoEnum.YES.getValue()) {
                     FacePlanEntity planEntity = new FacePlanEntity();
                     planEntity.initAttrValue();
-                    planEntity.setIndexCode(planRecognBlackAddRest.getData());
+                    planEntity.setIndexCode(planRecognWhiteAddRest.getData());
                     planEntity.setName(Constant.STRANGER_PLAN);
                     planEntity.setDescription(Constant.STRANGER_PLAN);
                     planEntity.setCreateTime(new Date());
@@ -145,8 +143,20 @@ public class CreateBlackPlanToHikByDayTaskImpl implements ITaskExcuteService {
                     planEntity.setCreateUserName("admin");
                     facePlanService.save(planEntity);
                 }
-            }else {
-               //更新计划
+            } else {
+                //更新计划
+                planRecognBlackReq.setIndexCode(planRecognWhiteInfo.getIndexCode());
+                Rest<Boolean> planRecognWhiteUpdateRest = hikPlanService.planRecognWhiteUpdate(planRecognBlackReq);
+                if (planRecognWhiteUpdateRest.getCode() == YesNoEnum.YES.getValue()&&planRecognWhiteUpdateRest.getData()) {
+
+                    FacePlanEntity whitePlan = facePlanService.selectOne(new FacePlanQuery().indexCode(planRecognWhiteInfo.getIndexCode()));
+                    whitePlan.setUpdateTime(new Date());
+                    whitePlan.setUpdateUserId(1L);
+                    whitePlan.setUpdateUserName("system");
+                    facePlanService.update(whitePlan);
+
+                }
+
             }
 
 

refined-manager/src/main/java/com/mortals/xhx/module/hik/face/model/req/plan/PlanRecognReq.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 @Data
 public class PlanRecognReq {
+	private String indexCode;
 	private List<String> cameraIndexCodes;
 	private List<String> faceGroupIndexCodes;
 	private String name;

refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/IHikPlanService.java

@@ -58,6 +58,14 @@ public interface IHikPlanService {
      */
     Rest<String> planRecognWhiteAdd(PlanRecognReq planRecognReq);
 
+    /**
+     * 更新陌生人监视计划
+     *
+     * @param planRecognReq
+     * @return
+     */
+    Rest<Boolean> planRecognWhiteUpdate(PlanRecognReq planRecognReq);
+
     /**
      * 陌生人人员监视计划删除
      *

refined-manager/src/main/java/com/mortals/xhx/module/hik/face/service/impl/HikPlanServiceImpl.java

@@ -160,6 +160,29 @@ public class HikPlanServiceImpl extends AbstractHikService implements IHikPlanSe
         }
     }
 
+    @Override
+    public Rest<Boolean> planRecognWhiteUpdate(PlanRecognReq planRecognWhiteReq) {
+        ArtemisConfig config = getArtemisConfig();
+        String getCamsApi = ARTEMIS_PATH + "/api/frs/v1/plan/recognition/white/update";
+        path.put(protocol, getCamsApi);
+        try {
+            log.info("plan recognize white req=>{}", JSON.toJSONString(planRecognWhiteReq));
+            String respJson = ArtemisHttpUtil.doPostStringArtemis(config, path, JSON.toJSONString(planRecognWhiteReq), null, null, "application/json");
+            log.info("plan recognize white  resp=>{}", respJson);
+            HikApiRest<Boolean> rest = JSON.parseObject(respJson, new TypeReference<HikApiRest<Boolean>>() {
+            });
+            if (rest.getCode() == "0") {
+                return Rest.ok(rest.getData());
+            } else {
+                log.info("plan recognize white add error resp=>{}", respJson);
+                return Rest.fail(rest.getMsg());
+            }
+        } catch (Exception e) {
+            log.error("plan recognize white add error异常", e);
+            return Rest.fail(e.getMessage());
+        }
+    }
+
     @Override
     public Rest<Boolean> planRecognWhiteDel(PlanRecognReq planRecognWhiteReq) {
         ArtemisConfig config = getArtemisConfig();