From 4b7207820e8097d617cb38c2a900442248b534f2 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Mon, 23 Mar 2026 09:46:18 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BA=8C=E7=BA=A7=E5=B0=81?= =?UTF-8?q?=E9=97=AD=E5=8C=BA=E5=9F=9F=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E7=BA=A7=E4=B8=B4=E6=97=B6=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/primeport/web/MkmjController.java | 11 ++++++ .../web/close/ClosedAreaController.java | 4 +-- .../web/close/ClosedTmpApplyController.java | 36 ++++++++++++++++--- .../primeport/command/PersonApplyAddExe.java | 6 ++-- .../command/query/ClosedAreaQueryExe.java | 11 ++++-- .../service/ClosedAreaServiceImpl.java | 4 +-- .../service/PersonApplyServiceImpl.java | 6 ++-- .../primeport/api/ClosedAreaServiceI.java | 2 +- .../primeport/api/PersonApplyServiceI.java | 3 +- .../com/zcloud/primeport/dto/MkmjAddCmd.java | 4 +-- .../primeport/dto/MkmjPassageUpdateCmd.java | 2 +- .../zcloud/primeport/dto/MkmjUpdateCmd.java | 4 +-- .../primeport/dto/MkmjUpdateStatusCmd.java | 31 ++++++++++++++++ .../primeport/dto/clientobject/MkmjCO.java | 4 +-- .../zcloud/primeport/domain/model/MkmjE.java | 4 +-- .../persistence/dataobject/MkmjDO.java | 4 +-- 16 files changed, 105 insertions(+), 31 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateStatusCmd.java diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java index 4341276..d1bdfd6 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjController.java @@ -8,6 +8,7 @@ import com.zcloud.primeport.api.MkmjServiceI; import com.zcloud.primeport.dto.MkmjAddCmd; import com.zcloud.primeport.dto.MkmjPageQry; import com.zcloud.primeport.dto.MkmjUpdateCmd; +import com.zcloud.primeport.dto.MkmjUpdateStatusCmd; import com.zcloud.primeport.dto.clientobject.MkmjCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import io.swagger.annotations.Api; @@ -58,6 +59,16 @@ public class MkmjController { return SingleResponse.buildSuccess(); } + @ApiOperation("停用启用") + @PutMapping("/editStatus") + public SingleResponse editStatus(@Validated @RequestBody MkmjUpdateStatusCmd mkmjUpdateCmd) { + MkmjUpdateCmd mkmjUpdateCmd1 = new MkmjUpdateCmd(); + mkmjUpdateCmd1.setId(mkmjUpdateCmd.getId()); + mkmjUpdateCmd1.setMkmjStatus(mkmjUpdateCmd.getMkmjStatus()); + mkmjService.edit(mkmjUpdateCmd1); + return SingleResponse.buildSuccess(); + } + @ApiOperation("修改") @PutMapping("/edit") public SingleResponse edit(@Validated @RequestBody MkmjUpdateCmd mkmjUpdateCmd) { diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java index 02e37ea..dcc479a 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaController.java @@ -35,8 +35,8 @@ public class ClosedAreaController { @ApiOperation("树级结构") @GetMapping("/listTree") - public MultiResponse listTree() { - return closedAreaService.listTree(); + public MultiResponse listTree(ClosedAreaPageQry qry) { + return closedAreaService.listTree(qry); } @ApiOperation("统计港区里所有的封闭区域数与管辖单位数") @GetMapping("/getCountByHgAuthArea") diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java index 693e0b1..03085ce 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java @@ -5,21 +5,21 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; +import com.alibaba.fastjson.JSON; import com.zcloud.primeport.api.ClosedAreaCarApplyServiceI; import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI; import com.zcloud.primeport.api.PersonApplyServiceI; import com.zcloud.primeport.domain.enums.TmpApplyEnum; -import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd; -import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd; -import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry; -import com.zcloud.primeport.dto.ClosedTmpApplyAddCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.HashMap; /** @@ -46,7 +46,33 @@ public class ClosedTmpApplyController { id = closedAreaPersonApplyServiceI.saveTmpPersonApply(cmd); } if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_PERSON_APPLY.getCode())) { - personApplyServiceI.xgfPersonSave(); + XgfPersonApplyAddCmd xgf = new XgfPersonApplyAddCmd(); + BeanUtils.copyProperties(cmd, xgf); + xgf.setPersonBelongType(4); + HashMap stringObjectHashMap = new HashMap<>(); + ArrayList> hashMaps = new ArrayList<>(); + stringObjectHashMap.put("bianma", cmd.getHgAuthArea()); + stringObjectHashMap.put("value", cmd.getHgAuthAreaName()); + hashMaps.add(stringObjectHashMap); + HashMap stringObjectHashMap2 = new HashMap<>(); + stringObjectHashMap2.put("area", stringObjectHashMap); + xgf.setGateLevelAuthArea(JSON.toJSONString(stringObjectHashMap2)); + xgf.setAuditCorpId(cmd.getAuditPersonCorpId()); + xgf.setAuditCorpName(cmd.getAuditPersonCorpName()); + xgf.setAuditDeptId(cmd.getAuditPersonDepartmentId()); + xgf.setAuditDeptName(cmd.getAuditPersonDepartmentName()); + xgf.setAuditUserId(cmd.getAuditPersonUserId()); + xgf.setAuditUserName(cmd.getAuditPersonUserName()); + xgf.setReasonVisit(cmd.getApplyReason()); + XgfPersonApplyAddCmd.PersonApplyAddCmdExt personApplyAddCmdExt = new XgfPersonApplyAddCmd.PersonApplyAddCmdExt(); + personApplyAddCmdExt.setEmployeePersonUserName(cmd.getApplyPersonUserName()); + personApplyAddCmdExt.setUserFaceUrl(cmd.getUserFaceUrl()); + personApplyAddCmdExt.setUserPhone(cmd.getUserPhone()); + personApplyAddCmdExt.setUserCard(cmd.getUserPhone()); + ArrayList personApplyAddCmdExts = new ArrayList<>(); + personApplyAddCmdExts.add(personApplyAddCmdExt); + xgf.setPersonApplyList(personApplyAddCmdExts); + id = personApplyServiceI.xgfPersonSave(xgf); } } if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java index d448ae7..9080df6 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java @@ -14,6 +14,7 @@ import com.zcloud.primeport.dto.XgfApplyPersonPageQry; import com.zcloud.primeport.dto.XgfPersonApplyAddCmd; import com.zcloud.primeport.dto.clientobject.PersonApplyCO; import com.zcloud.primeport.dto.clientobject.XgfPersonApplyCO; +import jodd.util.Base64; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -51,7 +52,7 @@ public class PersonApplyAddExe { return true; } - public SingleResponse xgfPersonSave(XgfPersonApplyAddCmd cmd) { + public Long xgfPersonSave(XgfPersonApplyAddCmd cmd) { // 先进行相关方申请的保存 XgfApplyPersonE build = XgfApplyPersonE.builder().personBelongType(cmd.getPersonBelongType()) .gateLevelAuthArea(cmd.getGateLevelAuthArea()) @@ -73,10 +74,11 @@ public class PersonApplyAddExe { BeanUtils.copyProperties(personApply, personApplyE); personApplyE.setXgfApplyPersonId(build.getId()); personApplyE.setMkmjPermission((cmd.getPersonBelongType() == 1 || cmd.getPersonBelongType() == 2) ? 1 : 2); + personApplyE.setUserCard(Base64.encodeToString(personApply.getUserCard())); personApplyES.add(personApplyE); }); personApplyGateway.saveBatch(personApplyES); - return SingleResponse.buildSuccess(); + return build.getId(); } public void authorization(PersonAuthCmd cmd) { diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaQueryExe.java index af46afe..beeadce 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/ClosedAreaQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.MultiResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.command.convertor.ClosedAreaCoConvertor; import com.zcloud.primeport.dto.ClosedAreaPageQry; import com.zcloud.primeport.dto.clientobject.ClosedAreaCO; @@ -60,13 +61,16 @@ public class ClosedAreaQueryExe { public List listAllByJurisdictionalCorpId(Long id) { QueryWrapper objectQueryWrapper = new QueryWrapper<>(); - objectQueryWrapper.eq("jurisdictional_corp_id",id); + objectQueryWrapper.eq("jurisdictional_corp_id", id); List list = closedAreaRepository.list(objectQueryWrapper); return closedAreaCoConvertor.converDOsToCOs(list); } - public MultiResponse listTree() { - List list = closedAreaRepository.list(); + public MultiResponse listTree(ClosedAreaPageQry qry) { + QueryWrapper objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq(Tools.notEmpty(qry.getHgAuthArea()), "hg_auth_area", qry.getHgAuthArea()); + objectQueryWrapper.eq(qry.getParentId() != null, "parent_id", qry.getParentId()); + List list = closedAreaRepository.list(objectQueryWrapper); ArrayList closedAreaDOS = new ArrayList<>(); for (ClosedAreaDO closedAreaDO : list) { if (closedAreaDO.getParentId().equals(0L)) { @@ -78,6 +82,7 @@ public class ClosedAreaQueryExe { } return MultiResponse.of(closedAreaDOS); } + private List treeChildren(Long parentId, List closedAreaDOS) { List childList = new ArrayList<>(); for (ClosedAreaDO closedAreaDO : closedAreaDOS) { diff --git a/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaServiceImpl.java index d4adaac..138ec22 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaServiceImpl.java @@ -79,8 +79,8 @@ public class ClosedAreaServiceImpl implements ClosedAreaServiceI { } @Override - public MultiResponse listTree() { - return closedAreaQueryExe.listTree(); + public MultiResponse listTree(ClosedAreaPageQry qry) { + return closedAreaQueryExe.listTree(qry); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java index 4f3891c..025e169 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/PersonApplyServiceImpl.java @@ -57,8 +57,8 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI { } @Override - public void xgfPersonSave(XgfPersonApplyAddCmd cmd) { - personApplyAddExe.xgfPersonSave(cmd); + public Long xgfPersonSave(XgfPersonApplyAddCmd cmd) { + return personApplyAddExe.xgfPersonSave(cmd); } @Override @@ -90,7 +90,7 @@ public class PersonApplyServiceImpl implements PersonApplyServiceI { public void authorization(PersonAuthCmd cmd) { if (cmd.getXgfApplyPersonId() != null) { // 修改 - personApplyUpdateExe.authorization(cmd.getApplyPersonId(),cmd.getXgfApplyPersonId(),cmd.getMkmjPermission(),cmd.getGateLevelAuthArea()); + personApplyUpdateExe.authorization(cmd.getApplyPersonId(), cmd.getXgfApplyPersonId(), cmd.getMkmjPermission(), cmd.getGateLevelAuthArea()); } else { // 新增 就是股份，企业的。 personApplyAddExe.authorization(cmd); diff --git a/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaServiceI.java index 00b8793..403f250 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaServiceI.java @@ -31,6 +31,6 @@ public interface ClosedAreaServiceI { MultiResponse listAllByJurisdictionalCorpId(Long id); - MultiResponse listTree(); + MultiResponse listTree(ClosedAreaPageQry qry); } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java index b6bcc52..4e694b7 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/PersonApplyServiceI.java @@ -24,8 +24,7 @@ public interface PersonApplyServiceI { void removeBatch(Long[] ids); - void xgfPersonSave(XgfPersonApplyAddCmd cmd); - void xgfTmpPersonSave(XgfPersonApplyAddCmd cmd); + Long xgfPersonSave(XgfPersonApplyAddCmd cmd); PageResponse xgfPersonAuditList(XgfApplyPersonPageQry qry); diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java index fbed606..58c20c4 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjAddCmd.java @@ -45,11 +45,11 @@ public class MkmjAddCmd extends Command { @ApiModelProperty(value = "入方向区域- 二级有用", name = "inDirectionArea", required = true) private Long inDirectionArea; @ApiModelProperty(value = "入方向区域名称- 二级有用", name = "inDirectionAreaName", required = true) - private Long inDirectionAreaName; + private String inDirectionAreaName; @ApiModelProperty(value = "出方向区域- 二级有用", name = "outDirectionArea", required = true) private Long outDirectionArea; @ApiModelProperty(value = "出方向区域名称- 二级有用", name = "outDirectionAreaName", required = true) - private Long outDirectionAreaName; + private String outDirectionAreaName; @ApiModelProperty(value = "封闭区域id 二级有用", name = "closedAreaId") private Long closedAreaId; @ApiModelProperty(value = "封闭区域进出类型 1离场，2离开进入其他区域", name = "outDirectionType") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java index e827ec5..2fc17da 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjPassageUpdateCmd.java @@ -37,7 +37,7 @@ public class MkmjPassageUpdateCmd extends Command { @NotNull(message = "通道状态 1-停用 2-正常不能为空") private Integer passageStatus; @ApiModelProperty(value = "口门区域id", name = "mkmjId") - @NotEmpty(message = "口门区域id不能为空") + @NotNull(message = "口门区域id不能为空") private Long mkmjId; @ApiModelProperty(value = "经度", name = "longitude") private String longitude; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateCmd.java index 8f06457..2a5db97 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateCmd.java @@ -43,11 +43,11 @@ public class MkmjUpdateCmd extends Command { @ApiModelProperty(value = "入方向区域- 二级有用", name = "inDirectionArea", required = true) private Long inDirectionArea; @ApiModelProperty(value = "入方向区域名称- 二级有用", name = "inDirectionAreaName", required = true) - private Long inDirectionAreaName; + private String inDirectionAreaName; @ApiModelProperty(value = "出方向区域- 二级有用", name = "outDirectionArea", required = true) private Long outDirectionArea; @ApiModelProperty(value = "出方向区域名称- 二级有用", name = "outDirectionAreaName", required = true) - private Long outDirectionAreaName; + private String outDirectionAreaName; @ApiModelProperty(value = "经度", name = "longitude", required = true) private String longitude; @ApiModelProperty(value = "纬度", name = "latitude", required = true) diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateStatusCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateStatusCmd.java new file mode 100644 index 0000000..48204ad --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjUpdateStatusCmd.java @@ -0,0 +1,31 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * web-client + * + * @Author makejava + * @Date 2026-03-05 11:33:16 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MkmjUpdateStatusCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "口门状态 1-停用 2-正常", name = "mkmjStatus", required = true) + @NotNull(message = "口门状态 1-停用 2-正常不能为空") + private Integer mkmjStatus; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java index fb2bd42..2a39bca 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/MkmjCO.java @@ -38,13 +38,13 @@ public class MkmjCO extends ClientObject { private Long inDirectionArea; //入方向区域名称- 二级有用 @ApiModelProperty(value = "入方向区域名称- 二级有用") - private Long inDirectionAreaName; + private String inDirectionAreaName; //出方向区域- 二级有用 @ApiModelProperty(value = "出方向区域- 二级有用") private Long outDirectionArea; //出方向区域名称- 二级有用 @ApiModelProperty(value = "出方向区域名称- 二级有用") - private Long outDirectionAreaName; + private String outDirectionAreaName; //经度 @ApiModelProperty(value = "经度") private String longitude; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjE.java index d2cd7a5..ec31626 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/MkmjE.java @@ -36,11 +36,11 @@ public class MkmjE extends BaseE { //入方向区域- 二级有用 private Long inDirectionArea; //入方向区域名称- 二级有用 - private Long inDirectionAreaName; + private String inDirectionAreaName; //出方向区域- 二级有用 private Long outDirectionArea; //出方向区域名称- 二级有用 - private Long outDirectionAreaName; + private String outDirectionAreaName; //经度 private String longitude; //纬度 diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjDO.java index 3bd7624..8996fe8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/MkmjDO.java @@ -45,13 +45,13 @@ public class MkmjDO extends BaseDO { private Long inDirectionArea; //入方向区域名称- 二级有用 @ApiModelProperty(value = "入方向区域名称- 二级有用") - private Long inDirectionAreaName; + private String inDirectionAreaName; //出方向区域- 二级有用 @ApiModelProperty(value = "出方向区域- 二级有用") private Long outDirectionArea; //出方向区域名称- 二级有用 @ApiModelProperty(value = "出方向区域名称- 二级有用") - private Long outDirectionAreaName; + private String outDirectionAreaName; @ApiModelProperty(value = "封闭区域id 二级有用", name = "closedAreaId") private Long closedAreaId; @ApiModelProperty(value = "封闭区域进出类型 1离场，2离开进入其他区域", name = "outDirectionType")