diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java index a54b34b..f7b7855 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/MkmjApprovalUserController.java @@ -35,7 +35,6 @@ public class MkmjApprovalUserController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody MkmjApprovalUserAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return mkmjApprovalUserService.add(cmd); } @@ -52,11 +51,6 @@ public class MkmjApprovalUserController { return MultiResponse.of(mkmjApprovalUserCOS); } - @ApiOperation("详情") - @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return SingleResponse.of(new MkmjApprovalUserCO()); - } @ApiOperation("删除") @DeleteMapping("/{id}") @@ -64,19 +58,5 @@ public class MkmjApprovalUserController { mkmjApprovalUserService.remove(id); return SingleResponse.buildSuccess(); } - -// @ApiOperation("删除多个") -// @DeleteMapping("/ids") -// public Response removeBatch(@RequestParam Long[] ids) { -// mkmjApprovalUserService.removeBatch(ids); -// return SingleResponse.buildSuccess(); -// } - -// @ApiOperation("修改") -// @PutMapping("/edit") -// public SingleResponse edit(@Validated @RequestBody MkmjApprovalUserUpdateCmd mkmjApprovalUserUpdateCmd) { -// mkmjApprovalUserService.edit(mkmjApprovalUserUpdateCmd); -// return SingleResponse.buildSuccess(); -// } } diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessController.java new file mode 100644 index 0000000..1ae0105 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessController.java @@ -0,0 +1,81 @@ +package com.zcloud.primeport.web; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.TemporaryAccessServiceI; +import com.zcloud.primeport.dto.TemporaryAccessAddCmd; +import com.zcloud.primeport.dto.TemporaryAccessPageQry; +import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Api(tags = "临时车辆表") +@RequestMapping("/${application.gateway}/temporaryAccess") +@RestController +@AllArgsConstructor +public class TemporaryAccessController { + private final TemporaryAccessServiceI temporaryAccessService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody TemporaryAccessAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return temporaryAccessService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody TemporaryAccessPageQry qry) { + return temporaryAccessService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(temporaryAccessService.queryById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + temporaryAccessService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + temporaryAccessService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody TemporaryAccessUpdateCmd temporaryAccessUpdateCmd) { + temporaryAccessService.edit(temporaryAccessUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessEntourageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessEntourageController.java new file mode 100644 index 0000000..1c160b4 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/TemporaryAccessEntourageController.java @@ -0,0 +1,81 @@ +package com.zcloud.primeport.web; + +import com.alibaba.cola.dto.MultiResponse; +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.Response; +import com.alibaba.cola.dto.SingleResponse; +import com.jjb.saas.framework.auth.model.SSOUser; +import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.primeport.api.TemporaryAccessEntourageServiceI; +import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; +import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; +import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; + +/** + * web-adapter + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@Api(tags = "临时车辆的其他人员表.同行人员表") +@RequestMapping("/${application.gateway}/temporaryAccessEntourage") +@RestController +@AllArgsConstructor +public class TemporaryAccessEntourageController { + private final TemporaryAccessEntourageServiceI temporaryAccessEntourageService; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse add(@Validated @RequestBody TemporaryAccessEntourageAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + return temporaryAccessEntourageService.add(cmd); + } + + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody TemporaryAccessEntouragePageQry qry) { + return temporaryAccessEntourageService.listPage(qry); + } + + @ApiOperation("所有数据") + @GetMapping("/listAll") + public MultiResponse listAll() { + return MultiResponse.of(new ArrayList()); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(temporaryAccessEntourageService.queryById(id)); + } + + @ApiOperation("删除") + @DeleteMapping("/{id}") + public Response remove(@PathVariable("id") Long id) { + temporaryAccessEntourageService.remove(id); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("删除多个") + @DeleteMapping("/ids") + public Response removeBatch(@RequestParam Long[] ids) { + temporaryAccessEntourageService.removeBatch(ids); + return SingleResponse.buildSuccess(); + } + + @ApiOperation("修改") + @PutMapping("/edit") + public SingleResponse edit(@Validated @RequestBody TemporaryAccessEntourageUpdateCmd temporaryAccessEntourageUpdateCmd) { + temporaryAccessEntourageService.edit(temporaryAccessEntourageUpdateCmd); + return SingleResponse.buildSuccess(); + } +} + diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java index 866807b..c0225b7 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleMessageController.java @@ -6,6 +6,7 @@ import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.api.VehicleMessageServiceI; import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; @@ -32,16 +33,11 @@ import java.util.ArrayList; @AllArgsConstructor public class VehicleMessageController { private final VehicleMessageServiceI vehicleMessageService; - - @ApiOperation("新增") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody VehicleMessageAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); - return vehicleMessageService.add(cmd); - } - @ApiOperation("新增-监管端,分子公司人员车辆") + @ApiOperation("新增-监管端/分子公司人员车辆") @PostMapping("/saveFroCorp") public SingleResponse addForCorp(@Validated @RequestBody VehicleMessageForCorpAddCmd cmd) { + SSOUser ssoUser = AuthContext.getCurrentUser(); + cmd.addLongiUserCorp(ssoUser.getTenantParentIds()); return vehicleMessageService.addForCorp(cmd); } @ApiOperation("修改") @@ -65,6 +61,10 @@ public class VehicleMessageController { @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@RequestBody VehicleMessagePageQry qry) { + SSOUser currentUser = AuthContext.getCurrentUser(); + if (!Tools.isEmpty(qry.getIsCorpType()) && !"2".equals(qry.getIsCorpType())) { + qry.setCorpByCorpType(currentUser.getTenantParentIds()); + } return vehicleMessageService.listPage(qry); } /** @@ -90,5 +90,13 @@ public class VehicleMessageController { VehicleMessageCO infoById = vehicleMessageService.infoByLicenceNo(licenceNo); return SingleResponse.of(infoById); } + + // accessStatus + @ApiOperation("修改车辆进出状态") + @PutMapping("/editAccessStatus") + public SingleResponse editFro(@PathVariable("id") Long id) { +// vehicleMessageService.editForCorp(updateCmd); + return SingleResponse.buildSuccess(); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessAddExe.java new file mode 100644 index 0000000..24d59b9 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; +import com.zcloud.primeport.domain.model.TemporaryAccessE; +import com.zcloud.primeport.dto.TemporaryAccessAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessAddExe { + private final TemporaryAccessGateway temporaryAccessGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(TemporaryAccessAddCmd cmd) { + TemporaryAccessE temporaryAccessE = new TemporaryAccessE(); + BeanUtils.copyProperties(cmd, temporaryAccessE); + boolean res = false; + try { + res = temporaryAccessGateway.add(temporaryAccessE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageAddExe.java new file mode 100644 index 0000000..14f8b60 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageAddExe.java @@ -0,0 +1,40 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; +import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; +import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessEntourageAddExe { + private final TemporaryAccessEntourageGateway temporaryAccessEntourageGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(TemporaryAccessEntourageAddCmd cmd) { + TemporaryAccessEntourageE temporaryAccessEntourageE = new TemporaryAccessEntourageE(); + BeanUtils.copyProperties(cmd, temporaryAccessEntourageE); + boolean res = false; + try { + res = temporaryAccessEntourageGateway.add(temporaryAccessEntourageE); + } catch (Exception e) { + throw new RuntimeException(e); + } + if (!res) { + throw new BizException("保存失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageRemoveExe.java new file mode 100644 index 0000000..92b04b0 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessEntourageRemoveExe { + private final TemporaryAccessEntourageGateway temporaryAccessEntourageGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = temporaryAccessEntourageGateway.deletedTemporaryAccessEntourageById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = temporaryAccessEntourageGateway.deletedTemporaryAccessEntourageByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageUpdateExe.java new file mode 100644 index 0000000..de5bdbc --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessEntourageUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; +import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; +import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessEntourageUpdateExe { + private final TemporaryAccessEntourageGateway temporaryAccessEntourageGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(TemporaryAccessEntourageUpdateCmd temporaryAccessEntourageUpdateCmd) { + TemporaryAccessEntourageE temporaryAccessEntourageE = new TemporaryAccessEntourageE(); + BeanUtils.copyProperties(temporaryAccessEntourageUpdateCmd, temporaryAccessEntourageE); + boolean res = temporaryAccessEntourageGateway.update(temporaryAccessEntourageE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessRemoveExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessRemoveExe.java new file mode 100644 index 0000000..b20e496 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessRemoveExe.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessRemoveExe { + private final TemporaryAccessGateway temporaryAccessGateway; + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long id) { + boolean res = temporaryAccessGateway.deletedTemporaryAccessById(id); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } + + @Transactional(rollbackFor = Exception.class) + public boolean execute(Long[] ids) { + boolean res = temporaryAccessGateway.deletedTemporaryAccessByIds(ids); + if (!res) { + throw new BizException("删除失败"); + } + return true; + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessUpdateExe.java new file mode 100644 index 0000000..660d169 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/TemporaryAccessUpdateExe.java @@ -0,0 +1,34 @@ +package com.zcloud.primeport.command; + +import com.alibaba.cola.exception.BizException; +import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; +import com.zcloud.primeport.domain.model.TemporaryAccessE; +import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessUpdateExe { + private final TemporaryAccessGateway temporaryAccessGateway; + + @Transactional(rollbackFor = Exception.class) + public void execute(TemporaryAccessUpdateCmd temporaryAccessUpdateCmd) { + TemporaryAccessE temporaryAccessE = new TemporaryAccessE(); + BeanUtils.copyProperties(temporaryAccessUpdateCmd, temporaryAccessE); + boolean res = temporaryAccessGateway.update(temporaryAccessE); + if (!res) { + throw new BizException("修改失败"); + } + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java index 326b6db..125b009 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageAddExe.java @@ -3,6 +3,7 @@ package com.zcloud.primeport.command; import com.alibaba.cola.exception.BizException; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; +import com.zcloud.primeport.domain.gateway.VehicleBlackGateway; import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.VehicleAuditLogE; import com.zcloud.primeport.domain.model.VehicleMessageE; @@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional; public class VehicleMessageAddExe { private final VehicleMessageGateway vehicleMessageGateway; private final VehicleAuditLogGateway vehicleAuditLogGateway; + private final VehicleBlackGateway vehicleBlackGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(VehicleMessageAddCmd cmd) { VehicleMessageE examTypeE = new VehicleMessageE(); @@ -49,6 +51,14 @@ public class VehicleMessageAddExe { examTypeE = examTypeE.VehicleMessageForCorpE(examTypeE); boolean res = false; try { + /** + * 1.判断是否重复 + * 2.判断是否在黑名单中 + */ + VehicleMessageE infoByLicenceNo = vehicleMessageGateway.getInfoByLicenceNo(examTypeE.getLicenceNo()); + if (infoByLicenceNo != null){ + throw new BizException("车辆已存在"); + } VehicleMessageE add = vehicleMessageGateway.add(examTypeE); if (!Tools.isEmpty(cmd.getApprovalUserId())){ VehicleAuditLogE vehicleAuditLogE = new VehicleAuditLogE(); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessCoConvertor.java new file mode 100644 index 0000000..7a31661 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessCoConvertor.java @@ -0,0 +1,26 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Mapper(componentModel = "spring") +public interface TemporaryAccessCoConvertor { + /** + * @param temporaryAccessDOs + * @return + */ + List converDOsToCOs(List temporaryAccessDOs); + + TemporaryAccessCO converDOToCO(TemporaryAccessDO temporaryAccessDO); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessEntourageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessEntourageCoConvertor.java new file mode 100644 index 0000000..cce313d --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/TemporaryAccessEntourageCoConvertor.java @@ -0,0 +1,26 @@ +package com.zcloud.primeport.command.convertor; + +import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; +import org.mapstruct.Mapper; + +import java.util.List; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@Mapper(componentModel = "spring") +public interface TemporaryAccessEntourageCoConvertor { + /** + * @param temporaryAccessEntourageDOs + * @return + */ + List converDOsToCOs(List temporaryAccessEntourageDOs); + + TemporaryAccessEntourageCO converDOToCO(TemporaryAccessEntourageDO temporaryAccessEntourageDO); +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessEntourageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessEntourageQueryExe.java new file mode 100644 index 0000000..77a6ab9 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessEntourageQueryExe.java @@ -0,0 +1,52 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.TemporaryAccessEntourageCoConvertor; +import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; +import com.zcloud.primeport.persistence.repository.TemporaryAccessEntourageRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessEntourageQueryExe { + private final TemporaryAccessEntourageRepository temporaryAccessEntourageRepository; + private final TemporaryAccessEntourageCoConvertor temporaryAccessEntourageCoConvertor; + + /** + * 根据id查询 + * + * @param id + * @return + */ + public TemporaryAccessEntourageCO queryById(Long id) { + return temporaryAccessEntourageCoConvertor.converDOToCO(temporaryAccessEntourageRepository.getById(id)); + } + + /** + * 分页 + * + * @param temporaryAccessEntouragePageQry + * @return + */ + public PageResponse execute(TemporaryAccessEntouragePageQry temporaryAccessEntouragePageQry) { + Map params = PageQueryHelper.toHashMap(temporaryAccessEntouragePageQry); + PageResponse pageResponse = temporaryAccessEntourageRepository.listPage(params); + List examCenterCOS = temporaryAccessEntourageCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessQueryExe.java new file mode 100644 index 0000000..6c389cb --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/TemporaryAccessQueryExe.java @@ -0,0 +1,52 @@ +package com.zcloud.primeport.command.query; + +import com.alibaba.cola.dto.PageResponse; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.primeport.command.convertor.TemporaryAccessCoConvertor; +import com.zcloud.primeport.dto.TemporaryAccessPageQry; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; +import com.zcloud.primeport.persistence.repository.TemporaryAccessRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Component +@AllArgsConstructor +public class TemporaryAccessQueryExe { + private final TemporaryAccessRepository temporaryAccessRepository; + private final TemporaryAccessCoConvertor temporaryAccessCoConvertor; + + /** + * 根据id查询 + * + * @param id + * @return + */ + public TemporaryAccessCO queryById(Long id) { + return temporaryAccessCoConvertor.converDOToCO(temporaryAccessRepository.getById(id)); + } + + /** + * 分页 + * + * @param temporaryAccessPageQry + * @return + */ + public PageResponse execute(TemporaryAccessPageQry temporaryAccessPageQry) { + Map params = PageQueryHelper.toHashMap(temporaryAccessPageQry); + PageResponse pageResponse = temporaryAccessRepository.listPage(params); + List examCenterCOS = temporaryAccessCoConvertor.converDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessEntourageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessEntourageServiceImpl.java new file mode 100644 index 0000000..c4705a2 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessEntourageServiceImpl.java @@ -0,0 +1,64 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.TemporaryAccessEntourageServiceI; +import com.zcloud.primeport.command.TemporaryAccessEntourageAddExe; +import com.zcloud.primeport.command.TemporaryAccessEntourageRemoveExe; +import com.zcloud.primeport.command.TemporaryAccessEntourageUpdateExe; +import com.zcloud.primeport.command.query.TemporaryAccessEntourageQueryExe; +import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; +import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; +import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Service +@AllArgsConstructor +public class TemporaryAccessEntourageServiceImpl implements TemporaryAccessEntourageServiceI { + private final TemporaryAccessEntourageAddExe temporaryAccessEntourageAddExe; + private final TemporaryAccessEntourageUpdateExe temporaryAccessEntourageUpdateExe; + private final TemporaryAccessEntourageRemoveExe temporaryAccessEntourageRemoveExe; + private final TemporaryAccessEntourageQueryExe temporaryAccessEntourageQueryExe; + + @Override + public TemporaryAccessEntourageCO queryById(Long id) { + return temporaryAccessEntourageQueryExe.queryById(id); + } + + @Override + public PageResponse listPage(TemporaryAccessEntouragePageQry qry) { + + return temporaryAccessEntourageQueryExe.execute(qry); + } + + @Override + public SingleResponse add(TemporaryAccessEntourageAddCmd cmd) { + + temporaryAccessEntourageAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(TemporaryAccessEntourageUpdateCmd temporaryAccessEntourageUpdateCmd) { + temporaryAccessEntourageUpdateExe.execute(temporaryAccessEntourageUpdateCmd); + } + + @Override + public void remove(Long id) { + temporaryAccessEntourageRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + temporaryAccessEntourageRemoveExe.execute(ids); + } +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessServiceImpl.java new file mode 100644 index 0000000..f9ac53b --- /dev/null +++ b/web-app/src/main/java/com/zcloud/primeport/service/TemporaryAccessServiceImpl.java @@ -0,0 +1,64 @@ +package com.zcloud.primeport.service; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.TemporaryAccessServiceI; +import com.zcloud.primeport.command.TemporaryAccessAddExe; +import com.zcloud.primeport.command.TemporaryAccessRemoveExe; +import com.zcloud.primeport.command.TemporaryAccessUpdateExe; +import com.zcloud.primeport.command.query.TemporaryAccessQueryExe; +import com.zcloud.primeport.dto.TemporaryAccessAddCmd; +import com.zcloud.primeport.dto.TemporaryAccessPageQry; +import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * web-app + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@Service +@AllArgsConstructor +public class TemporaryAccessServiceImpl implements TemporaryAccessServiceI { + private final TemporaryAccessAddExe temporaryAccessAddExe; + private final TemporaryAccessUpdateExe temporaryAccessUpdateExe; + private final TemporaryAccessRemoveExe temporaryAccessRemoveExe; + private final TemporaryAccessQueryExe temporaryAccessQueryExe; + + @Override + public TemporaryAccessCO queryById(Long id) { + return temporaryAccessQueryExe.queryById(id); + } + + @Override + public PageResponse listPage(TemporaryAccessPageQry qry) { + + return temporaryAccessQueryExe.execute(qry); + } + + @Override + public SingleResponse add(TemporaryAccessAddCmd cmd) { + + temporaryAccessAddExe.execute(cmd); + return SingleResponse.buildSuccess(); + } + + @Override + public void edit(TemporaryAccessUpdateCmd temporaryAccessUpdateCmd) { + temporaryAccessUpdateExe.execute(temporaryAccessUpdateCmd); + } + + @Override + public void remove(Long id) { + temporaryAccessRemoveExe.execute(id); + } + + @Override + public void removeBatch(Long[] ids) { + temporaryAccessRemoveExe.execute(ids); + } +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessEntourageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessEntourageServiceI.java new file mode 100644 index 0000000..12aeed6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessEntourageServiceI.java @@ -0,0 +1,29 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.TemporaryAccessEntourageAddCmd; +import com.zcloud.primeport.dto.TemporaryAccessEntouragePageQry; +import com.zcloud.primeport.dto.TemporaryAccessEntourageUpdateCmd; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessEntourageCO; + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +public interface TemporaryAccessEntourageServiceI { + TemporaryAccessEntourageCO queryById(Long id); + + PageResponse listPage(TemporaryAccessEntouragePageQry qry); + + SingleResponse add(TemporaryAccessEntourageAddCmd cmd); + + void edit(TemporaryAccessEntourageUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessServiceI.java new file mode 100644 index 0000000..5c102fc --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/api/TemporaryAccessServiceI.java @@ -0,0 +1,29 @@ +package com.zcloud.primeport.api; + +import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.TemporaryAccessAddCmd; +import com.zcloud.primeport.dto.TemporaryAccessPageQry; +import com.zcloud.primeport.dto.TemporaryAccessUpdateCmd; +import com.zcloud.primeport.dto.clientobject.TemporaryAccessCO; + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +public interface TemporaryAccessServiceI { + TemporaryAccessCO queryById(Long id); + + PageResponse listPage(TemporaryAccessPageQry qry); + + SingleResponse add(TemporaryAccessAddCmd cmd); + + void edit(TemporaryAccessUpdateCmd cmd); + + void remove(Long id); + + void removeBatch(Long[] ids); +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java index a23ea13..f659c8e 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java @@ -22,9 +22,11 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class MkmjApprovalUserAddCmd extends Command { + @ApiModelProperty(value = "审批人类型", name = "userType", required = true) @NotNull(message = "审批人类型") private Integer userType; + @ApiModelProperty(value = "审批人部门ID", name = "deptName", required = true) @NotEmpty(message = "审批人部门ID不能为空") private String deptName; diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java index c74f43b..7c8a734 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserPageQry.java @@ -29,5 +29,13 @@ public class MkmjApprovalUserPageQry extends PageQuery { * 查询类型 (口门门禁车辆审核人1; 临时访客审核人2) */ private String eqUserType; + + public String likeUserName; + + public String likeName; + + public String eqDeptId; + + public String eqCorpId; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessAddCmd.java new file mode 100644 index 0000000..484ed40 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessAddCmd.java @@ -0,0 +1,112 @@ +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 guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TemporaryAccessAddCmd extends Command { + @ApiModelProperty(value = "审批人ID", name = "userId", required = true) + @NotNull(message = "审批人ID不能为空") + private Long userId; + + @ApiModelProperty(value = "审批人姓名", name = "userName", required = true) + @NotEmpty(message = "审批人姓名不能为空") + private String userName; + + @ApiModelProperty(value = "手机号", name = "phone", required = true) + @NotEmpty(message = "手机号不能为空") + private String phone; + + @ApiModelProperty(value = "身份证号", name = "idCard", required = true) + @NotEmpty(message = "身份证号不能为空") + private String idCard; + + @ApiModelProperty(value = "企业ID", name = "corpId", required = true) + @NotEmpty(message = "企业ID不能为空") + private String corpId; + + @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + @NotEmpty(message = "企业名称不能为空") + private String corpName; + + @ApiModelProperty(value = "部门id", name = "deptId", required = true) + @NotEmpty(message = "部门id不能为空") + private String deptId; + + @ApiModelProperty(value = "部门名称", name = "deptName", required = true) + @NotEmpty(message = "部门名称不能为空") + private String deptName; + + @ApiModelProperty(value = "车牌号", name = "carNo", required = true) + @NotEmpty(message = "车牌号不能为空") + private String carNo; + + @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)", name = "carPlantType", required = true) + @NotEmpty(message = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)不能为空") + private String carPlantType; + + @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)", name = "carType", required = true) + @NotEmpty(message = "车辆类型(0：货车，1：轿车，2：大巴客车)不能为空") + private String carType; + + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private String visitStartTime; + + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private String visitEndTime; + + @ApiModelProperty(value = "口门ID", name = "doorId", required = true) + @NotEmpty(message = "口门ID不能为空") + private String doorId; + + @ApiModelProperty(value = "口门名称", name = "doorName", required = true) + @NotEmpty(message = "口门名称不能为空") + private String doorName; + + @ApiModelProperty(value = "驾驶证照片", name = "drivingLicensePath", required = true) + @NotEmpty(message = "驾驶证照片不能为空") + private String drivingLicensePath; + + @ApiModelProperty(value = "身份证正面", name = "idCardFrontPath", required = true) + @NotEmpty(message = "身份证正面不能为空") + private String idCardFrontPath; + + @ApiModelProperty(value = "身份证反面", name = "idCardFlipsidePath", required = true) + @NotEmpty(message = "身份证反面不能为空") + private String idCardFlipsidePath; + + @ApiModelProperty(value = "访问类型(1：人员，2：车辆)", name = "temporaryType", required = true) + @NotEmpty(message = "访问类型(1：人员，2：车辆)不能为空") + private String temporaryType; + + @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)", name = "temporaryFrom", required = true) + @NotEmpty(message = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)不能为空") + private String temporaryFrom; + + @ApiModelProperty(value = "来访事由", name = "visitReason", required = true) + @NotEmpty(message = "来访事由不能为空") + private String visitReason; + + @ApiModelProperty(value = "排放标准:", name = " emissionStandards", required = true) + @NotEmpty(message = "排放标准:") + private String emissionStandards; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageAddCmd.java new file mode 100644 index 0000000..5446f25 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageAddCmd.java @@ -0,0 +1,45 @@ +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 guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TemporaryAccessEntourageAddCmd extends Command { + @ApiModelProperty(value = "${column.comment}", name = "entourageId", required = true) + @NotNull(message = "${column.comment}不能为空") + private Long entourageId; + + @ApiModelProperty(value = "临时访问表id", name = "temporaryId", required = true) + @NotNull(message = "临时访问表id不能为空") + private Long temporaryId; + + @ApiModelProperty(value = "姓名", name = "name", required = true) + @NotEmpty(message = "姓名不能为空") + private String name; + + @ApiModelProperty(value = "手机号", name = "phone", required = true) + @NotEmpty(message = "手机号不能为空") + private String phone; + + @ApiModelProperty(value = "工作单位", name = "jobName", required = true) + @NotEmpty(message = "工作单位不能为空") + private String jobName; + +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntouragePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntouragePageQry.java new file mode 100644 index 0000000..43438bf --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntouragePageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Data +public class TemporaryAccessEntouragePageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private Long likeTemporaryId; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageUpdateCmd.java new file mode 100644 index 0000000..4d157b6 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessEntourageUpdateCmd.java @@ -0,0 +1,40 @@ +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 guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TemporaryAccessEntourageUpdateCmd extends Command { + @ApiModelProperty(value = "${column.comment}", name = "entourageId", required = true) + @NotNull(message = "${column.comment}不能为空") + private Long entourageId; + @ApiModelProperty(value = "临时访问表id", name = "temporaryId", required = true) + @NotNull(message = "临时访问表id不能为空") + private Long temporaryId; + @ApiModelProperty(value = "姓名", name = "name", required = true) + @NotEmpty(message = "姓名不能为空") + private String name; + @ApiModelProperty(value = "手机号", name = "phone", required = true) + @NotEmpty(message = "手机号不能为空") + private String phone; + @ApiModelProperty(value = "工作单位", name = "jobName", required = true) + @NotEmpty(message = "工作单位不能为空") + private String jobName; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessPageQry.java new file mode 100644 index 0000000..a475313 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessPageQry.java @@ -0,0 +1,28 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.PageQuery; +import lombok.Data; + + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Data +public class TemporaryAccessPageQry extends PageQuery { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + private Long likeUserId; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessUpdateCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessUpdateCmd.java new file mode 100644 index 0000000..83ae1a7 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/TemporaryAccessUpdateCmd.java @@ -0,0 +1,94 @@ +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 guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TemporaryAccessUpdateCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotNull(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "审批人ID", name = "userId", required = true) + @NotNull(message = "审批人ID不能为空") + private Long userId; + @ApiModelProperty(value = "审批人姓名", name = "userName", required = true) + @NotEmpty(message = "审批人姓名不能为空") + private String userName; + @ApiModelProperty(value = "手机号", name = "phone", required = true) + @NotEmpty(message = "手机号不能为空") + private String phone; + @ApiModelProperty(value = "身份证号", name = "idCard", required = true) + @NotEmpty(message = "身份证号不能为空") + private String idCard; + @ApiModelProperty(value = "企业ID", name = "corpId", required = true) + @NotEmpty(message = "企业ID不能为空") + private String corpId; + @ApiModelProperty(value = "企业名称", name = "corpName", required = true) + @NotEmpty(message = "企业名称不能为空") + private String corpName; + @ApiModelProperty(value = "部门id", name = "deptId", required = true) + @NotEmpty(message = "部门id不能为空") + private String deptId; + @ApiModelProperty(value = "部门名称", name = "deptName", required = true) + @NotEmpty(message = "部门名称不能为空") + private String deptName; + @ApiModelProperty(value = "车牌号", name = "carNo", required = true) + @NotEmpty(message = "车牌号不能为空") + private String carNo; + @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)", name = "carPlantType", required = true) + @NotEmpty(message = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)不能为空") + private String carPlantType; + @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)", name = "carType", required = true) + @NotEmpty(message = "车辆类型(0：货车，1：轿车，2：大巴客车)不能为空") + private String carType; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotEmpty(message = "访问起始时间不能为空") + private String visitStartTime; + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotEmpty(message = "访问结束时间不能为空") + private String visitEndTime; + @ApiModelProperty(value = "口门ID", name = "doorId", required = true) + @NotEmpty(message = "口门ID不能为空") + private String doorId; + @ApiModelProperty(value = "口门名称", name = "doorName", required = true) + @NotEmpty(message = "口门名称不能为空") + private String doorName; + @ApiModelProperty(value = "驾驶证照片", name = "drivingLicensePath", required = true) + @NotEmpty(message = "驾驶证照片不能为空") + private String drivingLicensePath; + @ApiModelProperty(value = "身份证正面", name = "idCardFrontPath", required = true) + @NotEmpty(message = "身份证正面不能为空") + private String idCardFrontPath; + @ApiModelProperty(value = "身份证反面", name = "idCardFlipsidePath", required = true) + @NotEmpty(message = "身份证反面不能为空") + private String idCardFlipsidePath; + @ApiModelProperty(value = "访问类型(1：人员，2：车辆)", name = "temporaryType", required = true) + @NotEmpty(message = "访问类型(1：人员，2：车辆)不能为空") + private String temporaryType; + @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)", name = "temporaryFrom", required = true) + @NotEmpty(message = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)不能为空") + private String temporaryFrom; + @ApiModelProperty(value = "来访事由", name = "visitReason", required = true) + @NotEmpty(message = "来访事由不能为空") + private String visitReason; + @ApiModelProperty(value = "排放标准:", name = " emissionStandards", required = true) + @NotEmpty(message = "排放标准:") + private String emissionStandards; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java index bd81fee..23412e6 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageAddCmd.java @@ -86,6 +86,14 @@ public class VehicleMessageAddCmd extends Command { @NotEmpty(message = "附件地址不能为空") private String attachmentUrl; + public void addLongiUserCorp( String tenantParentIds){ + if (tenantParentIds != null){ + String [] corpIds = tenantParentIds.split(","); + if (corpIds.length > 0){ + this.corpId = Long.parseLong(corpIds[corpIds.length-1]); + } + } + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java index 9835bc1..f709f07 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageForCorpAddCmd.java @@ -23,6 +23,25 @@ import javax.validation.constraints.NotNull; @AllArgsConstructor public class VehicleMessageForCorpAddCmd extends Command { + + @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) + @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") + private Integer vehicleBelongType; + + @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) + @NotNull(message = "车辆所属部门id不能为空") + private Long vehicleDepartmentId; + @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) + @NotEmpty(message = "车辆所属部门名称不能为空") + private String vehicleDepartmentName; + + @ApiModelProperty(value = "车辆所属人id(员工车辆)", name = "employeeVehicleUserId", required = true) +// @NotEmpty(message = "车辆所属人id(员工车辆)不能为空") + private Long employeeVehicleUserId; + @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) +// @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") + private String employeeVehicleUserName; + @ApiModelProperty(value = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceType", required = true) @NotNull(message = "车牌类型 0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空") private Integer licenceType; @@ -31,6 +50,7 @@ public class VehicleMessageForCorpAddCmd extends Command { @NotEmpty(message = "车牌号不能为空") private String licenceNo; + @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) @NotEmpty(message = "车辆类型") private String vehicleType; @@ -38,26 +58,10 @@ public class VehicleMessageForCorpAddCmd extends Command { @NotEmpty(message = "车辆类型不能为空-名字") private String vehicleTypeName; - @ApiModelProperty(value = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆", name = "vehicleBelongType", required = true) - @NotNull(message = "车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆不能为空") - private Integer vehicleBelongType; - @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)", name = "portId", required = true) @NotNull(message = "通行港区(0-全部 1-东港区 2-西港区)不能为空") private Integer portId; - @ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true) - @NotNull(message = "车辆所属部门id不能为空") - private Long vehicleDepartmentId; - @ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true) - @NotEmpty(message = "车辆所属部门名称不能为空") - private String vehicleDepartmentName; - @ApiModelProperty(value = "车辆所属人id(员工车辆)", name = "employeeVehicleUserId", required = true) -// @NotEmpty(message = "车辆所属人id(员工车辆)不能为空") - private Long employeeVehicleUserId; - @ApiModelProperty(value = "车辆所属人姓名(员工车辆)", name = "employeeVehicleUserName", required = true) -// @NotEmpty(message = "车辆所属人姓名(员工车辆)不能为空") - private String employeeVehicleUserName; @ApiModelProperty(value = "企业ID", name = "corpinfoId", required = true) // @NotNull(message = "企业ID不能为空") private Long corpId; @@ -79,5 +83,13 @@ public class VehicleMessageForCorpAddCmd extends Command { public String approvalDeptName; + public void addLongiUserCorp( String tenantParentIds){ + if (tenantParentIds != null){ + String [] corpIds = tenantParentIds.split(","); + if (corpIds.length > 0){ + this.corpId = Long.parseLong(corpIds[corpIds.length-1]); + } + } + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java index d33825f..e26dfdb 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessagePageQry.java @@ -5,6 +5,7 @@ import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; /** @@ -28,21 +29,58 @@ public class VehicleMessagePageQry extends PageQuery { @ApiModelProperty(value = "车牌号") private String likeLicenceNo; + @ApiModelProperty(value = "车辆所属人id") + private String eqEmployeeVehicleUserId; + @ApiModelProperty(value = "车辆所属人姓名") private String liekeEmployeeVehicleUserName; @ApiModelProperty(value = "车辆所属部门id") private String eqVehicleDepartmentId; + @ApiModelProperty(value = "车辆所属部门名称") + private String liekeVehicleDepartmentName; + + + @ApiModelProperty(value = "通行港区(0-全部 1-东港区 2-西港区)") + private Integer eqPortId; + /** + * 车辆所属类型 0-员工车辆 1- 单位车辆 2-外部车辆3：货运车辆 + */ + @ApiModelProperty(value = "车辆所属类型") + private String eqVehicleBelongType; + @ApiModelProperty(value = "企业ID") private String eqCorpId; @ApiModelProperty(value = "删除状态") private String eqDeleteEnum = "FALSE" ; - + // 是否审核(0：未审核 1:审核中;2审核通过; 3：审核驳回) @ApiModelProperty(value = "是否审核") private String eqIsAudit; + + + /** + * 企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位) + */ + @ApiModelProperty(value = "企业类型") + private String isCorpType; + + /** + * 获取监管端id + * @param tenantParentIds + */ + public void setCorpByCorpType(String tenantParentIds){ + if (tenantParentIds != null){ + String [] corpIds = tenantParentIds.split(","); + if (corpIds.length > 0){ + this.eqCorpId = corpIds[corpIds.length-1]; + } + } + + } + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessCO.java new file mode 100644 index 0000000..b8ca2fa --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessCO.java @@ -0,0 +1,127 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Data +public class TemporaryAccessCO extends ClientObject { + //id + @ApiModelProperty(value = "id") + private Long id; + //审批人ID + @ApiModelProperty(value = "审批人ID") + private Long userId; + //审批人姓名 + @ApiModelProperty(value = "审批人姓名") + private String userName; + //手机号 + @ApiModelProperty(value = "手机号") + private String phone; + //身份证号 + @ApiModelProperty(value = "身份证号") + private String idCard; + //企业ID + @ApiModelProperty(value = "企业ID") + private String corpId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpName; + //部门id + @ApiModelProperty(value = "部门id") + private String deptId; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String deptName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String carNo; + //车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌) + @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)") + private String carPlantType; + //车辆类型(0：货车，1：轿车，2：大巴客车) + @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)") + private String carType; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + private String visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + private String visitEndTime; + //口门ID + @ApiModelProperty(value = "口门ID") + private String doorId; + //口门名称 + @ApiModelProperty(value = "口门名称") + private String doorName; + //驾驶证照片 + @ApiModelProperty(value = "驾驶证照片") + private String drivingLicensePath; + //身份证正面 + @ApiModelProperty(value = "身份证正面") + private String idCardFrontPath; + //身份证反面 + @ApiModelProperty(value = "身份证反面") + private String idCardFlipsidePath; + //访问类型(1：人员，2：车辆) + @ApiModelProperty(value = "访问类型(1：人员，2：车辆)") + private String temporaryType; + //访问来源(0：监管，1：企业，2：相关方，3：驻港单位) + @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)") + private String temporaryFrom; + //来访事由 + @ApiModelProperty(value = "来访事由") + private String visitReason; + //排放标准: + @ApiModelProperty(value = "排放标准:") + private String emissionStandards; + //删除标识 + @ApiModelProperty(value = "删除标识") + private String deleteEnum; + //创建时间 + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; + //更新时间 + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date updateTime; + //创建人ID + @ApiModelProperty(value = "创建人ID") + private Long createId; + //更新人ID + @ApiModelProperty(value = "更新人ID") + private Long updateId; + //环境标识 + @ApiModelProperty(value = "环境标识") + private String env; + //创建人姓名 + @ApiModelProperty(value = "创建人姓名") + private String createName; + //更新人姓名 + @ApiModelProperty(value = "更新人姓名") + private String updateName; + //租户ID + @ApiModelProperty(value = "租户ID") + private Long tenantId; + //组织ID + @ApiModelProperty(value = "组织ID") + private Long orgId; + //版本号 + @ApiModelProperty(value = "版本号") + private Integer version; + //备注 + @ApiModelProperty(value = "备注") + private String remarks; +} + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessEntourageCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessEntourageCO.java new file mode 100644 index 0000000..18bdbf5 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/TemporaryAccessEntourageCO.java @@ -0,0 +1,33 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.sql.Date; + + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@Data +public class TemporaryAccessEntourageCO extends ClientObject { + private Long entourageId; + //临时访问表id + @ApiModelProperty(value = "临时访问表id") + private Long temporaryId; + //姓名 + @ApiModelProperty(value = "姓名") + private String name; + //手机号 + @ApiModelProperty(value = "手机号") + private String phone; + //工作单位 + @ApiModelProperty(value = "工作单位") + private String jobName; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessEntourageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessEntourageGateway.java new file mode 100644 index 0000000..69364d9 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessEntourageGateway.java @@ -0,0 +1,29 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; +/** + * web-domain + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +public interface TemporaryAccessEntourageGateway { + + /** + * 新增 + */ + Boolean add(TemporaryAccessEntourageE temporaryAccessEntourageE); + + /** + * 修改 + */ + Boolean update(TemporaryAccessEntourageE temporaryAccessEntourageE); + + /** + * 删除 + */ + Boolean deletedTemporaryAccessEntourageById(Long id); + + Boolean deletedTemporaryAccessEntourageByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessGateway.java new file mode 100644 index 0000000..e248717 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/TemporaryAccessGateway.java @@ -0,0 +1,30 @@ +package com.zcloud.primeport.domain.gateway; + +import com.zcloud.primeport.domain.model.TemporaryAccessE; + +/** + * web-domain + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +public interface TemporaryAccessGateway { + + /** + * 新增 + */ + Boolean add(TemporaryAccessE temporaryAccessE); + + /** + * 修改 + */ + Boolean update(TemporaryAccessE temporaryAccessE); + + /** + * 删除 + */ + Boolean deletedTemporaryAccessById(Long id); + + Boolean deletedTemporaryAccessByIds(Long[] id); +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java index 30c432f..911757c 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleBlackGateway.java @@ -26,5 +26,11 @@ public interface VehicleBlackGateway { Boolean deletedVehicleBlackById(Long id); Boolean deletedVehicleBlackByIds(Long[] id); + + /** + * 详情 + */ + VehicleBlackE getInfoById(Long id); + } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java index 57a1279..182de3f 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java @@ -30,5 +30,12 @@ public interface VehicleMessageGateway { */ VehicleMessageE getInfoById(Long id); + /** + * 根据车牌查询车辆信息 + * @param licenceNo + * @return + */ + VehicleMessageE getInfoByLicenceNo(String licenceNo); + } diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessE.java new file mode 100644 index 0000000..858b58d --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessE.java @@ -0,0 +1,59 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** + * web-domain + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Data +public class TemporaryAccessE extends BaseE { + //审批人ID + private Long userId; + //审批人姓名 + private String userName; + //手机号 + private String phone; + //身份证号 + private String idCard; + //企业ID + private String corpId; + //企业名称 + private String corpName; + //部门id + private String deptId; + //部门名称 + private String deptName; + //车牌号 + private String carNo; + //车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌) + private String carPlantType; + //车辆类型(0：货车，1：轿车，2：大巴客车) + private String carType; + //访问起始时间 + private String visitStartTime; + //访问结束时间 + private String visitEndTime; + //口门ID + private String doorId; + //口门名称 + private String doorName; + //驾驶证照片 + private String drivingLicensePath; + //身份证正面 + private String idCardFrontPath; + //身份证反面 + private String idCardFlipsidePath; + //访问类型(1：人员，2：车辆) + private String temporaryType; + //访问来源(0：监管，1：企业，2：相关方，3：驻港单位) + private String temporaryFrom; + //来访事由 + private String visitReason; + //排放标准: + private String emissionStandards; +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessEntourageE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessEntourageE.java new file mode 100644 index 0000000..0d6194a --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/TemporaryAccessEntourageE.java @@ -0,0 +1,24 @@ +package com.zcloud.primeport.domain.model; + +import com.jjb.saas.framework.domain.model.BaseE; +import lombok.Data; + +/** + * web-domain + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Data +public class TemporaryAccessEntourageE extends BaseE { + private Long entourageId; + //临时访问表id + private Long temporaryId; + //姓名 + private String name; + //手机号 + private String phone; + //工作单位 + private String jobName; +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessEntourageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessEntourageGatewayImpl.java new file mode 100644 index 0000000..6251fcf --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessEntourageGatewayImpl.java @@ -0,0 +1,51 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.primeport.domain.gateway.TemporaryAccessEntourageGateway; +import com.zcloud.primeport.domain.model.TemporaryAccessEntourageE; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; +import com.zcloud.primeport.persistence.repository.TemporaryAccessEntourageRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Service +@AllArgsConstructor +public class TemporaryAccessEntourageGatewayImpl implements TemporaryAccessEntourageGateway { + private final TemporaryAccessEntourageRepository temporaryAccessEntourageRepository; + + @Override + public Boolean add(TemporaryAccessEntourageE temporaryAccessEntourageE) { + TemporaryAccessEntourageDO d = new TemporaryAccessEntourageDO(); + BeanUtils.copyProperties(temporaryAccessEntourageE, d, "${uuid}"); + temporaryAccessEntourageRepository.save(d); + return true; + } + + @Override + public Boolean update(TemporaryAccessEntourageE temporaryAccessEntourageE) { + TemporaryAccessEntourageDO d = new TemporaryAccessEntourageDO(); + BeanUtils.copyProperties(temporaryAccessEntourageE, d); + temporaryAccessEntourageRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedTemporaryAccessEntourageById(Long id) { + return temporaryAccessEntourageRepository.removeById(id); + } + + @Override + public Boolean deletedTemporaryAccessEntourageByIds(Long[] ids) { + return temporaryAccessEntourageRepository.removeByIds(Arrays.asList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessGatewayImpl.java new file mode 100644 index 0000000..b3e656c --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/TemporaryAccessGatewayImpl.java @@ -0,0 +1,50 @@ +package com.zcloud.primeport.gatewayimpl; + +import com.zcloud.primeport.domain.gateway.TemporaryAccessGateway; +import com.zcloud.primeport.domain.model.TemporaryAccessE; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; +import com.zcloud.primeport.persistence.repository.TemporaryAccessRepository; +import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.Arrays; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Service +@AllArgsConstructor +public class TemporaryAccessGatewayImpl implements TemporaryAccessGateway { + private final TemporaryAccessRepository temporaryAccessRepository; + + @Override + public Boolean add(TemporaryAccessE temporaryAccessE) { + TemporaryAccessDO d = new TemporaryAccessDO(); + BeanUtils.copyProperties(temporaryAccessE, d, "${uuid}"); + temporaryAccessRepository.save(d); + return true; + } + + @Override + public Boolean update(TemporaryAccessE temporaryAccessE) { + TemporaryAccessDO d = new TemporaryAccessDO(); + BeanUtils.copyProperties(temporaryAccessE, d); + temporaryAccessRepository.updateById(d); + return true; + } + + @Override + public Boolean deletedTemporaryAccessById(Long id) { + return temporaryAccessRepository.removeById(id); + } + + @Override + public Boolean deletedTemporaryAccessByIds(Long[] ids) { + return temporaryAccessRepository.removeByIds(Arrays.asList(ids)); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java index d1a1776..3df8994 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleBlackGatewayImpl.java @@ -50,5 +50,13 @@ public class VehicleBlackGatewayImpl implements VehicleBlackGateway { public Boolean deletedVehicleBlackByIds(Long[] ids) { return vehicleBlackRepository.removeByIds(Arrays.asList(ids)); } + + @Override + public VehicleBlackE getInfoById(Long id) { + VehicleBlackDO blackDO = vehicleBlackRepository.getById(id); + VehicleBlackE vehicleBlackE = new VehicleBlackE(); + BeanUtils.copyProperties( blackDO,vehicleBlackE); + return vehicleBlackE; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java index ecf665f..a4cc327 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java @@ -59,5 +59,13 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { BeanUtils.copyProperties(repositoryById, vehicleMessageE); return vehicleMessageE; } + + @Override + public VehicleMessageE getInfoByLicenceNo(String licenceNo) { + VehicleMessageDO repositoryOne = vehicleMessageRepository.getByLicenceNo(licenceNo); + VehicleMessageE vehicleMessageE = new VehicleMessageE(); + BeanUtils.copyProperties(repositoryOne, vehicleMessageE); + return vehicleMessageE; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessDO.java new file mode 100644 index 0000000..6531954 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessDO.java @@ -0,0 +1,94 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Data +@TableName("temporary_access") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class TemporaryAccessDO extends BaseDO { + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //审批人ID + @ApiModelProperty(value = "审批人ID") + private Long userId; + //审批人姓名 + @ApiModelProperty(value = "审批人姓名") + private String userName; + //手机号 + @ApiModelProperty(value = "手机号") + private String phone; + //身份证号 + @ApiModelProperty(value = "身份证号") + private String idCard; + //企业ID + @ApiModelProperty(value = "企业ID") + private String corpId; + //企业名称 + @ApiModelProperty(value = "企业名称") + private String corpName; + //部门id + @ApiModelProperty(value = "部门id") + private String deptId; + //部门名称 + @ApiModelProperty(value = "部门名称") + private String deptName; + //车牌号 + @ApiModelProperty(value = "车牌号") + private String carNo; + //车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌) + @ApiModelProperty(value = "车牌类型(0：白牌，1：蓝牌，2：黄牌，3：绿牌，4：黑牌)") + private String carPlantType; + //车辆类型(0：货车，1：轿车，2：大巴客车) + @ApiModelProperty(value = "车辆类型(0：货车，1：轿车，2：大巴客车)") + private String carType; + //访问起始时间 + @ApiModelProperty(value = "访问起始时间") + private String visitStartTime; + //访问结束时间 + @ApiModelProperty(value = "访问结束时间") + private String visitEndTime; + //口门ID + @ApiModelProperty(value = "口门ID") + private String doorId; + //口门名称 + @ApiModelProperty(value = "口门名称") + private String doorName; + //驾驶证照片 + @ApiModelProperty(value = "驾驶证照片") + private String drivingLicensePath; + //身份证正面 + @ApiModelProperty(value = "身份证正面") + private String idCardFrontPath; + //身份证反面 + @ApiModelProperty(value = "身份证反面") + private String idCardFlipsidePath; + //访问类型(1：人员，2：车辆) + @ApiModelProperty(value = "访问类型(1：人员，2：车辆)") + private String temporaryType; + //访问来源(0：监管，1：企业，2：相关方，3：驻港单位) + @ApiModelProperty(value = "访问来源(0：监管，1：企业，2：相关方，3：驻港单位)") + private String temporaryFrom; + //来访事由 + @ApiModelProperty(value = "来访事由") + private String visitReason; + //排放标准: + @ApiModelProperty(value = "排放标准:") + private String emissionStandards; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessEntourageDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessEntourageDO.java new file mode 100644 index 0000000..0f27ff6 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/TemporaryAccessEntourageDO.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.persistence.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jjb.saas.framework.repository.basedo.BaseDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Data +@TableName("temporary_access_entourage") +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class TemporaryAccessEntourageDO extends BaseDO { + @TableId(type = IdType.ASSIGN_ID) + private Long id; + //临时访问表id + @ApiModelProperty(value = "临时访问表id") + private Long temporaryId; + //姓名 + @ApiModelProperty(value = "姓名") + private String name; + //手机号 + @ApiModelProperty(value = "手机号") + private String phone; + //工作单位 + @ApiModelProperty(value = "工作单位") + private String jobName; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessEntourageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessEntourageMapper.java new file mode 100644 index 0000000..6408a64 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessEntourageMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Mapper +public interface TemporaryAccessEntourageMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessMapper.java new file mode 100644 index 0000000..baac596 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/TemporaryAccessMapper.java @@ -0,0 +1,17 @@ +package com.zcloud.primeport.persistence.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:14 + */ +@Mapper +public interface TemporaryAccessMapper extends BaseMapper { + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessEntourageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessEntourageRepository.java new file mode 100644 index 0000000..c45a15d --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessEntourageRepository.java @@ -0,0 +1,19 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +public interface TemporaryAccessEntourageRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessRepository.java new file mode 100644 index 0000000..fb13683 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/TemporaryAccessRepository.java @@ -0,0 +1,18 @@ +package com.zcloud.primeport.persistence.repository; + +import com.alibaba.cola.dto.PageResponse; +import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +public interface TemporaryAccessRepository extends BaseRepository { + PageResponse listPage(Map params); +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java index 1e44737..2e701aa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleMessageRepository.java @@ -28,4 +28,5 @@ public interface VehicleMessageRepository extends BaseRepository listPageFromViolations(Map parmas); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessEntourageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessEntourageRepositoryImpl.java new file mode 100644 index 0000000..dbb8157 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessEntourageRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessEntourageDO; +import com.zcloud.primeport.persistence.mapper.TemporaryAccessEntourageMapper; +import com.zcloud.primeport.persistence.repository.TemporaryAccessEntourageRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:16 + */ +@Service +@RequiredArgsConstructor +public class TemporaryAccessEntourageRepositoryImpl extends BaseRepositoryImpl implements TemporaryAccessEntourageRepository { + private final TemporaryAccessEntourageMapper temporaryAccessEntourageMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = temporaryAccessEntourageMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessRepositoryImpl.java new file mode 100644 index 0000000..3f56dd5 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/TemporaryAccessRepositoryImpl.java @@ -0,0 +1,39 @@ +package com.zcloud.primeport.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.primeport.persistence.dataobject.TemporaryAccessDO; +import com.zcloud.primeport.persistence.mapper.TemporaryAccessMapper; +import com.zcloud.primeport.persistence.repository.TemporaryAccessRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-24 08:50:15 + */ +@Service +@RequiredArgsConstructor +public class TemporaryAccessRepositoryImpl extends BaseRepositoryImpl implements TemporaryAccessRepository { + private final TemporaryAccessMapper temporaryAccessMapper; + + @Override + public PageResponse listPage(Map params) { + IPage iPage = new Query().getPage(params); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.orderByDesc("create_time"); + IPage result = temporaryAccessMapper.selectPage(iPage, queryWrapper); + return PageHelper.pageToResponse(result, result.getRecords()); + } +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java index 3551305..016ce57 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleMessageRepositoryImpl.java @@ -34,6 +34,7 @@ public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper.orderByAsc("is_audit"); IPage result = vehicleMessageMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -56,6 +57,7 @@ public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("licence_no", licenceNo); + queryWrapper.eq("delete_enum", "FALSE"); return vehicleMessageMapper.selectOne(queryWrapper); } @@ -70,5 +72,7 @@ public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl iPage = vehicleMessageMapper.listFroViolations(page, parmas); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } + + } diff --git a/web-infrastructure/src/main/resources/mapper/TemporaryAccessEntourageMapper.xml b/web-infrastructure/src/main/resources/mapper/TemporaryAccessEntourageMapper.xml new file mode 100644 index 0000000..0997c61 --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/TemporaryAccessEntourageMapper.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/web-infrastructure/src/main/resources/mapper/TemporaryAccessMapper.xml b/web-infrastructure/src/main/resources/mapper/TemporaryAccessMapper.xml new file mode 100644 index 0000000..cf6472c --- /dev/null +++ b/web-infrastructure/src/main/resources/mapper/TemporaryAccessMapper.xml @@ -0,0 +1,8 @@ + + + + + + +