添加gateId

xmh
Commit 8ebff0ab authored Jan 26, 2022 by xmh
Showing 11 changed files with 445 additions and 242 deletions
label-platform/pom.xml
label-platform/src/main/java/com/viontech/label/platform/controller/base/SubTaskBaseController.java
label-platform/src/main/java/com/viontech/label/platform/controller/web/ReidController.java
label-platform/src/main/java/com/viontech/label/platform/mapping/SubTaskMapper.xml
label-platform/src/main/java/com/viontech/label/platform/model/SubTask.java
label-platform/src/main/java/com/viontech/label/platform/model/SubTaskExample.java
label-platform/src/main/java/com/viontech/label/platform/service/main/ReidService.java
label-platform/src/main/java/com/viontech/label/platform/vo/ReidUploadData.java
label-platform/src/main/java/com/viontech/label/platform/vobase/SubTaskVoBase.java
label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/controller/KeliuController.java
label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/repository/KeliuRepository.java
--- a/label-platform/pom.xml
+++ b/label-platform/pom.xml
@@ -118,7 +118,7 @@
        <dependency>
            <groupId>com.viontech.keliu</groupId>
            <artifactId>AlgApiClient</artifactId>
-            <version>6.0.8</version>
+            <version>6.0.9-SNAPSHOT</version>
            <exclusions>
                <exclusion>
                    <artifactId>tomcat-websocket</artifactId>

--- a/label-platform/src/main/java/com/viontech/label/platform/controller/base/SubTaskBaseController.java
+++ b/label-platform/src/main/java/com/viontech/label/platform/controller/base/SubTaskBaseController.java
@@ -2,12 +2,13 @@ package com.viontech.label.platform.controller.base;
 import com.viontech.label.platform.base.BaseController;
 import com.viontech.label.platform.base.BaseExample;
+import com.viontech.label.platform.base.BaseMapper;
 import com.viontech.label.platform.base.BaseService;
+import com.viontech.label.platform.mapper.SubTaskMapper;
 import com.viontech.label.platform.model.SubTask;
 import com.viontech.label.platform.model.SubTaskExample;
 import com.viontech.label.platform.service.adapter.SubTaskService;
 import com.viontech.label.platform.vo.SubTaskVo;
 import javax.annotation.Resource;
 public abstract class SubTaskBaseController extends BaseController<SubTask, SubTaskVo> {
@@ -18,340 +19,365 @@ public abstract class SubTaskBaseController extends BaseController<SubTask, SubT
    protected BaseExample getExample(SubTaskVo subTaskVo, int type) {
        SubTaskExample subTaskExample = new SubTaskExample();
        SubTaskExample.Criteria criteria = subTaskExample.createCriteria();
-        if (subTaskVo.getId() != null) {
+        if(subTaskVo.getId() != null) {
            criteria.andIdEqualTo(subTaskVo.getId());
        }
-        if (subTaskVo.getId_arr() != null) {
+        if(subTaskVo.getId_arr() != null) {
            criteria.andIdIn(subTaskVo.getId_arr());
        }
-        if (subTaskVo.getId_gt() != null) {
+        if(subTaskVo.getId_gt() != null) {
            criteria.andIdGreaterThan(subTaskVo.getId_gt());
        }
-        if (subTaskVo.getId_lt() != null) {
+        if(subTaskVo.getId_lt() != null) {
            criteria.andIdLessThan(subTaskVo.getId_lt());
        }
-        if (subTaskVo.getId_gte() != null) {
+        if(subTaskVo.getId_gte() != null) {
            criteria.andIdGreaterThanOrEqualTo(subTaskVo.getId_gte());
        }
-        if (subTaskVo.getId_lte() != null) {
+        if(subTaskVo.getId_lte() != null) {
            criteria.andIdLessThanOrEqualTo(subTaskVo.getId_lte());
        }
-        if (subTaskVo.getUnid() != null) {
+        if(subTaskVo.getUnid() != null) {
            criteria.andUnidEqualTo(subTaskVo.getUnid());
        }
-        if (subTaskVo.getUnid_arr() != null) {
+        if(subTaskVo.getUnid_arr() != null) {
            criteria.andUnidIn(subTaskVo.getUnid_arr());
        }
-        if (subTaskVo.getUnid_like() != null) {
+        if(subTaskVo.getUnid_like() != null) {
            criteria.andUnidLike(subTaskVo.getUnid_like());
        }
-        if (subTaskVo.getCreateTime() != null) {
+        if(subTaskVo.getCreateTime() != null) {
            criteria.andCreateTimeEqualTo(subTaskVo.getCreateTime());
        }
-        if (subTaskVo.getCreateTime_arr() != null) {
+        if(subTaskVo.getCreateTime_arr() != null) {
            criteria.andCreateTimeIn(subTaskVo.getCreateTime_arr());
        }
-        if (subTaskVo.getCreateTime_gt() != null) {
+        if(subTaskVo.getCreateTime_gt() != null) {
            criteria.andCreateTimeGreaterThan(subTaskVo.getCreateTime_gt());
        }
-        if (subTaskVo.getCreateTime_lt() != null) {
+        if(subTaskVo.getCreateTime_lt() != null) {
            criteria.andCreateTimeLessThan(subTaskVo.getCreateTime_lt());
        }
-        if (subTaskVo.getCreateTime_gte() != null) {
+        if(subTaskVo.getCreateTime_gte() != null) {
            criteria.andCreateTimeGreaterThanOrEqualTo(subTaskVo.getCreateTime_gte());
        }
-        if (subTaskVo.getCreateTime_lte() != null) {
+        if(subTaskVo.getCreateTime_lte() != null) {
            criteria.andCreateTimeLessThanOrEqualTo(subTaskVo.getCreateTime_lte());
        }
-        if (subTaskVo.getCreateUser() != null) {
+        if(subTaskVo.getCreateUser() != null) {
            criteria.andCreateUserEqualTo(subTaskVo.getCreateUser());
        }
-        if (subTaskVo.getCreateUser_null() != null) {
+        if(subTaskVo.getCreateUser_null() != null) {
-            if (subTaskVo.getCreateUser_null().booleanValue()) {
+            if(subTaskVo.getCreateUser_null().booleanValue()) {
                criteria.andCreateUserIsNull();
            } else {
                criteria.andCreateUserIsNotNull();
            }
        }
-        if (subTaskVo.getCreateUser_arr() != null) {
+        if(subTaskVo.getCreateUser_arr() != null) {
            criteria.andCreateUserIn(subTaskVo.getCreateUser_arr());
        }
-        if (subTaskVo.getCreateUser_gt() != null) {
+        if(subTaskVo.getCreateUser_gt() != null) {
            criteria.andCreateUserGreaterThan(subTaskVo.getCreateUser_gt());
        }
-        if (subTaskVo.getCreateUser_lt() != null) {
+        if(subTaskVo.getCreateUser_lt() != null) {
            criteria.andCreateUserLessThan(subTaskVo.getCreateUser_lt());
        }
-        if (subTaskVo.getCreateUser_gte() != null) {
+        if(subTaskVo.getCreateUser_gte() != null) {
            criteria.andCreateUserGreaterThanOrEqualTo(subTaskVo.getCreateUser_gte());
        }
-        if (subTaskVo.getCreateUser_lte() != null) {
+        if(subTaskVo.getCreateUser_lte() != null) {
            criteria.andCreateUserLessThanOrEqualTo(subTaskVo.getCreateUser_lte());
        }
-        if (subTaskVo.getPicId() != null) {
+        if(subTaskVo.getPicId() != null) {
            criteria.andPicIdEqualTo(subTaskVo.getPicId());
        }
-        if (subTaskVo.getPicId_arr() != null) {
+        if(subTaskVo.getPicId_arr() != null) {
            criteria.andPicIdIn(subTaskVo.getPicId_arr());
        }
-        if (subTaskVo.getPicId_gt() != null) {
+        if(subTaskVo.getPicId_gt() != null) {
            criteria.andPicIdGreaterThan(subTaskVo.getPicId_gt());
        }
-        if (subTaskVo.getPicId_lt() != null) {
+        if(subTaskVo.getPicId_lt() != null) {
            criteria.andPicIdLessThan(subTaskVo.getPicId_lt());
        }
-        if (subTaskVo.getPicId_gte() != null) {
+        if(subTaskVo.getPicId_gte() != null) {
            criteria.andPicIdGreaterThanOrEqualTo(subTaskVo.getPicId_gte());
        }
-        if (subTaskVo.getPicId_lte() != null) {
+        if(subTaskVo.getPicId_lte() != null) {
            criteria.andPicIdLessThanOrEqualTo(subTaskVo.getPicId_lte());
        }
-        if (subTaskVo.getPackId() != null) {
+        if(subTaskVo.getPackId() != null) {
            criteria.andPackIdEqualTo(subTaskVo.getPackId());
        }
-        if (subTaskVo.getPackId_arr() != null) {
+        if(subTaskVo.getPackId_arr() != null) {
            criteria.andPackIdIn(subTaskVo.getPackId_arr());
        }
-        if (subTaskVo.getPackId_gt() != null) {
+        if(subTaskVo.getPackId_gt() != null) {
            criteria.andPackIdGreaterThan(subTaskVo.getPackId_gt());
        }
-        if (subTaskVo.getPackId_lt() != null) {
+        if(subTaskVo.getPackId_lt() != null) {
            criteria.andPackIdLessThan(subTaskVo.getPackId_lt());
        }
-        if (subTaskVo.getPackId_gte() != null) {
+        if(subTaskVo.getPackId_gte() != null) {
            criteria.andPackIdGreaterThanOrEqualTo(subTaskVo.getPackId_gte());
        }
-        if (subTaskVo.getPackId_lte() != null) {
+        if(subTaskVo.getPackId_lte() != null) {
            criteria.andPackIdLessThanOrEqualTo(subTaskVo.getPackId_lte());
        }
-        if (subTaskVo.getTaskId() != null) {
+        if(subTaskVo.getTaskId() != null) {
            criteria.andTaskIdEqualTo(subTaskVo.getTaskId());
        }
-        if (subTaskVo.getTaskId_arr() != null) {
+        if(subTaskVo.getTaskId_arr() != null) {
            criteria.andTaskIdIn(subTaskVo.getTaskId_arr());
        }
-        if (subTaskVo.getTaskId_gt() != null) {
+        if(subTaskVo.getTaskId_gt() != null) {
            criteria.andTaskIdGreaterThan(subTaskVo.getTaskId_gt());
        }
-        if (subTaskVo.getTaskId_lt() != null) {
+        if(subTaskVo.getTaskId_lt() != null) {
            criteria.andTaskIdLessThan(subTaskVo.getTaskId_lt());
        }
-        if (subTaskVo.getTaskId_gte() != null) {
+        if(subTaskVo.getTaskId_gte() != null) {
            criteria.andTaskIdGreaterThanOrEqualTo(subTaskVo.getTaskId_gte());
        }
-        if (subTaskVo.getTaskId_lte() != null) {
+        if(subTaskVo.getTaskId_lte() != null) {
            criteria.andTaskIdLessThanOrEqualTo(subTaskVo.getTaskId_lte());
        }
-        if (subTaskVo.getInInspectorId() != null) {
+        if(subTaskVo.getInInspectorId() != null) {
            criteria.andInInspectorIdEqualTo(subTaskVo.getInInspectorId());
        }
-        if (subTaskVo.getInInspectorId_null() != null) {
+        if(subTaskVo.getInInspectorId_null() != null) {
-            if (subTaskVo.getInInspectorId_null().booleanValue()) {
+            if(subTaskVo.getInInspectorId_null().booleanValue()) {
                criteria.andInInspectorIdIsNull();
            } else {
                criteria.andInInspectorIdIsNotNull();
            }
        }
-        if (subTaskVo.getInInspectorId_arr() != null) {
+        if(subTaskVo.getInInspectorId_arr() != null) {
            criteria.andInInspectorIdIn(subTaskVo.getInInspectorId_arr());
        }
-        if (subTaskVo.getInInspectorId_gt() != null) {
+        if(subTaskVo.getInInspectorId_gt() != null) {
            criteria.andInInspectorIdGreaterThan(subTaskVo.getInInspectorId_gt());
        }
-        if (subTaskVo.getInInspectorId_lt() != null) {
+        if(subTaskVo.getInInspectorId_lt() != null) {
            criteria.andInInspectorIdLessThan(subTaskVo.getInInspectorId_lt());
        }
-        if (subTaskVo.getInInspectorId_gte() != null) {
+        if(subTaskVo.getInInspectorId_gte() != null) {
            criteria.andInInspectorIdGreaterThanOrEqualTo(subTaskVo.getInInspectorId_gte());
        }
-        if (subTaskVo.getInInspectorId_lte() != null) {
+        if(subTaskVo.getInInspectorId_lte() != null) {
            criteria.andInInspectorIdLessThanOrEqualTo(subTaskVo.getInInspectorId_lte());
        }
-        if (subTaskVo.getOutInspectorId() != null) {
+        if(subTaskVo.getOutInspectorId() != null) {
            criteria.andOutInspectorIdEqualTo(subTaskVo.getOutInspectorId());
        }
-        if (subTaskVo.getOutInspectorId_null() != null) {
+        if(subTaskVo.getOutInspectorId_null() != null) {
-            if (subTaskVo.getOutInspectorId_null().booleanValue()) {
+            if(subTaskVo.getOutInspectorId_null().booleanValue()) {
                criteria.andOutInspectorIdIsNull();
            } else {
                criteria.andOutInspectorIdIsNotNull();
            }
        }
-        if (subTaskVo.getOutInspectorId_arr() != null) {
+        if(subTaskVo.getOutInspectorId_arr() != null) {
            criteria.andOutInspectorIdIn(subTaskVo.getOutInspectorId_arr());
        }
-        if (subTaskVo.getOutInspectorId_gt() != null) {
+        if(subTaskVo.getOutInspectorId_gt() != null) {
            criteria.andOutInspectorIdGreaterThan(subTaskVo.getOutInspectorId_gt());
        }
-        if (subTaskVo.getOutInspectorId_lt() != null) {
+        if(subTaskVo.getOutInspectorId_lt() != null) {
            criteria.andOutInspectorIdLessThan(subTaskVo.getOutInspectorId_lt());
        }
-        if (subTaskVo.getOutInspectorId_gte() != null) {
+        if(subTaskVo.getOutInspectorId_gte() != null) {
            criteria.andOutInspectorIdGreaterThanOrEqualTo(subTaskVo.getOutInspectorId_gte());
        }
-        if (subTaskVo.getOutInspectorId_lte() != null) {
+        if(subTaskVo.getOutInspectorId_lte() != null) {
            criteria.andOutInspectorIdLessThanOrEqualTo(subTaskVo.getOutInspectorId_lte());
        }
-        if (subTaskVo.getAnnotatorId() != null) {
+        if(subTaskVo.getAnnotatorId() != null) {
            criteria.andAnnotatorIdEqualTo(subTaskVo.getAnnotatorId());
        }
-        if (subTaskVo.getAnnotatorId_null() != null) {
+        if(subTaskVo.getAnnotatorId_null() != null) {
-            if (subTaskVo.getAnnotatorId_null().booleanValue()) {
+            if(subTaskVo.getAnnotatorId_null().booleanValue()) {
                criteria.andAnnotatorIdIsNull();
            } else {
                criteria.andAnnotatorIdIsNotNull();
            }
        }
-        if (subTaskVo.getAnnotatorId_arr() != null) {
+        if(subTaskVo.getAnnotatorId_arr() != null) {
            criteria.andAnnotatorIdIn(subTaskVo.getAnnotatorId_arr());
        }
-        if (subTaskVo.getAnnotatorId_gt() != null) {
+        if(subTaskVo.getAnnotatorId_gt() != null) {
            criteria.andAnnotatorIdGreaterThan(subTaskVo.getAnnotatorId_gt());
        }
-        if (subTaskVo.getAnnotatorId_lt() != null) {
+        if(subTaskVo.getAnnotatorId_lt() != null) {
            criteria.andAnnotatorIdLessThan(subTaskVo.getAnnotatorId_lt());
        }
-        if (subTaskVo.getAnnotatorId_gte() != null) {
+        if(subTaskVo.getAnnotatorId_gte() != null) {
            criteria.andAnnotatorIdGreaterThanOrEqualTo(subTaskVo.getAnnotatorId_gte());
        }
-        if (subTaskVo.getAnnotatorId_lte() != null) {
+        if(subTaskVo.getAnnotatorId_lte() != null) {
            criteria.andAnnotatorIdLessThanOrEqualTo(subTaskVo.getAnnotatorId_lte());
        }
-        if (subTaskVo.getAnnotateTime() != null) {
+        if(subTaskVo.getAnnotateTime() != null) {
            criteria.andAnnotateTimeEqualTo(subTaskVo.getAnnotateTime());
        }
-        if (subTaskVo.getAnnotateTime_null() != null) {
+        if(subTaskVo.getAnnotateTime_null() != null) {
-            if (subTaskVo.getAnnotateTime_null().booleanValue()) {
+            if(subTaskVo.getAnnotateTime_null().booleanValue()) {
                criteria.andAnnotateTimeIsNull();
            } else {
                criteria.andAnnotateTimeIsNotNull();
            }
        }
-        if (subTaskVo.getAnnotateTime_arr() != null) {
+        if(subTaskVo.getAnnotateTime_arr() != null) {
            criteria.andAnnotateTimeIn(subTaskVo.getAnnotateTime_arr());
        }
-        if (subTaskVo.getAnnotateTime_gt() != null) {
+        if(subTaskVo.getAnnotateTime_gt() != null) {
            criteria.andAnnotateTimeGreaterThan(subTaskVo.getAnnotateTime_gt());
        }
-        if (subTaskVo.getAnnotateTime_lt() != null) {
+        if(subTaskVo.getAnnotateTime_lt() != null) {
            criteria.andAnnotateTimeLessThan(subTaskVo.getAnnotateTime_lt());
        }
-        if (subTaskVo.getAnnotateTime_gte() != null) {
+        if(subTaskVo.getAnnotateTime_gte() != null) {
            criteria.andAnnotateTimeGreaterThanOrEqualTo(subTaskVo.getAnnotateTime_gte());
        }
-        if (subTaskVo.getAnnotateTime_lte() != null) {
+        if(subTaskVo.getAnnotateTime_lte() != null) {
            criteria.andAnnotateTimeLessThanOrEqualTo(subTaskVo.getAnnotateTime_lte());
        }
-        if (subTaskVo.getLabelResult() != null) {
+        if(subTaskVo.getLabelResult() != null) {
            criteria.andLabelResultEqualTo(subTaskVo.getLabelResult());
        }
-        if (subTaskVo.getLabelResult_null() != null) {
+        if(subTaskVo.getLabelResult_null() != null) {
-            if (subTaskVo.getLabelResult_null().booleanValue()) {
+            if(subTaskVo.getLabelResult_null().booleanValue()) {
                criteria.andLabelResultIsNull();
            } else {
                criteria.andLabelResultIsNotNull();
            }
        }
-        if (subTaskVo.getLabelResult_arr() != null) {
+        if(subTaskVo.getLabelResult_arr() != null) {
            criteria.andLabelResultIn(subTaskVo.getLabelResult_arr());
        }
-        if (subTaskVo.getLabelResult_like() != null) {
+        if(subTaskVo.getLabelResult_like() != null) {
            criteria.andLabelResultLike(subTaskVo.getLabelResult_like());
        }
-        if (subTaskVo.getInStatus() != null) {
+        if(subTaskVo.getInStatus() != null) {
            criteria.andInStatusEqualTo(subTaskVo.getInStatus());
        }
-        if (subTaskVo.getInStatus_arr() != null) {
+        if(subTaskVo.getInStatus_arr() != null) {
            criteria.andInStatusIn(subTaskVo.getInStatus_arr());
        }
-        if (subTaskVo.getInStatus_gt() != null) {
+        if(subTaskVo.getInStatus_gt() != null) {
            criteria.andInStatusGreaterThan(subTaskVo.getInStatus_gt());
        }
-        if (subTaskVo.getInStatus_lt() != null) {
+        if(subTaskVo.getInStatus_lt() != null) {
            criteria.andInStatusLessThan(subTaskVo.getInStatus_lt());
        }
-        if (subTaskVo.getInStatus_gte() != null) {
+        if(subTaskVo.getInStatus_gte() != null) {
            criteria.andInStatusGreaterThanOrEqualTo(subTaskVo.getInStatus_gte());
        }
-        if (subTaskVo.getInStatus_lte() != null) {
+        if(subTaskVo.getInStatus_lte() != null) {
            criteria.andInStatusLessThanOrEqualTo(subTaskVo.getInStatus_lte());
        }
-        if (subTaskVo.getOutStatus() != null) {
+        if(subTaskVo.getOutStatus() != null) {
            criteria.andOutStatusEqualTo(subTaskVo.getOutStatus());
        }
-        if (subTaskVo.getOutStatus_arr() != null) {
+        if(subTaskVo.getOutStatus_arr() != null) {
            criteria.andOutStatusIn(subTaskVo.getOutStatus_arr());
        }
-        if (subTaskVo.getOutStatus_gt() != null) {
+        if(subTaskVo.getOutStatus_gt() != null) {
            criteria.andOutStatusGreaterThan(subTaskVo.getOutStatus_gt());
        }
-        if (subTaskVo.getOutStatus_lt() != null) {
+        if(subTaskVo.getOutStatus_lt() != null) {
            criteria.andOutStatusLessThan(subTaskVo.getOutStatus_lt());
        }
-        if (subTaskVo.getOutStatus_gte() != null) {
+        if(subTaskVo.getOutStatus_gte() != null) {
            criteria.andOutStatusGreaterThanOrEqualTo(subTaskVo.getOutStatus_gte());
        }
-        if (subTaskVo.getOutStatus_lte() != null) {
+        if(subTaskVo.getOutStatus_lte() != null) {
            criteria.andOutStatusLessThanOrEqualTo(subTaskVo.getOutStatus_lte());
        }
-        if (subTaskVo.getStatus() != null) {
+        if(subTaskVo.getStatus() != null) {
            criteria.andStatusEqualTo(subTaskVo.getStatus());
        }
-        if (subTaskVo.getStatus_arr() != null) {
+        if(subTaskVo.getStatus_arr() != null) {
            criteria.andStatusIn(subTaskVo.getStatus_arr());
        }
-        if (subTaskVo.getStatus_gt() != null) {
+        if(subTaskVo.getStatus_gt() != null) {
            criteria.andStatusGreaterThan(subTaskVo.getStatus_gt());
        }
-        if (subTaskVo.getStatus_lt() != null) {
+        if(subTaskVo.getStatus_lt() != null) {
            criteria.andStatusLessThan(subTaskVo.getStatus_lt());
        }
-        if (subTaskVo.getStatus_gte() != null) {
+        if(subTaskVo.getStatus_gte() != null) {
            criteria.andStatusGreaterThanOrEqualTo(subTaskVo.getStatus_gte());
        }
-        if (subTaskVo.getStatus_lte() != null) {
+        if(subTaskVo.getStatus_lte() != null) {
            criteria.andStatusLessThanOrEqualTo(subTaskVo.getStatus_lte());
        }
-        if (subTaskVo.getDirection() != null) {
+        if(subTaskVo.getPersonUnid() != null) {
+            criteria.andPersonUnidEqualTo(subTaskVo.getPersonUnid());
+        }
+        if(subTaskVo.getPersonUnid_null() != null) {
+            if(subTaskVo.getPersonUnid_null().booleanValue()) {
+                criteria.andPersonUnidIsNull();
+            } else {
+                criteria.andPersonUnidIsNotNull();
+            }
+        }
+        if(subTaskVo.getPersonUnid_arr() != null) {
+            criteria.andPersonUnidIn(subTaskVo.getPersonUnid_arr());
+        }
+        if(subTaskVo.getPersonUnid_like() != null) {
+            criteria.andPersonUnidLike(subTaskVo.getPersonUnid_like());
+        }
+        if(subTaskVo.getDirection() != null) {
            criteria.andDirectionEqualTo(subTaskVo.getDirection());
        }
-        if (subTaskVo.getDirection_null() != null) {
+        if(subTaskVo.getDirection_null() != null) {
-            if (subTaskVo.getDirection_null().booleanValue()) {
+            if(subTaskVo.getDirection_null().booleanValue()) {
                criteria.andDirectionIsNull();
            } else {
                criteria.andDirectionIsNotNull();
            }
        }
-        if (subTaskVo.getDirection_arr() != null) {
+        if(subTaskVo.getDirection_arr() != null) {
            criteria.andDirectionIn(subTaskVo.getDirection_arr());
        }
-        if (subTaskVo.getDirection_gt() != null) {
+        if(subTaskVo.getDirection_gt() != null) {
            criteria.andDirectionGreaterThan(subTaskVo.getDirection_gt());
        }
-        if (subTaskVo.getDirection_lt() != null) {
+        if(subTaskVo.getDirection_lt() != null) {
            criteria.andDirectionLessThan(subTaskVo.getDirection_lt());
        }
-        if (subTaskVo.getDirection_gte() != null) {
+        if(subTaskVo.getDirection_gte() != null) {
            criteria.andDirectionGreaterThanOrEqualTo(subTaskVo.getDirection_gte());
        }
-        if (subTaskVo.getDirection_lte() != null) {
+        if(subTaskVo.getDirection_lte() != null) {
            criteria.andDirectionLessThanOrEqualTo(subTaskVo.getDirection_lte());
        }
-        if (subTaskVo.getPersonUnid() != null) {
+        if(subTaskVo.getGateId() != null) {
-            criteria.andPersonUnidEqualTo(subTaskVo.getPersonUnid());
+            criteria.andGateIdEqualTo(subTaskVo.getGateId());
        }
-        if (subTaskVo.getPersonUnid_null() != null) {
+        if(subTaskVo.getGateId_null() != null) {
-            if (subTaskVo.getPersonUnid_null().booleanValue()) {
+            if(subTaskVo.getGateId_null().booleanValue()) {
-                criteria.andPersonUnidIsNull();
+                criteria.andGateIdIsNull();
            } else {
-                criteria.andPersonUnidIsNotNull();
+                criteria.andGateIdIsNotNull();
            }
        }
-        if (subTaskVo.getPersonUnid_arr() != null) {
+        if(subTaskVo.getGateId_arr() != null) {
-            criteria.andPersonUnidIn(subTaskVo.getPersonUnid_arr());
+            criteria.andGateIdIn(subTaskVo.getGateId_arr());
        }
-        if (subTaskVo.getPersonUnid_like() != null) {
+        if(subTaskVo.getGateId_gt() != null) {
-            criteria.andPersonUnidLike(subTaskVo.getPersonUnid_like());
+            criteria.andGateIdGreaterThan(subTaskVo.getGateId_gt());
+        }
+        if(subTaskVo.getGateId_lt() != null) {
+            criteria.andGateIdLessThan(subTaskVo.getGateId_lt());
+        }
+        if(subTaskVo.getGateId_gte() != null) {
+            criteria.andGateIdGreaterThanOrEqualTo(subTaskVo.getGateId_gte());
+        }
+        if(subTaskVo.getGateId_lte() != null) {
+            criteria.andGateIdLessThanOrEqualTo(subTaskVo.getGateId_lte());
        }
        return subTaskExample;
    }

--- a/label-platform/src/main/java/com/viontech/label/platform/controller/web/ReidController.java
+++ b/label-platform/src/main/java/com/viontech/label/platform/controller/web/ReidController.java
@@ -202,12 +202,14 @@ public class ReidController {
     * @param picIdArr 图片Id数组
     * @param packId   图包id
     * @param size     获取相似的人的数量
+     * @param recursion 当前用作是否限定gateId,以后用于连通图的递归次数
     */
    @GetMapping("/getSimilarPerson")
    public Object getSimilarPerson(@RequestParam Long[] picIdArr, @RequestParam Long packId,
                                   @RequestParam Long size, @RequestParam(required = false) Integer timeInterval,
-                                   @RequestParam(required = false) String currentPerson) {
+                                   @RequestParam(required = false) String currentPerson,
-        Map<String, Map<String, List<SubTask>>> similarPerson = reidService.getSimilarPerson(picIdArr, packId, size, timeInterval, currentPerson);
+                                   @RequestParam(required = false,defaultValue = "0") Integer recursion ) {
+        Map<String, Map<String, List<SubTask>>> similarPerson = reidService.getSimilarPerson(picIdArr, packId, size, timeInterval, currentPerson,recursion);
        return JsonMessageUtil.getSuccessJsonMsg("success", similarPerson);
    }

--- a/label-platform/src/main/java/com/viontech/label/platform/mapping/SubTaskMapper.xml
+++ b/label-platform/src/main/java/com/viontech/label/platform/mapping/SubTaskMapper.xml
@@ -17,8 +17,9 @@
    <result column="subTask_in_status" property="inStatus" />
    <result column="subTask_out_status" property="outStatus" />
    <result column="subTask_status" property="status" />
-    <result column="subTask_direction" property="direction" />
    <result column="subTask_person_unid" property="personUnid" />
+    <result column="subTask_direction" property="direction" />
+    <result column="subTask_gate_id" property="gateId" />
  </resultMap>
  <resultMap id="BaseResultMap" type="com.viontech.label.platform.model.SubTask" extends="BaseResultMapRoot" >
    <result column="pic_id" property="pic.id" />
@@ -121,8 +122,8 @@
    "subTask".out_inspector_id as subTask_out_inspector_id, "subTask".annotator_id as subTask_annotator_id, 
    "subTask".annotate_time as subTask_annotate_time, "subTask".label_result as subTask_label_result, 
    "subTask".in_status as subTask_in_status, "subTask".out_status as subTask_out_status, 
-    "subTask"."status" as "subTask_status", "subTask".direction as subTask_direction, 
+    "subTask"."status" as "subTask_status", "subTask".person_unid as subTask_person_unid, 
-    "subTask".person_unid as subTask_person_unid
+    "subTask".direction as subTask_direction, "subTask".gate_id as subTask_gate_id
  </sql>
  <sql id="Base_Column_List" >
    <if test="!(_parameter.getClass().getSimpleName() == 'SubTaskExample')" >
@@ -198,14 +199,14 @@
      pic_id, pack_id, task_id, 
      in_inspector_id, out_inspector_id, annotator_id, 
      annotate_time, label_result, in_status, 
-      out_status, "status", direction, 
+      out_status, "status", person_unid, 
-      person_unid)
+      direction, gate_id)
    values (#{unid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUser,jdbcType=BIGINT}, 
      #{picId,jdbcType=BIGINT}, #{packId,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, 
      #{inInspectorId,jdbcType=BIGINT}, #{outInspectorId,jdbcType=BIGINT}, #{annotatorId,jdbcType=BIGINT}, 
      #{annotateTime,jdbcType=TIMESTAMP}, #{labelResult,jdbcType=VARCHAR}, #{inStatus,jdbcType=INTEGER}, 
-      #{outStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{direction,jdbcType=INTEGER}, 
+      #{outStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{personUnid,jdbcType=VARCHAR}, 
-      #{personUnid,jdbcType=VARCHAR})
+      #{direction,jdbcType=INTEGER}, #{gateId,jdbcType=BIGINT})
  </insert>
  <insert id="insertSelective" parameterType="com.viontech.label.platform.model.SubTask" useGeneratedKeys="true" keyProperty="id" keyColumn="id" >
    insert into "d_sub_task"
@@ -252,11 +253,14 @@
      <if test="status != null" >
        "status",
      </if>
+      <if test="personUnid != null" >
+        person_unid,
+      </if>
      <if test="direction != null" >
        direction,
      </if>
-      <if test="personUnid != null" >
+      <if test="gateId != null" >
-        person_unid,
+        gate_id,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -302,11 +306,14 @@
      <if test="status != null" >
        #{status,jdbcType=INTEGER},
      </if>
+      <if test="personUnid != null" >
+        #{personUnid,jdbcType=VARCHAR},
+      </if>
      <if test="direction != null" >
        #{direction,jdbcType=INTEGER},
      </if>
-      <if test="personUnid != null" >
+      <if test="gateId != null" >
-        #{personUnid,jdbcType=VARCHAR},
+        #{gateId,jdbcType=BIGINT},
      </if>
    </trim>
  </insert>
@@ -365,11 +372,14 @@
      <if test="record.status != null" >
        "status" = #{record.status,jdbcType=INTEGER},
      </if>
+      <if test="record.personUnid != null" >
+        person_unid = #{record.personUnid,jdbcType=VARCHAR},
+      </if>
      <if test="record.direction != null" >
        direction = #{record.direction,jdbcType=INTEGER},
      </if>
-      <if test="record.personUnid != null" >
+      <if test="record.gateId != null" >
-        person_unid = #{record.personUnid,jdbcType=VARCHAR},
+        gate_id = #{record.gateId,jdbcType=BIGINT},
      </if>
    </set>
    <if test="_parameter != null" >
@@ -393,8 +403,9 @@
      in_status = #{record.inStatus,jdbcType=INTEGER},
      out_status = #{record.outStatus,jdbcType=INTEGER},
      "status" = #{record.status,jdbcType=INTEGER},
+      person_unid = #{record.personUnid,jdbcType=VARCHAR},
      direction = #{record.direction,jdbcType=INTEGER},
-      person_unid = #{record.personUnid,jdbcType=VARCHAR}
+      gate_id = #{record.gateId,jdbcType=BIGINT}
    <if test="_parameter != null" >
      <include refid="Update_By_Example_Where_Clause" />
    </if>
@@ -444,11 +455,14 @@
      <if test="status != null" >
        "status" = #{status,jdbcType=INTEGER},
      </if>
+      <if test="personUnid != null" >
+        person_unid = #{personUnid,jdbcType=VARCHAR},
+      </if>
      <if test="direction != null" >
        direction = #{direction,jdbcType=INTEGER},
      </if>
-      <if test="personUnid != null" >
+      <if test="gateId != null" >
-        person_unid = #{personUnid,jdbcType=VARCHAR},
+        gate_id = #{gateId,jdbcType=BIGINT},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
@@ -469,8 +483,9 @@
      in_status = #{inStatus,jdbcType=INTEGER},
      out_status = #{outStatus,jdbcType=INTEGER},
      "status" = #{status,jdbcType=INTEGER},
+      person_unid = #{personUnid,jdbcType=VARCHAR},
      direction = #{direction,jdbcType=INTEGER},
-      person_unid = #{personUnid,jdbcType=VARCHAR}
+      gate_id = #{gateId,jdbcType=BIGINT}
    where id = #{id,jdbcType=BIGINT}
  </update>
 </mapper>
\ No newline at end of file
--- a/label-platform/src/main/java/com/viontech/label/platform/model/SubTask.java
+++ b/label-platform/src/main/java/com/viontech/label/platform/model/SubTask.java
@@ -34,9 +34,11 @@ public class SubTask extends BaseModel {
    private Integer status;
+    private String personUnid;
    private Integer direction;
-    private String personUnid;
+    private Long gateId;
    private Pic pic;
@@ -162,6 +164,14 @@ public class SubTask extends BaseModel {
        this.status = status;
    }
+    public String getPersonUnid() {
+        return personUnid;
+    }
+    public void setPersonUnid(String personUnid) {
+        this.personUnid = personUnid == null ? null : personUnid.trim();
+    }
    public Integer getDirection() {
        return direction;
    }
@@ -170,12 +180,12 @@ public class SubTask extends BaseModel {
        this.direction = direction;
    }
-    public String getPersonUnid() {
+    public Long getGateId() {
-        return personUnid;
+        return gateId;
    }
-    public void setPersonUnid(String personUnid) {
+    public void setGateId(Long gateId) {
-        this.personUnid = personUnid == null ? null : personUnid.trim();
+        this.gateId = gateId;
    }
    public Pic getPic() {

--- a/label-platform/src/main/java/com/viontech/label/platform/model/SubTaskExample.java
+++ b/label-platform/src/main/java/com/viontech/label/platform/model/SubTaskExample.java
@@ -1093,6 +1093,76 @@ public class SubTaskExample extends BaseExample {
            return (Criteria) this;
        }
+        public Criteria andPersonUnidIsNull() {
+            addCriterion("\"subTask\".person_unid is null");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidIsNotNull() {
+            addCriterion("\"subTask\".person_unid is not null");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidEqualTo(String value) {
+            addCriterion("\"subTask\".person_unid =", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidNotEqualTo(String value) {
+            addCriterion("\"subTask\".person_unid <>", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidGreaterThan(String value) {
+            addCriterion("\"subTask\".person_unid >", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidGreaterThanOrEqualTo(String value) {
+            addCriterion("\"subTask\".person_unid >=", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidLessThan(String value) {
+            addCriterion("\"subTask\".person_unid <", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidLessThanOrEqualTo(String value) {
+            addCriterion("\"subTask\".person_unid <=", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidLike(String value) {
+            addCriterion("\"subTask\".person_unid like", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidNotLike(String value) {
+            addCriterion("\"subTask\".person_unid not like", value, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidIn(List<String> values) {
+            addCriterion("\"subTask\".person_unid in", values, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidNotIn(List<String> values) {
+            addCriterion("\"subTask\".person_unid not in", values, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidBetween(String value1, String value2) {
+            addCriterion("\"subTask\".person_unid between", value1, value2, "personUnid");
+            return (Criteria) this;
+        }
+        public Criteria andPersonUnidNotBetween(String value1, String value2) {
+            addCriterion("\"subTask\".person_unid not between", value1, value2, "personUnid");
+            return (Criteria) this;
+        }
        public Criteria andDirectionIsNull() {
            addCriterion("\"subTask\".direction is null");
            return (Criteria) this;
@@ -1153,73 +1223,63 @@ public class SubTaskExample extends BaseExample {
            return (Criteria) this;
        }
-        public Criteria andPersonUnidIsNull() {
+        public Criteria andGateIdIsNull() {
-            addCriterion("\"subTask\".person_unid is null");
+            addCriterion("\"subTask\".gate_id is null");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidIsNotNull() {
+        public Criteria andGateIdIsNotNull() {
-            addCriterion("\"subTask\".person_unid is not null");
+            addCriterion("\"subTask\".gate_id is not null");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidEqualTo(String value) {
+        public Criteria andGateIdEqualTo(Long value) {
-            addCriterion("\"subTask\".person_unid =", value, "personUnid");
+            addCriterion("\"subTask\".gate_id =", value, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidNotEqualTo(String value) {
+        public Criteria andGateIdNotEqualTo(Long value) {
-            addCriterion("\"subTask\".person_unid <>", value, "personUnid");
+            addCriterion("\"subTask\".gate_id <>", value, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidGreaterThan(String value) {
+        public Criteria andGateIdGreaterThan(Long value) {
-            addCriterion("\"subTask\".person_unid >", value, "personUnid");
+            addCriterion("\"subTask\".gate_id >", value, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidGreaterThanOrEqualTo(String value) {
+        public Criteria andGateIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("\"subTask\".person_unid >=", value, "personUnid");
+            addCriterion("\"subTask\".gate_id >=", value, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidLessThan(String value) {
+        public Criteria andGateIdLessThan(Long value) {
-            addCriterion("\"subTask\".person_unid <", value, "personUnid");
+            addCriterion("\"subTask\".gate_id <", value, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidLessThanOrEqualTo(String value) {
+        public Criteria andGateIdLessThanOrEqualTo(Long value) {
-            addCriterion("\"subTask\".person_unid <=", value, "personUnid");
+            addCriterion("\"subTask\".gate_id <=", value, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidLike(String value) {
+        public Criteria andGateIdIn(List<Long> values) {
-            addCriterion("\"subTask\".person_unid like", value, "personUnid");
+            addCriterion("\"subTask\".gate_id in", values, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidNotLike(String value) {
+        public Criteria andGateIdNotIn(List<Long> values) {
-            addCriterion("\"subTask\".person_unid not like", value, "personUnid");
+            addCriterion("\"subTask\".gate_id not in", values, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidIn(List<String> values) {
+        public Criteria andGateIdBetween(Long value1, Long value2) {
-            addCriterion("\"subTask\".person_unid in", values, "personUnid");
+            addCriterion("\"subTask\".gate_id between", value1, value2, "gateId");
            return (Criteria) this;
        }
-        public Criteria andPersonUnidNotIn(List<String> values) {
+        public Criteria andGateIdNotBetween(Long value1, Long value2) {
-            addCriterion("\"subTask\".person_unid not in", values, "personUnid");
+            addCriterion("\"subTask\".gate_id not between", value1, value2, "gateId");
-            return (Criteria) this;
-        }
-        public Criteria andPersonUnidBetween(String value1, String value2) {
-            addCriterion("\"subTask\".person_unid between", value1, value2, "personUnid");
-            return (Criteria) this;
-        }
-        public Criteria andPersonUnidNotBetween(String value1, String value2) {
-            addCriterion("\"subTask\".person_unid not between", value1, value2, "personUnid");
            return (Criteria) this;
        }
    }
@@ -1305,13 +1365,18 @@ public class SubTaskExample extends BaseExample {
            return (ColumnContainer) this;
        }
+        public ColumnContainer hasPersonUnidColumn() {
+            addColumnStr("\"subTask\".person_unid as subTask_person_unid ");
+            return (ColumnContainer) this;
+        }
        public ColumnContainer hasDirectionColumn() {
            addColumnStr("\"subTask\".direction as subTask_direction ");
            return (ColumnContainer) this;
        }
-        public ColumnContainer hasPersonUnidColumn() {
+        public ColumnContainer hasGateIdColumn() {
-            addColumnStr("\"subTask\".person_unid as subTask_person_unid ");
+            addColumnStr("\"subTask\".gate_id as subTask_gate_id ");
            return (ColumnContainer) this;
        }
    }

--- a/label-platform/src/main/java/com/viontech/label/platform/service/main/ReidService.java
+++ b/label-platform/src/main/java/com/viontech/label/platform/service/main/ReidService.java
@@ -107,6 +107,7 @@ public class ReidService {
        subTask.setTaskId(taskId == null ? data.getTaskId() : taskId);
        subTask.setStatus(SubTaskStatus.TO_BE_LABELED.val);
        subTask.setDirection(data.getDirection());
+        subTask.setGateId(data.getGateId());
        subTaskService.insertSelective(subTask);
@@ -133,7 +134,7 @@ public class ReidService {
        }
        Feature feature = objectMapper.readValue(featureFileBytes, Feature.class);
-        Person person = new Person().setPersonId(data.getPersonUnid()).setBodyFeatures(getBodyFeatures(feature, data.getUnid())).setCounttime(data.getCountTime());
+        Person person = new Person().setPersonId(data.getPersonUnid()).setBodyFeatures(getBodyFeatures(feature, data.getUnid(), data.getGateId())).setCounttime(data.getCountTime());
        CompletableFuture<AlgResult> future = matchClient.EASY_PERSON_API.addPerson(poolName, Lists.newArrayList(person));
        AlgResult result1 = future.get(20, TimeUnit.SECONDS);
        log.info(result1.toString());
@@ -506,7 +507,7 @@ public class ReidService {
    /**
     * 根据所选择的图片获取相似的人
     */
-    public Map<String, Map<String, List<SubTask>>> getSimilarPerson(Long[] subTaskIdArr, Long packId, Long size, Integer timeInterval, String currentPerson) {
+    public Map<String, Map<String, List<SubTask>>> getSimilarPerson(Long[] subTaskIdArr, Long packId, Long size, Integer timeInterval, String currentPerson, Integer recursion) {
        List<BodyFeature> bodyFeatures = new ArrayList<>();
        String reidPoolName = Constants.getReidPoolName(packId);
        Date countTimeGTE = null;
@@ -515,6 +516,7 @@ public class ReidService {
        List<SubTask> subTasks = subTaskService.getDataByIds(Arrays.asList(subTaskIdArr));
        Set<Long> picIdSet = subTasks.stream().map(SubTask::getPicId).collect(Collectors.toSet());
        Set<String> personUnidSet = subTasks.stream().map(SubTask::getPersonUnid).collect(Collectors.toSet());
+        List<Long> gateIdList = subTasks.stream().map(SubTask::getGateId).collect(Collectors.toList());
        for (Long picId : picIdSet) {
            PicVo pic = storageUtils.getPic(picId);
@@ -540,6 +542,9 @@ public class ReidService {
        }
        Person person = new Person().setBodyFeatures(bodyFeatures).setCounttimeGTE(countTimeGTE).setCounttimeLTE(countTimeLTE);
+        if (recursion > 0) {
+            person.setGateIdIn(gateIdList);
+        }
        try {
            HashMap<String, Object> options = new HashMap<>(2);
            options.put("size", size + 1);
@@ -762,7 +767,7 @@ public class ReidService {
    }
-    private List<BodyFeature> getBodyFeatures(Feature feature, String unid) {
+    private List<BodyFeature> getBodyFeatures(Feature feature, String unid, Long gateId) {
        List<Data> datas = feature.getDatas();
        if (datas == null || datas.size() == 0) {
            return null;
@@ -772,7 +777,7 @@ public class ReidService {
            return null;
        }
        Double[] featureData = data.getData();
-        BodyFeature bodyFeature = new BodyFeature().setFeature(featureData).setBid(feature.getFilename()).setUnid(unid);
+        BodyFeature bodyFeature = new BodyFeature().setFeature(featureData).setBid(feature.getFilename()).setUnid(unid).setGateId(gateId);
        return Collections.singletonList(bodyFeature);
    }
@@ -928,7 +933,7 @@ public class ReidService {
                if (featureByPic == null) {
                    continue;
                }
-                Person person = new Person().setPersonId(personUnid).setCounttime(item.getCreateTime()).setBodyFeatures(getBodyFeatures(featureByPic, item.getUnid()));
+                Person person = new Person().setPersonId(personUnid).setCounttime(item.getCreateTime()).setBodyFeatures(getBodyFeatures(featureByPic, item.getUnid(), item.getGateId()));
                people.add(person);
            }
            try {

--- a/label-platform/src/main/java/com/viontech/label/platform/vo/ReidUploadData.java
+++ b/label-platform/src/main/java/com/viontech/label/platform/vo/ReidUploadData.java
@@ -24,5 +24,6 @@ public class ReidUploadData {
    private Date countTime;
    private Long taskId;
    private Integer direction;
+    private Long gateId;
 }
--- a/label-platform/src/main/java/com/viontech/label/platform/vobase/SubTaskVoBase.java
+++ b/label-platform/src/main/java/com/viontech/label/platform/vobase/SubTaskVoBase.java
@@ -5,7 +5,6 @@ import com.viontech.label.platform.base.VoInterface;
 import com.viontech.label.platform.model.Pic;
 import com.viontech.label.platform.model.SubTask;
 import com.viontech.label.platform.model.Task;
 import java.util.ArrayList;
 import java.util.Date;
@@ -238,6 +237,15 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    private Integer status_lte;
    @JsonIgnore
+    private Boolean personUnid_null;
+    @JsonIgnore
+    private ArrayList<String> personUnid_arr;
+    @JsonIgnore
+    private String personUnid_like;
+    @JsonIgnore
    private Boolean direction_null;
    @JsonIgnore
@@ -256,20 +264,29 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    private Integer direction_lte;
    @JsonIgnore
-    private Boolean personUnid_null;
+    private Boolean gateId_null;
    @JsonIgnore
-    private ArrayList<String> personUnid_arr;
+    private ArrayList<Long> gateId_arr;
    @JsonIgnore
-    private String personUnid_like;
+    private Long gateId_gt;
+    @JsonIgnore
+    private Long gateId_lt;
+    @JsonIgnore
+    private Long gateId_gte;
+    @JsonIgnore
+    private Long gateId_lte;
    public SubTaskVoBase() {
        this(null);
    }
    public SubTaskVoBase(SubTask subTask) {
-        if (subTask == null) {
+        if(subTask == null) {
            subTask = new SubTask();
        }
        this.subTask = subTask;
@@ -325,14 +342,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getId() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getId();
    }
    public void setId(Long id) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setId(id);
@@ -355,14 +372,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public String getUnid() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getUnid();
    }
    public void setUnid(String unid) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setUnid(unid);
@@ -409,14 +426,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Date getCreateTime() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getCreateTime();
    }
    public void setCreateTime(Date createTime) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setCreateTime(createTime);
@@ -471,14 +488,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getCreateUser() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getCreateUser();
    }
    public void setCreateUser(Long createUser) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setCreateUser(createUser);
@@ -525,14 +542,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getPicId() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getPicId();
    }
    public void setPicId(Long picId) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setPicId(picId);
@@ -579,14 +596,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getPackId() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getPackId();
    }
    public void setPackId(Long packId) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setPackId(packId);
@@ -633,14 +650,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getTaskId() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getTaskId();
    }
    public void setTaskId(Long taskId) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setTaskId(taskId);
@@ -695,14 +712,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getInInspectorId() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getInInspectorId();
    }
    public void setInInspectorId(Long inInspectorId) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setInInspectorId(inInspectorId);
@@ -757,14 +774,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getOutInspectorId() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getOutInspectorId();
    }
    public void setOutInspectorId(Long outInspectorId) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setOutInspectorId(outInspectorId);
@@ -819,14 +836,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Long getAnnotatorId() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getAnnotatorId();
    }
    public void setAnnotatorId(Long annotatorId) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setAnnotatorId(annotatorId);
@@ -881,14 +898,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Date getAnnotateTime() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getAnnotateTime();
    }
    public void setAnnotateTime(Date annotateTime) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setAnnotateTime(annotateTime);
@@ -919,14 +936,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public String getLabelResult() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getLabelResult();
    }
    public void setLabelResult(String labelResult) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setLabelResult(labelResult);
@@ -973,14 +990,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Integer getInStatus() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getInStatus();
    }
    public void setInStatus(Integer inStatus) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setInStatus(inStatus);
@@ -1027,14 +1044,14 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Integer getOutStatus() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getOutStatus();
    }
    public void setOutStatus(Integer outStatus) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setOutStatus(outStatus);
@@ -1081,19 +1098,57 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Integer getStatus() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getStatus();
    }
    public void setStatus(Integer status) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setStatus(status);
    }
+    public Boolean getPersonUnid_null() {
+        return personUnid_null;
+    }
+    public void setPersonUnid_null(Boolean personUnid_null) {
+        this.personUnid_null = personUnid_null;
+    }
+    public ArrayList<String> getPersonUnid_arr() {
+        return personUnid_arr;
+    }
+    public void setPersonUnid_arr(ArrayList<String> personUnid_arr) {
+        this.personUnid_arr = personUnid_arr;
+    }
+    public String getPersonUnid_like() {
+        return personUnid_like;
+    }
+    public void setPersonUnid_like(String personUnid_like) {
+        this.personUnid_like = personUnid_like;
+    }
+    public String getPersonUnid() {
+        if(getModel() == null ){
+            throw new RuntimeException("model is null");
+        }
+        return this.getModel().getPersonUnid();
+    }
+    public void setPersonUnid(String personUnid) {
+        if(getModel() == null ){
+            throw new RuntimeException("model is null");
+        }
+        this.getModel().setPersonUnid(personUnid);
+    }
    public Boolean getDirection_null() {
        return direction_null;
    }
@@ -1143,80 +1198,104 @@ public class SubTaskVoBase extends SubTask implements VoInterface<SubTask> {
    }
    public Integer getDirection() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getDirection();
    }
    public void setDirection(Integer direction) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setDirection(direction);
    }
-    public Boolean getPersonUnid_null() {
+    public Boolean getGateId_null() {
-        return personUnid_null;
+        return gateId_null;
    }
-    public void setPersonUnid_null(Boolean personUnid_null) {
+    public void setGateId_null(Boolean gateId_null) {
-        this.personUnid_null = personUnid_null;
+        this.gateId_null = gateId_null;
    }
-    public ArrayList<String> getPersonUnid_arr() {
+    public ArrayList<Long> getGateId_arr() {
-        return personUnid_arr;
+        return gateId_arr;
    }
-    public void setPersonUnid_arr(ArrayList<String> personUnid_arr) {
+    public void setGateId_arr(ArrayList<Long> gateId_arr) {
-        this.personUnid_arr = personUnid_arr;
+        this.gateId_arr = gateId_arr;
    }
-    public String getPersonUnid_like() {
+    public Long getGateId_gt() {
-        return personUnid_like;
+        return gateId_gt;
    }
-    public void setPersonUnid_like(String personUnid_like) {
+    public void setGateId_gt(Long gateId_gt) {
-        this.personUnid_like = personUnid_like;
+        this.gateId_gt = gateId_gt;
    }
-    public String getPersonUnid() {
+    public Long getGateId_lt() {
-        if (getModel() == null) {
+        return gateId_lt;
+    }
+    public void setGateId_lt(Long gateId_lt) {
+        this.gateId_lt = gateId_lt;
+    }
+    public Long getGateId_gte() {
+        return gateId_gte;
+    }
+    public void setGateId_gte(Long gateId_gte) {
+        this.gateId_gte = gateId_gte;
+    }
+    public Long getGateId_lte() {
+        return gateId_lte;
+    }
+    public void setGateId_lte(Long gateId_lte) {
+        this.gateId_lte = gateId_lte;
+    }
+    public Long getGateId() {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
-        return this.getModel().getPersonUnid();
+        return this.getModel().getGateId();
    }
-    public void setPersonUnid(String personUnid) {
+    public void setGateId(Long gateId) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
-        this.getModel().setPersonUnid(personUnid);
+        this.getModel().setGateId(gateId);
    }
    public Pic getPic() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getPic();
    }
    public void setPic(Pic pic) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setPic(pic);
    }
    public Task getTask() {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        return this.getModel().getTask();
    }
    public void setTask(Task task) {
-        if (getModel() == null) {
+        if(getModel() == null ){
            throw new RuntimeException("model is null");
        }
        this.getModel().setTask(task);

--- a/label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/controller/KeliuController.java
+++ b/label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/controller/KeliuController.java
@@ -131,7 +131,7 @@ public class KeliuController {
        map.add("taskId", taskId);
        map.add("countTime", DateUtil.format("yyyy-MM-dd HH:mm:ss", faceRecognition.getCounttime()));
        map.add("direction", faceRecognition.getDirection());
+        map.add("gateId", faceRecognition.getGateId());
        return new HttpEntity<>(map, headers);
    }
 }
--- a/label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/repository/KeliuRepository.java
+++ b/label-tool-keliu/src/main/java/com/viontech/label/tool/keliu/repository/KeliuRepository.java
@@ -24,7 +24,7 @@ public class KeliuRepository {
    private JdbcTemplate jdbcTemplate;
    public List<FaceRecognition> getFaceRecognitionsByDateAndMallId(Date date, Long mallId) {
-        return jdbcTemplate.query("select unid,person_unid,channel_serialnum,body_pic,countdate,counttime,direction from d_face_recognition where countdate=? and mall_id=?", new BeanPropertyRowMapper<>(FaceRecognition.class), date, mallId);
+        return jdbcTemplate.query("select unid,person_unid,channel_serialnum,body_pic,countdate,counttime,direction,gate_id from d_face_recognition where countdate=? and mall_id=?", new BeanPropertyRowMapper<>(FaceRecognition.class), date, mallId);
    }
    public HashMap<Long, String> getMallMap() {