diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkAccessRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkAccessRecordDO.java index b8525b3..c9a2504 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkAccessRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkAccessRecordDO.java @@ -52,7 +52,7 @@ public class HkAccessRecordDO extends BaseDO { @ApiModelProperty(value = "门禁点所属区域编码", name = "doorRegionIndexCode") private String doorRegionIndexCode; - @ApiModelProperty(value = "进出方向(1-进,2-出)", name = "enterOrExit", allowableValues = "1,2") + @ApiModelProperty(value = "进出方向(1-进,0-出,-1-未知)", name = "enterOrExit", allowableValues = "1,0,-1") private Integer enterOrExit; @ApiModelProperty(value = "开门结果(1-成功,0-失败)", name = "openResult", allowableValues = "0,1") diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkVehicleAccessRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkVehicleAccessRecordDO.java index 76fac74..53a1b7e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkVehicleAccessRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/HkVehicleAccessRecordDO.java @@ -55,7 +55,7 @@ public class HkVehicleAccessRecordDO extends BaseDO { @ApiModelProperty(value = "出入口名称", name = "entranceName") private String entranceName; - @ApiModelProperty(value = "进出方向(1-进,2-出)", name = "enterOrExit", allowableValues = "1,2") + @ApiModelProperty(value = "进出方向(0-进,1-出)", name = "enterOrExit", allowableValues = "0,1") private Integer enterOrExit; @ApiModelProperty(value = "事件发生时间(通行时间)", name = "eventTime") diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java index 94bd2fb..88397fb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java @@ -26,7 +26,7 @@ import java.util.Map; @Mapper @DataScopes({ @DataScope(method = "listPage", menuPerms = ""), - @DataScope(method = "listPositionCount", menuPerms = "") + @DataScope(method = "listPositionCount", menuPerms = "fgs-qu-yu-ren-yuan-ji-che-liang-tong-ji") }) public interface ClosedAreaMapper extends BaseMapper { diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/TwoPersonUtil.java b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/TwoPersonUtil.java index 3b97a46..66ea1f4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/TwoPersonUtil.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/mjDevice/TwoPersonUtil.java @@ -148,6 +148,7 @@ public class TwoPersonUtil { JSONObject subResources = HKDeviceUtil.getSubResources(); JSONArray doorList = subResources.getJSONObject("data").getJSONArray("list"); System.out.println("查询到门禁点数量: " + doorList.size()); + System.out.println("查询到门禁点列表: " + doorList); String testDoorIndexCode = null; String testDoorName = null; if (!doorList.isEmpty()) {