From 65d664b12a401870efe40c3b4e9fe8ac2fb3d44c Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 20 Mar 2026 16:14:27 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8F=82=E6=95=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../close/ClosedAreaCarApplyController.java | 1 + .../web/close/ClosedTmpApplyController.java | 69 ++++++++++ .../ClosedAreaCarApplyServiceImpl.java | 20 ++- .../api/ClosedAreaCarApplyServiceI.java | 7 +- .../dto/ClosedAreaCarApplyAddCmd.java | 6 +- .../dto/ClosedAreaCarApplyAuditCmd.java | 30 ++++ .../primeport/dto/ClosedTmpApplyAddCmd.java | 128 ++++++++++++++++++ .../primeport/domain/enums/TmpApplyEnum.java | 25 ++++ .../mapper/ClosedAreaCarApplyMapper.java | 3 +- .../persistence/mapper/ClosedAreaMapper.java | 3 +- .../mapper/ClosedAreaPersonApplyMapper.java | 5 +- .../mapper/MkmjApprovalUserMapper.java | 3 +- .../persistence/mapper/MkmjGateMapper.java | 3 +- .../persistence/mapper/MkmjMapper.java | 3 +- .../persistence/mapper/MkmjPassageMapper.java | 3 +- .../persistence/mapper/PersonApplyMapper.java | 5 +- .../mapper/VehicleApplyMapper.java | 3 +- .../mapper/VehicleAuditMapper.java | 5 +- .../mapper/VehicleBlackMapper.java | 3 +- .../mapper/VehicleViolationsMapper.java | 3 +- .../mapper/XgfApplyPersonMapper.java | 7 +- .../ClosedAreaCarApplyRepository.java | 2 +- .../ClosedAreaPersonApplyRepository.java | 2 +- .../MkmjApprovalUserRepository.java | 2 +- .../repository/MkmjGateRepository.java | 2 +- .../repository/MkmjPassageRepository.java | 2 +- .../repository/MkmjRepository.java | 2 +- .../repository/PersonApplyRepository.java | 4 +- .../repository/PersonMessageRepository.java | 2 +- .../repository/VehicleApplyRepository.java | 4 +- .../repository/VehicleAuditRepository.java | 4 +- .../repository/VehicleBlackRepository.java | 2 +- .../repository/VehicleMessageRepository.java | 2 +- .../VehicleViolationsRepository.java | 4 +- .../repository/VideoRepository.java | 2 +- .../repository/XgfApplyPersonRepository.java | 6 +- .../ClosedAreaCarApplyRepositoryImpl.java | 2 +- .../ClosedAreaPersonApplyRepositoryImpl.java | 14 +- .../impl/ClosedAreaRepositoryImpl.java | 2 +- .../impl/MkmjApprovalUserRepositoryImpl.java | 12 +- .../impl/MkmjGateRepositoryImpl.java | 12 +- .../impl/MkmjPassageRepositoryImpl.java | 10 +- .../repository/impl/MkmjRepositoryImpl.java | 10 +- .../impl/PersonApplyRepositoryImpl.java | 24 ++-- .../impl/PersonMessageRepositoryImpl.java | 6 +- .../impl/VehicleApplyRepositoryImpl.java | 22 +-- .../impl/VehicleAuditRepositoryImpl.java | 26 ++-- .../impl/VehicleBlackRepositoryImpl.java | 8 +- .../impl/VehicleMessageRepositoryImpl.java | 6 +- .../impl/VehicleViolationsRepositoryImpl.java | 12 +- .../repository/impl/VideoRepositoryImpl.java | 6 +- .../impl/XgfApplyPersonRepositoryImpl.java | 30 ++-- .../resources/mapper/ClosedAreaMapper.xml | 8 +- .../mapper/ClosedAreaPersonApplyMapper.xml | 24 ++-- .../resources/mapper/MkmjApprovalUserDO.xml | 10 +- .../src/main/resources/mapper/MkmjDO.xml | 20 +-- .../src/main/resources/mapper/MkmjGateDO.xml | 24 ++-- .../main/resources/mapper/MkmjPassageDO.xml | 16 +-- .../main/resources/mapper/PersonApplyDO.xml | 10 +- .../main/resources/mapper/VehicleApplyDO.xml | 54 ++++---- .../main/resources/mapper/VehicleAuditDO.xml | 48 +++---- .../main/resources/mapper/VehicleBlackDO.xml | 16 +-- .../resources/mapper/XgfApplyPersonDO.xml | 62 ++++----- 63 files changed, 573 insertions(+), 298 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAuditCmd.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java create mode 100644 web-domain/src/main/java/com/zcloud/primeport/domain/enums/TmpApplyEnum.java diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java index 4d5ed0a..08cd08f 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedAreaCarApplyController.java @@ -38,6 +38,7 @@ public class ClosedAreaCarApplyController { @ApiOperation("分页") @PostMapping("/list") + // todo 完善申请人查询，审批人查询 数据权限 public PageResponse page(@RequestBody ClosedAreaCarApplyPageQry qry) { return closedAreaCarApplyService.listPage(qry); } 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 new file mode 100644 index 0000000..b06669f --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/close/ClosedTmpApplyController.java @@ -0,0 +1,69 @@ +package com.zcloud.primeport.web.close; + + +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.zcloud.primeport.api.ClosedAreaCarApplyServiceI; +import com.zcloud.primeport.api.ClosedAreaPersonApplyServiceI; +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.clientobject.ClosedAreaCarApplyCO; +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.HashMap; + +/** + * web-adapter + * + * @Author dearLin + * @Date 2026-03-20 10:07:13 + */ +@Api(tags = "封闭区域-临时人员-车辆申请") +@RequestMapping("/${application.gateway}/closedTmpApply") +@RestController +@AllArgsConstructor +public class ClosedTmpApplyController { + private final ClosedAreaCarApplyServiceI closedAreaCarApplyService; + private final ClosedAreaPersonApplyServiceI closedAreaPersonApplyServiceI; + + @ApiOperation("新增") + @PostMapping("/save") + public SingleResponse> add(@Validated @RequestBody ClosedTmpApplyAddCmd cmd) { + Long id = 0L; + if (cmd.getTmpApplyType().equals(TmpApplyEnum.PERSON_APPLY.getCode())) { + if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_PERSON_APPLY.getCode())) { + } + if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_PERSON_APPLY.getCode())) { + } + } + if (cmd.getTmpApplyType().equals(TmpApplyEnum.CAR_APPLY.getCode())) { + if (cmd.getTmpMkmjType().equals(TmpApplyEnum.ONE_LEVEL_CAR_APPLY.getCode())) { + } + if (cmd.getTmpMkmjType().equals(TmpApplyEnum.TWO_LEVEL_CAR_APPLY.getCode())) { + id = closedAreaCarApplyService.saveTmpCarApply(cmd); + } + } + HashMap stringLongHashMap = new HashMap<>(); + stringLongHashMap.put("id", id); + stringLongHashMap.put("tmpApplyType", cmd.getTmpApplyType()); + stringLongHashMap.put("tmpMkmjType", cmd.getTmpApplyType()); + return SingleResponse.of(stringLongHashMap); + } + + @ApiOperation("详情") + @GetMapping("/{id}") + public SingleResponse getInfoById(@PathVariable("id") Long id) { + return SingleResponse.of(closedAreaCarApplyService.queryById(id)); + } + +} + diff --git a/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java index ef01590..9d784fc 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/ClosedAreaCarApplyServiceImpl.java @@ -5,10 +5,8 @@ import com.zcloud.primeport.command.ClosedAreaCarApplyAddExe; import com.zcloud.primeport.command.ClosedAreaCarApplyRemoveExe; import com.zcloud.primeport.command.ClosedAreaCarApplyUpdateExe; import com.zcloud.primeport.command.query.ClosedAreaCarApplyQueryExe; -import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd; -import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd; -import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry; -import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd; +import com.zcloud.primeport.domain.enums.CloseCarBelongTypeEnum; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; import com.alibaba.cola.dto.PageResponse; @@ -67,5 +65,19 @@ public class ClosedAreaCarApplyServiceImpl implements ClosedAreaCarApplyServiceI public void auditCarApply(ClosedAreaCarApplyAuditCmd auditCmd) { closedAreaCarApplyUpdateExe.auditCarApply(auditCmd); } + + @Override + public Long saveTmpCarApply(ClosedTmpApplyAddCmd cmd) { + ClosedAreaCarApplyAddCmd closedAreaCarApplyAddCmd = new ClosedAreaCarApplyAddCmd(); +// BeanUtils + closedAreaCarApplyAddCmd.setCarBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode()); +// ClosedAreaCarApplyAddCmd.builder() +// .carBelongType(CloseCarBelongTypeEnum.TEMPORARY_VEHICLES.getCode()) +// . +// + + + return 0L; + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java index 2833e76..7cc31f7 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/ClosedAreaCarApplyServiceI.java @@ -1,9 +1,6 @@ package com.zcloud.primeport.api; -import com.zcloud.primeport.dto.ClosedAreaCarApplyAddCmd; -import com.zcloud.primeport.dto.ClosedAreaCarApplyAuditCmd; -import com.zcloud.primeport.dto.ClosedAreaCarApplyPageQry; -import com.zcloud.primeport.dto.ClosedAreaCarApplyUpdateCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.ClosedAreaCarApplyCO; import com.alibaba.cola.dto.PageResponse; @@ -29,5 +26,7 @@ public interface ClosedAreaCarApplyServiceI { void removeBatch(Long[] ids); void auditCarApply(ClosedAreaCarApplyAuditCmd auditCmd); + + Long saveTmpCarApply(ClosedTmpApplyAddCmd cmd); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java index 2e2e3f2..b2d03c7 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAddCmd.java @@ -2,10 +2,7 @@ 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 lombok.*; import javax.validation.constraints.*; @@ -19,6 +16,7 @@ import javax.validation.constraints.*; @Data @NoArgsConstructor @AllArgsConstructor +@Builder public class ClosedAreaCarApplyAddCmd extends Command { @ApiModelProperty(value = "申请归属1股份2分公司3相关方4临时人员5分公司内部车辆", name = "carBelongType", required = true) @NotNull(message = "申请归属1股份2分公司3相关方4临时人员不能为空") diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAuditCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAuditCmd.java new file mode 100644 index 0000000..0090c0f --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedAreaCarApplyAuditCmd.java @@ -0,0 +1,30 @@ +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.NotNull; + +/** + * web-client + * + * @Author dearLin + * @Date 2026-03-20 10:07:15 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ClosedAreaCarApplyAuditCmd extends Command { + @ApiModelProperty(value = "主键", name = "id", required = true) + @NotNull(message = "主键不能为空") + private Long id; + @ApiModelProperty(value = "审核状态2审核通过; 3：审核驳回", name = "auditFlag", required = true) + private Integer auditFlag; + @ApiModelProperty(value = "驳回原因", name = "refusalReason", required = true) + private String refusalReason; +} diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java new file mode 100644 index 0000000..0933d90 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/ClosedTmpApplyAddCmd.java @@ -0,0 +1,128 @@ +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 dearLin + * @Date 2026-03-20 10:07:13 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ClosedTmpApplyAddCmd extends Command { + // 人或者车 + @ApiModelProperty(value = "临时申请类型PERSON_APPLY，CAR_APPLY不能为空", name = "tmpApplyType", required = true) + @NotNull(message = "临时申请类型 PERSON_APPLY，CAR_APPLY 不能为空") + private String tmpApplyType; + @ApiModelProperty(value = "临时口门类型LEVEL_ONE 一级，LEVEL_TOW 二级不能为空", name = "tmpMkmjType", required = true) + @NotNull(message = "临时口门类型LEVEL_ONE 一级，LEVEL_TOW 二级不能为空") + private String tmpMkmjType; + + // 审批通用 + @ApiModelProperty(value = "审批人员所属企业ID", name = "auditPersonCorpId", required = true) + @NotNull(message = "审批人员所属企业ID不能为空") + private Long auditPersonCorpId; + + @ApiModelProperty(value = "审批人员所属企业名称", name = "auditPersonCorpName", required = true) + @NotEmpty(message = "审批人员所属企业名称不能为空") + private String auditPersonCorpName; + + @ApiModelProperty(value = "审批人员所属部门id", name = "auditPersonDepartmentId", required = true) + @NotNull(message = "审批人员所属部门id不能为空") + private Long auditPersonDepartmentId; + + @ApiModelProperty(value = "审批人员部门名称", name = "auditPersonDepartmentName", required = true) + @NotEmpty(message = "审批人员部门名称不能为空") + private String auditPersonDepartmentName; + + @ApiModelProperty(value = "审批人员id", name = "auditPersonUserId", required = true) + @NotNull(message = "审批人员id不能为空") + private Long auditPersonUserId; + + @ApiModelProperty(value = "审批人员姓名", name = "auditPersonUserName", required = true) + @NotEmpty(message = "审批人员姓名不能为空") + private String auditPersonUserName; + + // 通用 + @ApiModelProperty(value = "申请人员姓名", name = "applyPersonUserName", required = true) + private String applyPersonUserName; + //申请人头像 + @ApiModelProperty(value = "申请人头像", name = "userFaceUrl", required = true) + private String userFaceUrl; + //申请人手机号 + @ApiModelProperty(value = "申请人手机号", name = "userPhone", required = true) + private String userPhone; + //申请人身份证号码 + @ApiModelProperty(value = "申请人身份证号码", name = "userCard", required = true) + private String userCard; + @ApiModelProperty(value = "申请理由", name = "applyReason", required = true) + @NotEmpty(message = "申请理由不能为空") + private String applyReason; + @ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true) + @NotNull(message = "访问起始时间不能为空") + private String visitStartTime; + + @ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true) + @NotNull(message = "访问结束时间不能为空") + private String visitEndTime; + + @ApiModelProperty(value = "所属港区", name = "hgAuthArea", required = true) + @NotEmpty(message = "所属港区不能为空") + private String hgAuthArea; + @ApiModelProperty(value = "所属港区名称", name = "hgAuthAreaName", required = true) + @NotEmpty(message = "所属港区名称不能为空") + private String hgAuthAreaName; + + + @ApiModelProperty(value = "一级口门id", name = "levelOneMkmjId", required = true) + private Long levelOneMkmjId; + @ApiModelProperty(value = "一级口门名称", name = "levelOneMkmjName", required = true) + @NotEmpty(message = "一级口门名称不能为空") + private String levelOneMkmjName; + + @ApiModelProperty(value = "告知签字", name = "informSignId", required = true) + @NotNull(message = "告知签字不能为空") + private Long informSignId; + // 临时人申请 + @ApiModelProperty(value = "区域管辖单位名id", name = "jurisdictionalCorpId", required = true) + private Long jurisdictionalCorpId; + @ApiModelProperty(value = "区域管辖单位名称", name = "jurisdictionalCorpName", required = true) + private String jurisdictionalCorpName; + @ApiModelProperty(value = "封闭区域id", name = "closedAreaId", required = true) + private Long closedAreaId; + @ApiModelProperty(value = "封闭区域名称", name = "closedAreaName", required = true) + private String closedAreaName; + @ApiModelProperty(value = "二级口门id(封闭区域口门)", name = "levelTwoMkmjId", required = true) + private Long levelTwoMkmjId; + @ApiModelProperty(value = "二级口门id(封闭区域口门)", name = "levelTwoMkmjName", required = true) + private String levelTwoMkmjName; + + // 临时车 + @ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true) + private String licenceType; + @ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true) + private String licenceTypeName; + @ApiModelProperty(value = "车牌号", name = "licenceNo", required = true) + private String licenceNo; + @ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true) + private String vehicleType; + @ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true) + private String vehicleTypeName; + @ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true) + private String drivingLicenseId; + @ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true) + private String attachmentId; + +} + diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/TmpApplyEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/TmpApplyEnum.java new file mode 100644 index 0000000..71b270a --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/TmpApplyEnum.java @@ -0,0 +1,25 @@ +package com.zcloud.primeport.domain.enums; + +public enum TmpApplyEnum { + CAR_APPLY("CAR_APPLY", "临时车辆申请"), + PERSON_APPLY("PERSON_APPLY", "临时人申请"), + ONE_LEVEL_CAR_APPLY("ONE_LEVEL_CAR_APPLY", "一级临时车"), + ONE_LEVEL_PERSON_APPLY("ONE_PERSON_APPLY", "一级临时人"), + TWO_LEVEL_PERSON_APPLY("TWO_LEVEL_PERSON_APPLY", "二级临时人"), + TWO_LEVEL_CAR_APPLY("TWO_LEVEL_CAR_APPLY", "二级临时车"); + private String code; + private String desc; + + TmpApplyEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java index cbbade3..b32f7aa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -17,6 +18,6 @@ import java.util.Map; @Mapper public interface ClosedAreaCarApplyMapper extends BaseMapper { - IPage listPage(Page> page, Map params, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java index 109e974..160d2c5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zcloud.primeport.persistence.dataobject.ClosedAreaDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -19,6 +20,6 @@ public interface ClosedAreaMapper extends BaseMapper { List getCountByHgAuthArea(); - IPage listPage(IPage iPage, Map params); + IPage listPage(IPage iPage, @Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java index b33cc1c..021774e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java @@ -6,6 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zcloud.primeport.persistence.dataobject.UserDto; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -17,8 +18,8 @@ import java.util.Map; @Mapper public interface ClosedAreaPersonApplyMapper extends BaseMapper { - IPage getCorpUserList(IPage iPage, Map params); + IPage getCorpUserList(IPage iPage, @Param("params") Map params); - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java index 1efdf35..efe46e5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjApprovalUserMapper.java @@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -22,6 +23,6 @@ import java.util.Map; ) public interface MkmjApprovalUserMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java index 8f70376..1285195 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjGateMapper.java @@ -7,6 +7,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -17,6 +18,6 @@ import java.util.Map; @Mapper public interface MkmjGateMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java index fb52883..46bcd00 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java @@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -22,6 +23,6 @@ import java.util.Map; ) public interface MkmjMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java index 148c0e9..e082a4d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjPassageMapper.java @@ -7,9 +7,10 @@ import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; @Mapper public interface MkmjPassageMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java index 68e3515..d613f14 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java @@ -8,6 +8,7 @@ import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -18,8 +19,8 @@ import java.util.Map; @Mapper public interface PersonApplyMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); - IPage xgfPersonPermissionsList(Page> page, Map parmas, String menuPerms); + IPage xgfPersonPermissionsList(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index b7a1286..ad56dd0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.HashMap; import java.util.Map; @@ -19,7 +20,7 @@ import java.util.Map; @Mapper public interface VehicleApplyMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); IPage fgsCount(Page> page, HashMap qry); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java index 666dc2d..e9817b5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java @@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -22,7 +23,7 @@ import java.util.Map; ) public interface VehicleAuditMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); - IPage carApprovalLogByvehicleApplyIdList(Page> page, Map parmas); + IPage carApprovalLogByvehicleApplyIdList(Page> page, @Param("params") Map params); } \ No newline at end of file diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java index d120f01..55cb25e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleBlackMapper.java @@ -8,6 +8,7 @@ import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -20,6 +21,6 @@ public interface VehicleBlackMapper extends BaseMapper { VehicleBlackDO getInfoById(Long id); - IPage listPage(Page> page, Map parmas); + IPage listPage(Page> page, @Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java index f91d13c..05433c7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleViolationsMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -18,7 +19,7 @@ import java.util.Map; @Mapper public interface VehicleViolationsMapper extends BaseMapper { - IPage violationRecordslistPage(Page> page, Map parmas); + IPage violationRecordslistPage(Page> page, @Param("params") Map params); List listVehicleViolationByLicenceNo(String licenceNo); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java index c3bc81b..da33168 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/XgfApplyPersonMapper.java @@ -9,6 +9,7 @@ import com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO; import org.apache.ibatis.annotations.Mapper; import java.util.Map; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -18,11 +19,11 @@ import java.util.Map; */ @Mapper public interface XgfApplyPersonMapper extends BaseMapper { - IPage listPage(Page> page, Map parmas, String menuPerms); + IPage listPage(Page> page, @Param("params") Map params, String menuPerms); - IPage xgfPersonAuditList(Page> page, Map parmas, String menuPerms); + IPage xgfPersonAuditList(Page> page, @Param("params") Map params, String menuPerms); - IPage personnelVehicleManagementList(Page> page, Map parmas, String menuPerms); + IPage personnelVehicleManagementList(Page> page, @Param("params") Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java index 9b2a926..a8ce9c2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java @@ -13,6 +13,6 @@ import java.util.Map; * @Date 2026-03-20 10:07:14 */ public interface ClosedAreaCarApplyRepository extends BaseRepository { - PageResponse listPage(Map params); + PageResponse listPage(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java index 16c63a3..27efc46 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java @@ -15,6 +15,6 @@ import java.util.Map; public interface ClosedAreaPersonApplyRepository extends BaseRepository { PageResponse listPage(Map params); - PageResponse getCorpUserList(Map params); + PageResponse getCorpUserList(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java index 48d6fd8..66e09f0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjApprovalUserRepository.java @@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjApprovalUserDO; import java.util.Map; public interface MkmjApprovalUserRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); Integer countByMkmjId(Long mkmjId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateRepository.java index a499473..c64b7a9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjGateRepository.java @@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjGateDO; import java.util.Map; public interface MkmjGateRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); Integer countByMkmjId(Long mkmjId); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java index 6747f44..4374ca8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjPassageRepository.java @@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjPassageDO; import java.util.Map; public interface MkmjPassageRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); Integer countByMkmjId(Long mkmjId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java index ccf9d5b..9693768 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java @@ -7,7 +7,7 @@ import com.zcloud.primeport.persistence.dataobject.MkmjDO; import java.util.Map; public interface MkmjRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); Boolean checkName(String mkmjName, Long excludeId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java index 4e83d98..1fdb22b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java @@ -12,8 +12,8 @@ import java.util.Map; * @Date 2026-03-05 11:33:22 */ public interface PersonApplyRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); - PageResponse xgfPersonPermissionsList(Map parmas); + PageResponse xgfPersonPermissionsList(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonMessageRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonMessageRepository.java index 8bab59a..3bebfaa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonMessageRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonMessageRepository.java @@ -12,6 +12,6 @@ import java.util.Map; * @Date 2026-03-05 11:33:21 */ public interface PersonMessageRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java index 8a9e88b..0632af1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java @@ -15,10 +15,10 @@ import java.util.Map; * @Date 2026-03-05 11:33:24 */ public interface VehicleApplyRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); PageResponse fgsCount(HashMap qry); - PageResponse getCarByVehicleBelongType(Map parmas); + PageResponse getCarByVehicleBelongType(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java index 6df5d87..f481d8b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleAuditRepository.java @@ -12,9 +12,9 @@ import java.util.Map; * @Date 2026-03-05 11:33:25 */ public interface VehicleAuditRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); - PageResponse carApprovalLogByvehicleApplyIdList( Map parmas); + PageResponse carApprovalLogByvehicleApplyIdList( @Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java index 39bbadc..6115e93 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleBlackRepository.java @@ -12,7 +12,7 @@ import java.util.Map; * @Date 2026-03-05 11:33:27 */ public interface VehicleBlackRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); VehicleBlackDO getInfoById(Long id); } 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 42d4f0b..9f78fb5 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 @@ -13,6 +13,6 @@ import java.util.Map; * @Date 2026-03-05 11:33:28 */ public interface VehicleMessageRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java index f07fdf7..2d4b221 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleViolationsRepository.java @@ -15,9 +15,9 @@ import java.util.Map; * @Date 2026-03-05 11:33:29 */ public interface VehicleViolationsRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); - PageResponse violationRecordslistPage(Map parmas); + PageResponse violationRecordslistPage(@Param("params") Map params); List listVehicleViolationByLicenceNo(String licenceNo); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VideoRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VideoRepository.java index cc510e2..87fe578 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VideoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VideoRepository.java @@ -6,7 +6,7 @@ import com.zcloud.primeport.persistence.dataobject.VideoDO; import java.util.Map; public interface VideoRepository extends BaseRepository { - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); Integer countByForeignIdAndDeviceType(Long foreignId, Integer deviceType); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java index b06eefa..b0e853c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/XgfApplyPersonRepository.java @@ -15,10 +15,10 @@ import java.util.Map; * @Date 2026-03-05 11:33:22 */ public interface XgfApplyPersonRepository extends BaseRepository { - PageResponse xgfPersonAuditList(Map parmas); + PageResponse xgfPersonAuditList(@Param("params") Map params); - PageResponse personnelVehicleManagementList(Map parmas); + PageResponse personnelVehicleManagementList(@Param("params") Map params); - PageResponse listPage(Map parmas); + PageResponse listPage(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java index a3f306e..9eaa2ff 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java @@ -26,7 +26,7 @@ public class ClosedAreaCarApplyRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { + public PageResponse listPage(@Param("params") Map params) { Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java index 06d5c3e..bf6ab80 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java @@ -31,19 +31,19 @@ public class ClosedAreaPersonApplyRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), - Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), + Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = closedAreaPersonApplyMapper.listPage(page, parmas,menuPerms); + IPage result = closedAreaPersonApplyMapper.listPage(page, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @Override - public PageResponse getCorpUserList(Map params) { + public PageResponse getCorpUserList(@Param("params") Map params) { IPage iPage = new Query().getPage(params); IPage result = closedAreaPersonApplyMapper.getCorpUserList(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaRepositoryImpl.java index a47b24d..c596c10 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaRepositoryImpl.java @@ -29,7 +29,7 @@ public class ClosedAreaRepositoryImpl extends BaseRepositoryImpl listPage(Map params) { + public PageResponse listPage(@Param("params") Map params) { IPage iPage = new Query().getPage(params); IPage result = closedAreaMapper.listPage(iPage, params); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java index 88628c6..392c1ef 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjApprovalUserRepositoryImpl.java @@ -24,14 +24,14 @@ public class MkmjApprovalUserRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), - Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), + Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = mkmjApprovalUserMapper.listPage(page, parmas,menuPerms); + IPage result = mkmjApprovalUserMapper.listPage(page, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java index 9d19c8a..6ab0c13 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjGateRepositoryImpl.java @@ -25,14 +25,14 @@ public class MkmjGateRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), - Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), + Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = mkmjGateMapper.listPage(page, parmas, menuPerms); + IPage result = mkmjGateMapper.listPage(page, params, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java index 9818f51..6653312 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjPassageRepositoryImpl.java @@ -23,13 +23,13 @@ public class MkmjPassageRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage iPage = mkmjPassageMapper.listPage(page, parmas, menuPerms); + IPage iPage = mkmjPassageMapper.listPage(page, params, menuPerms); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java index bbe9192..914b396 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java @@ -23,13 +23,13 @@ public class MkmjRepositoryImpl extends BaseRepositoryImpl i private final MkmjMapper mkmjMapper; @Override - public PageResponse listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage iPage = mkmjMapper.listPage(page, parmas, menuPerms); + IPage iPage = mkmjMapper.listPage(page, params, menuPerms); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java index 35a23c2..af71bc4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java @@ -31,26 +31,26 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), - Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), + Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage iPage = personApplyMapper.listPage(page, parmas, menuPerms); + IPage iPage = personApplyMapper.listPage(page, params, menuPerms); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } @Override - public PageResponse xgfPersonPermissionsList(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()) - , Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse xgfPersonPermissionsList(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()) + , Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = personApplyMapper.xgfPersonPermissionsList(page, parmas,menuPerms); + IPage result = personApplyMapper.xgfPersonPermissionsList(page, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonMessageRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonMessageRepositoryImpl.java index 76052e5..33dc941 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonMessageRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonMessageRepositoryImpl.java @@ -26,10 +26,10 @@ public class PersonMessageRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); + public PageResponse listPage(@Param("params") Map params) { + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.orderByDesc("create_time"); IPage result = personMessageMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index acedf7d..4a7083b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -36,14 +36,14 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), - Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), + Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = vehicleApplyMapper.listPage(page, parmas,menuPerms); + IPage result = vehicleApplyMapper.listPage(page, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -57,14 +57,14 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl getCarByVehicleBelongType(Map parmas) { - IPage iPage = new Query().getPage(parmas); + public PageResponse getCarByVehicleBelongType(@Param("params") Map params) { + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("vehicle_belong_type", parmas.get("vehicleBelongType")); + queryWrapper.eq("vehicle_belong_type", params.get("vehicleBelongType")); queryWrapper.eq("audit_flag", AuditEnum.APPROVED.getCode()); queryWrapper.eq("mkmj_permission", 1); - queryWrapper.like(Tools.notEmpty(parmas.get("licenceNo").toString()),"mkmj_permission", parmas.get("licenceNo")); - String vehicleBelongType = parmas.get("vehicleBelongType").toString(); + queryWrapper.like(Tools.notEmpty(params.get("licenceNo").toString()),"mkmj_permission", params.get("licenceNo")); + String vehicleBelongType = params.get("vehicleBelongType").toString(); if (VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode().equals(vehicleBelongType) ||VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode().equals(vehicleBelongType)) { // 分公司、股份个人车，查询当前登录用户车辆 queryWrapper.eq("employee_vehicle_user_id", AuthContext.getUserId()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java index 6f14422..1e7e5a7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleAuditRepositoryImpl.java @@ -32,27 +32,27 @@ public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - if (!Tools.isEmpty(parmas.get("gateLevelAuthAreaId"))) { - parmas.put("gateLevelAuthAreaIdList",parmas.get("gateLevelAuthAreaId").toString().split(",")); + if (!Tools.isEmpty(params.get("gateLevelAuthAreaId"))) { + params.put("gateLevelAuthAreaIdList",params.get("gateLevelAuthAreaId").toString().split(",")); } - if (!Tools.isEmpty(parmas.get("vehicleBelongTypeArr"))) { - parmas.put("vehicleBelongTypeArrList",parmas.get("vehicleBelongTypeArr").toString().split(",")); + if (!Tools.isEmpty(params.get("vehicleBelongTypeArr"))) { + params.put("vehicleBelongTypeArrList",params.get("vehicleBelongTypeArr").toString().split(",")); } - IPage result = vehicleAuditMapper.listPage(page, parmas, menuPerms); + IPage result = vehicleAuditMapper.listPage(page, params, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @Override - public PageResponse carApprovalLogByvehicleApplyIdList(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), - Integer.parseInt(parmas.get("pageSize").toString())); - IPage result = vehicleAuditMapper.carApprovalLogByvehicleApplyIdList(page, parmas); + public PageResponse carApprovalLogByvehicleApplyIdList(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), + Integer.parseInt(params.get("pageSize").toString())); + IPage result = vehicleAuditMapper.carApprovalLogByvehicleApplyIdList(page, params); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java index 92ce055..36f88fd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleBlackRepositoryImpl.java @@ -30,10 +30,10 @@ public class VehicleBlackRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), - Integer.parseInt(parmas.get("pageSize").toString())); - IPage result = vehicleBlackMapper.listPage(page, parmas); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), + Integer.parseInt(params.get("pageSize").toString())); + IPage result = vehicleBlackMapper.listPage(page, params); 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 19ca1c9..4659346 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 @@ -27,10 +27,10 @@ public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); + public PageResponse listPage(@Param("params") Map params) { + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.orderByDesc("create_time"); IPage result = vehicleMessageMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java index b547672..40956df 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java @@ -32,20 +32,20 @@ public class VehicleViolationsRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); + public PageResponse listPage(@Param("params") Map params) { + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.orderByDesc("create_time"); IPage result = vehicleViolationsMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } @Override - public PageResponse violationRecordslistPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse violationRecordslistPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); - IPage iPage = vehicleViolationsMapper.violationRecordslistPage(page, parmas); + IPage iPage = vehicleViolationsMapper.violationRecordslistPage(page, params); return PageHelper.pageToResponse(iPage, iPage.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VideoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VideoRepositoryImpl.java index 2172229..66a4695 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VideoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VideoRepositoryImpl.java @@ -21,10 +21,10 @@ public class VideoRepositoryImpl extends BaseRepositoryImpl listPage(Map parmas) { - IPage iPage = new Query().getPage(parmas); + public PageResponse listPage(@Param("params") Map params) { + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); + queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.orderByDesc("create_time"); IPage result = videoMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java index 5cfc524..3cdff54 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/XgfApplyPersonRepositoryImpl.java @@ -37,35 +37,35 @@ public class XgfApplyPersonRepositoryImpl extends BaseRepositoryImpl xgfPersonAuditList(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse xgfPersonAuditList(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = xgfApplyPersonMapper.xgfPersonAuditList(page, parmas,menuPerms); + IPage result = xgfApplyPersonMapper.xgfPersonAuditList(page, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @Override - public PageResponse personnelVehicleManagementList(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse personnelVehicleManagementList(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = xgfApplyPersonMapper.personnelVehicleManagementList(page, parmas,menuPerms); + IPage result = xgfApplyPersonMapper.personnelVehicleManagementList(page, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @Override - public PageResponse listPage(Map parmas) { - Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()), Integer.parseInt(parmas.get("pageSize").toString())); + public PageResponse listPage(@Param("params") Map params) { + Page> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()), Integer.parseInt(params.get("pageSize").toString())); String menuPerms = ""; - if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))) { - menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))) { + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } - IPage result = xgfApplyPersonMapper.listPage(page, parmas,menuPerms); + IPage result = xgfApplyPersonMapper.listPage(page, params,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaMapper.xml index dee78f4..deb86f9 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaMapper.xml @@ -41,11 +41,11 @@ AND child.delete_enum = 'FALSE' WHERE c.delete_enum = 'FALSE' - - AND c.parent_id = #{parmas.parentId} + + AND c.parent_id = #{params.parentId} - - AND C.closed_area_name LIKE CONCAT('%', #{parmas.closedAreaName}, '%') + + AND C.closed_area_name LIKE CONCAT('%', #{params.closedAreaName}, '%') GROUP BY c.id diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml index 25114e9..f74aec5 100644 --- a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml @@ -42,11 +42,11 @@ u.delete_enum = 'FALSE' AND u.main_corp_flag = 0 AND u.corpinfo_id = #{params.corpinfoId} - - AND u.department_id = #{parmas.deptId} + + AND u.department_id = #{params.deptId} - - AND u.name like CONCAT('%', #{parmas.name}, '%') + + AND u.name like CONCAT('%', #{params.name}, '%') ORDER BY u.department_id @@ -54,24 +54,24 @@ diff --git a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml index 4458d5d..0e48628 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjApprovalUserDO.xml @@ -7,12 +7,12 @@ diff --git a/web-infrastructure/src/main/resources/mapper/MkmjDO.xml b/web-infrastructure/src/main/resources/mapper/MkmjDO.xml index 76634e6..c3bcbfc 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjDO.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjDO.xml @@ -33,20 +33,20 @@ LEFT JOIN closed_area ca ON m.closed_area_id = ca.id AND ca.delete_enum = 'false' WHERE m.delete_enum = 'false' - - AND m.hg_auth_area = #{parmas.hgAuthArea} + + AND m.hg_auth_area = #{params.hgAuthArea} - - AND m.mkmj_name LIKE CONCAT('%', #{parmas.mkmjName}, '%') + + AND m.mkmj_name LIKE CONCAT('%', #{params.mkmjName}, '%') - - AND m.mkmj_level = #{parmas.mkmjLevel} + + AND m.mkmj_level = #{params.mkmjLevel} - - AND m.mkmj_type = #{parmas.mkmjType} + + AND m.mkmj_type = #{params.mkmjType} - - AND m.mkmj_status = #{parmas.mkmjStatus} + + AND m.mkmj_status = #{params.mkmjStatus} GROUP BY m.id ORDER BY m.mkmj_status asc,m.id DESC diff --git a/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml b/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml index 00e823e..439da58 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjGateDO.xml @@ -34,24 +34,24 @@ WHERE g.delete_enum = 'false' - - AND g.mkmj_id = #{parmas.mkmjId} + + AND g.mkmj_id = #{params.mkmjId} - - AND g.passage_id = #{parmas.passageId} + + AND g.passage_id = #{params.passageId} - - AND g.gate_name LIKE CONCAT('%', #{parmas.gateName}, '%') + + AND g.gate_name LIKE CONCAT('%', #{params.gateName}, '%') - - AND g.gate_type = #{parmas.gateType} + + AND g.gate_type = #{params.gateType} - - AND g.gate_category = #{parmas.gateCategory} + + AND g.gate_category = #{params.gateCategory} - - AND g.gate_status = #{parmas.gateStatus} + + AND g.gate_status = #{params.gateStatus} ORDER BY g.id DESC diff --git a/web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml b/web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml index ddc6b97..0f56c0a 100644 --- a/web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml +++ b/web-infrastructure/src/main/resources/mapper/MkmjPassageDO.xml @@ -25,17 +25,17 @@ LEFT JOIN video v ON m.id = v.foreign_id AND v.device_type = 2 AND v.delete_enum = 'false' WHERE p.delete_enum = 'false' - - AND p.mkmj_id = #{parmas.eqMkmjId} + + AND p.mkmj_id = #{params.eqMkmjId} - - AND p.passage_name LIKE CONCAT('%', #{parmas.likePassageName}, '%') + + AND p.passage_name LIKE CONCAT('%', #{params.likePassageName}, '%') - - AND p.passage_type = #{parmas.eqPassageType} + + AND p.passage_type = #{params.eqPassageType} - - AND p.passage_status = #{parmas.eqPassageStatus} + + AND p.passage_status = #{params.eqPassageStatus} GROUP BY p.id diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index 0ab1524..affb313 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -40,12 +40,12 @@ WHERE pa.delete_enum = 'FALSE' AND xap.audit_flag = 2 AND - pa.person_corp_id = #{parmas.applyCorpId} - - AND xap.employee_person_user_name LIKE CONCAT('%', #{parmas.employeePersonUserName}, '%') + pa.person_corp_id = #{params.applyCorpId} + + AND xap.employee_person_user_name LIKE CONCAT('%', #{params.employeePersonUserName}, '%') - - AND xap.project_name like CONCAT('%', #{parmas.projectName}, '%') + + AND xap.project_name like CONCAT('%', #{params.projectName}, '%') ORDER BY pa.employee_person_user_id, diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 37f3912..cd6f7ca 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -46,29 +46,29 @@ AND a.audit_status = 1 WHERE f.delete_enum = 'FALSE' - - AND f.remarks like CONCAT('%', #{parmas.remarks}, '%') + + AND f.remarks like CONCAT('%', #{params.remarks}, '%') - - AND f.licence_no like CONCAT('%', #{parmas.licenceNo}, '%') + + AND f.licence_no like CONCAT('%', #{params.licenceNo}, '%') - - AND f.audit_flag = #{parmas.auditFlag} + + AND f.audit_flag = #{params.auditFlag} - - AND f.visit_start_time LIKE CONCAT('%', #{parmas.gateName}, '%') + + AND f.visit_start_time LIKE CONCAT('%', #{params.gateName}, '%') - - AND f.visit_end_time LIKE CONCAT('%', #{parmas.gateName}, '%') + + AND f.visit_end_time LIKE CONCAT('%', #{params.gateName}, '%') - - AND f.vehicle_belong_type = #{parmas.vehicleBelongType} + + AND f.vehicle_belong_type = #{params.vehicleBelongType} - - AND f.vehicle_department_id = #{parmas.vehicleDepartmentId} + + AND f.vehicle_department_id = #{params.vehicleDepartmentId} - - AND f.employee_vehicle_user_id = #{parmas.employeeVehicleUserId} + + AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId} diff --git a/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml index 08a76df..02c1ff3 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml @@ -67,17 +67,17 @@ LEFT JOIN vehicle_apply AS a ON b.licence_no = a.licence_no WHERE b.delete_enum = 'FALSE' - - AND b.licence_no LIKE CONCAT('%', #{parmas.licenceNo}, '%') + + AND b.licence_no LIKE CONCAT('%', #{params.licenceNo}, '%') - - AND a.employee_vehicle_user_name LIKE CONCAT('%', #{parmas.employeeVehicleUserName}, '%') + + AND a.employee_vehicle_user_name LIKE CONCAT('%', #{params.employeeVehicleUserName}, '%') - - AND a.vehicle_department_id = #{parmas.vehicleDepartmentId} + + AND a.vehicle_department_id = #{params.vehicleDepartmentId} - - AND a.vehicleType LIKE CONCAT('%', #{parmas.vehicleType}, '%') + + AND a.vehicleType LIKE CONCAT('%', #{params.vehicleType}, '%') diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index 7867650..27981ce 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -42,31 +42,31 @@ AND pa.delete_enum = 'FALSE' WHERE xap.delete_enum = 'FALSE' - - AND xap.audit_flag = #{parmas.auditFlag} + + AND xap.audit_flag = #{params.auditFlag} - - + + AND xap.audit_status = 1 - + AND xap.audit_status != 1 - - AND xap.mkmj_id = #{parmas.mkmjId} + + AND xap.mkmj_id = #{params.mkmjId} - - AND xap.visit_start_time LIKE CONCAT('%', #{parmas.visitStartTime}, '%') + + AND xap.visit_start_time LIKE CONCAT('%', #{params.visitStartTime}, '%') - - AND xap.employee_person_user_name LIKE CONCAT('%', #{parmas.employeePersonUserName}, '%') + + AND xap.employee_person_user_name LIKE CONCAT('%', #{params.employeePersonUserName}, '%') - - AND xap.visit_end_time LIKE CONCAT('%', #{parmas.visitEndTime}, '%') + + AND xap.visit_end_time LIKE CONCAT('%', #{params.visitEndTime}, '%') - - AND xap.person_belong_type = #{parmas.vehicleBelongType} + + AND xap.person_belong_type = #{params.vehicleBelongType} ORDER BY xap.id DESC @@ -80,25 +80,25 @@ xgf_apply_person p LEFT JOIN ( SELECT f.xgf_apply_person_id, COUNT( f.id ) person_apply_count FROM person_apply f WHERE f.delete_enum = 'FALSE' GROUP BY f.xgf_apply_person_id ) tmp ON p.id = tmp.xgf_apply_person_id where p.delete_enum = 'FALSE' - - + + AND p.audit_flag = 1 - + AND p.audit_flag != 1 - - and p.audit_flag = #{parmas.auditFlag} + + and p.audit_flag = #{params.auditFlag} - - AND p.apply_corp_id = #{parmas.applyCorpId} + + AND p.apply_corp_id = #{params.applyCorpId} - - AND p.project_name like CONCAT('%', #{parmas.projectName}, '%') + + AND p.project_name like CONCAT('%', #{params.projectName}, '%') - - AND p.apply_corp_name like CONCAT('%', #{parmas.applyCorpName}, '%') + + AND p.apply_corp_name like CONCAT('%', #{params.applyCorpName}, '%')