From 4324babb91f24e04b01793760a342321e79f0793 Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Thu, 20 Nov 2025 14:47:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=99=BB=E5=BD=95=E4=BA=BA=E7=9A=84=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/VehicleAuditLogController.java | 8 +++ .../web/VehicleMessageController.java | 7 ++- .../convertor/VehicleAuditLogCoConvertor.java | 3 + .../convertor/VehicleMessageCoConvertor.java | 8 +++ .../query/VehicleAuditLogQueryExe.java | 25 +++++++- .../command/query/VehicleMessageQueryExe.java | 25 ++++++++ .../service/VehicleAuditLogServiceImpl.java | 9 +++ .../service/VehicleMessageServiceImpl.java | 5 ++ .../api/VehicleAuditLogServiceI.java | 7 +++ .../primeport/api/VehicleMessageServiceI.java | 4 ++ .../primeport/dto/VehicleAuditLogPageQry.java | 4 ++ .../primeport/dto/VehicleMessagePageQry.java | 4 ++ .../dto/clientobject/VehicleAuditLogCO.java | 2 +- .../clientobject/VehicleCountByCorpCO.java | 22 +++++++ .../dto/clientobject/VehicleLogAndCarCO.java | 63 +++++++++++++++++++ .../dataobject/VehicleCountByCorpDO.java | 27 ++++++++ .../mapper/VehicleMessageMapper.java | 9 ++- .../repository/VehicleMessageRepository.java | 8 +++ .../impl/VehicleMessageRepositoryImpl.java | 21 ++++++- .../resources/mapper/VehicleMessageMapper.xml | 13 +++- 20 files changed, 268 insertions(+), 6 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountByCorpCO.java create mode 100644 web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleLogAndCarCO.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountByCorpDO.java diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditLogController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditLogController.java index b557254..0eb014b 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditLogController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/VehicleAuditLogController.java @@ -12,6 +12,8 @@ import com.zcloud.primeport.dto.VehicleAuditLogApprovalCmd; import com.zcloud.primeport.dto.VehicleAuditLogPageQry; import com.zcloud.primeport.dto.VehicleAuditLogUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; +import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; +import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -85,5 +87,11 @@ public class VehicleAuditLogController { public PageResponse page(@RequestBody VehicleAuditLogPageQry qry) { return vehicleAuditLogService.listPage(qry); } + @ApiOperation("获取登录人的审批车辆信息") + @PostMapping("/listFromUser") + public PageResponse pageAndCarInfo(@RequestBody VehicleAuditLogPageQry qry) { + return vehicleAuditLogService.listPageAndCarInfo(qry); + } + } 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 d67c669..bfc7238 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 @@ -8,6 +8,7 @@ import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.primeport.api.VehicleMessageServiceI; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -77,6 +78,10 @@ public class VehicleMessageController { vehicleMessageService.updateStatus(statusCmd); return SingleResponse.buildSuccess(); } - + @ApiOperation("分页-根据企业ID获取企业车辆数量") + @PostMapping("/listFromCorp") + public PageResponse listFromCorp(@RequestBody VehicleMessagePageQry qry) { + return vehicleMessageService.listFromCorp(qry); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditLogCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditLogCoConvertor.java index e2ea596..8bdd984 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditLogCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleAuditLogCoConvertor.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.command.convertor; import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; +import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; import org.mapstruct.Mapper; @@ -20,5 +21,7 @@ public interface VehicleAuditLogCoConvertor { * @return */ List converDOsToCOs(List vehicleAuditLogDOs); + + List converCarDOsToCOs2(List vehicleAuditLogDOs); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java index accbd06..eb2f581 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleMessageCoConvertor.java @@ -1,6 +1,8 @@ package com.zcloud.primeport.command.convertor; +import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; +import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import org.mapstruct.Mapper; import java.util.List; @@ -20,5 +22,11 @@ public interface VehicleMessageCoConvertor { */ List converDOsToCOs(List vehicleMessageDOs); VehicleMessageCO converDOsToCOs(VehicleMessageDO vehicleMessageDOs); + + /** + * @param vehicleMessageDOs + * @return + */ + List converCountDOsToCOs(List vehicleMessageDOs); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditLogQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditLogQueryExe.java index dd6f778..f874a38 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditLogQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditLogQueryExe.java @@ -5,11 +5,16 @@ import com.alibaba.cola.dto.PageResponse; import com.zcloud.primeport.command.convertor.VehicleAuditLogCoConvertor; import com.zcloud.primeport.dto.VehicleAuditLogPageQry; import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; +import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; +import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import com.zcloud.primeport.persistence.dataobject.VehicleAuditLogDO; import com.zcloud.primeport.persistence.repository.VehicleAuditLogRepository; import lombok.AllArgsConstructor; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,7 +30,7 @@ import java.util.Map; public class VehicleAuditLogQueryExe { private final VehicleAuditLogRepository vehicleAuditLogRepository; private final VehicleAuditLogCoConvertor vehicleAuditLogCoConvertor; - + private final VehicleMessageQueryExe vehicleMessageQueryExe; /** * 分页 * @@ -38,5 +43,23 @@ public class VehicleAuditLogQueryExe { List examCenterCOS = vehicleAuditLogCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public PageResponse executeAndCarInfo(VehicleAuditLogPageQry vehicleAuditLogPageQry) { + Map parmas = PageQueryHelper.toHashMap(vehicleAuditLogPageQry); + PageResponse pageResponse = vehicleAuditLogRepository.listPage(parmas); + List examCenterCOS = vehicleAuditLogCoConvertor.converCarDOsToCOs2(pageResponse.getData()); + + Long [] vehicleMessageIds = new Long[examCenterCOS.size()]; + for (int i = 0; i < examCenterCOS.size(); i++) { + vehicleMessageIds[i] = examCenterCOS.get(i).getVehicleMessageId(); + } + Map longVehicleMessageCOMap = vehicleMessageQueryExe.listMapAllByIds(vehicleMessageIds); // 根据id 获取信息 + for (VehicleLogAndCarCO vehicleAuditLogCO : examCenterCOS){ + if (longVehicleMessageCOMap.containsKey(vehicleAuditLogCO.getVehicleMessageId())){ + vehicleAuditLogCO.setVehicleMessageCO(longVehicleMessageCOMap.get(vehicleAuditLogCO.getVehicleMessageId())); + } + } + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java index 753c0f3..921f128 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleMessageQueryExe.java @@ -1,15 +1,19 @@ package com.zcloud.primeport.command.query; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.cola.dto.PageResponse; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.VehicleMessageCoConvertor; import com.zcloud.primeport.dto.VehicleMessagePageQry; +import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; +import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,5 +47,26 @@ public class VehicleMessageQueryExe { VehicleMessageCO vehicleMessageCO = vehicleMessageCoConvertor.converDOsToCOs(byId); return vehicleMessageCO; } + + public PageResponse listFromCorp(VehicleMessagePageQry vehicleMessagePageQry) { + Map parmas = BeanUtil.beanToMap(vehicleMessagePageQry); + PageResponse pageResponse = vehicleMessageRepository.listCountFromCorp(parmas); + List examCenterCOS = vehicleMessageCoConvertor.converCountDOsToCOs(pageResponse.getData()); + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); + } + + + public Map listMapAllByIds(Long[] ids) { + if (ids == null || ids.length == 0){ + return new HashMap<>(); + } + List vehicleMessageDOs = vehicleMessageRepository.listAll(ids); + List vehicleMessageCOS = vehicleMessageCoConvertor.converDOsToCOs(vehicleMessageDOs); + Map vehicleMessageCOMap = new HashMap<>(); + for (VehicleMessageCO vehicleMessageCO : vehicleMessageCOS) { + vehicleMessageCOMap.put(vehicleMessageCO.getId(), vehicleMessageCO); + } + return vehicleMessageCOMap; + } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditLogServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditLogServiceImpl.java index 3c8fe69..5b7d7b2 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditLogServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleAuditLogServiceImpl.java @@ -11,6 +11,8 @@ import com.zcloud.primeport.dto.VehicleAuditLogApprovalCmd; import com.zcloud.primeport.dto.VehicleAuditLogPageQry; import com.zcloud.primeport.dto.VehicleAuditLogUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; +import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; +import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -64,5 +66,12 @@ public class VehicleAuditLogServiceImpl implements VehicleAuditLogServiceI { public void approval(VehicleAuditLogApprovalCmd auditLogApprovalCmd) { vehicleAuditLogUpdateExe.execute(auditLogApprovalCmd); } + + @Override + public PageResponse listPageAndCarInfo(VehicleAuditLogPageQry qry) { + return vehicleAuditLogQueryExe.executeAndCarInfo(qry); + } + + } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java index 412c4a8..7212be2 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleMessageServiceImpl.java @@ -7,6 +7,7 @@ import com.zcloud.primeport.command.VehicleMessageRemoveExe; import com.zcloud.primeport.command.VehicleMessageUpdateExe; import com.zcloud.primeport.command.query.VehicleMessageQueryExe; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -74,6 +75,10 @@ public class VehicleMessageServiceImpl implements VehicleMessageServiceI { vehicleMessageUpdateExe.updateStatus(statusCmd); } + @Override + public PageResponse listFromCorp(VehicleMessagePageQry qry) { + return vehicleMessageQueryExe.listFromCorp(qry); + } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditLogServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditLogServiceI.java index 1388d0c..64d047f 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditLogServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleAuditLogServiceI.java @@ -6,6 +6,8 @@ import com.zcloud.primeport.dto.VehicleAuditLogApprovalCmd; import com.zcloud.primeport.dto.VehicleAuditLogPageQry; import com.zcloud.primeport.dto.VehicleAuditLogUpdateCmd; import com.zcloud.primeport.dto.clientobject.VehicleAuditLogCO; +import com.zcloud.primeport.dto.clientobject.VehicleLogAndCarCO; +import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; /** * web-client @@ -25,5 +27,10 @@ public interface VehicleAuditLogServiceI { void removeBatch(Long[] ids); void approval(VehicleAuditLogApprovalCmd auditLogApprovalCmd); + + + PageResponse listPageAndCarInfo(VehicleAuditLogPageQry qry); + + } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java index 47171f5..77728ce 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleMessageServiceI.java @@ -4,6 +4,7 @@ package com.zcloud.primeport.api; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.VehicleCountByCorpCO; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; /** @@ -28,5 +29,8 @@ public interface VehicleMessageServiceI { VehicleMessageCO getInfoById(Long id); void updateStatus(VehicleMessageStatusCmd statusCmd); + + + PageResponse listFromCorp(VehicleMessagePageQry qry); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogPageQry.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogPageQry.java index 4bc23c5..e6b267d 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogPageQry.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleAuditLogPageQry.java @@ -29,5 +29,9 @@ public class VehicleAuditLogPageQry extends PageQuery { @ApiModelProperty("审批状态(0,申请;2.更新)") private String eqBatchState; + + + @ApiModelProperty("审批人员") + private String eqUserId; } 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 05688d0..d33825f 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 @@ -40,5 +40,9 @@ public class VehicleMessagePageQry extends PageQuery { @ApiModelProperty(value = "删除状态") private String eqDeleteEnum = "FALSE" ; + @ApiModelProperty(value = "是否审核") + private String eqIsAudit; + + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java index 1030fd0..250aefb 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleAuditLogCO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; + /** * web-client * @@ -52,4 +53,3 @@ public class VehicleAuditLogCO extends ClientObject { @ApiModelProperty(value = "驳回备注") private String comments; } - diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountByCorpCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountByCorpCO.java new file mode 100644 index 0000000..674037a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleCountByCorpCO.java @@ -0,0 +1,22 @@ +package com.zcloud.primeport.dto.clientobject; + +import com.alibaba.cola.dto.ClientObject; +import lombok.Data; + + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-15 11:41:21 + */ +@Data +public class VehicleCountByCorpCO extends ClientObject { + + private String corpId; + private String corpName; + private String corpVehicleCount; + +} + + diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleLogAndCarCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleLogAndCarCO.java new file mode 100644 index 0000000..e329631 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleLogAndCarCO.java @@ -0,0 +1,63 @@ +package com.zcloud.primeport.dto.clientobject; +import com.alibaba.cola.dto.ClientObject; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + + +/** + * web-client + * + * @Author guoyuepeng + * @Date 2025-11-18 14:07:46 + */ +@Data +public class VehicleLogAndCarCO extends ClientObject { + //id + @ApiModelProperty(value = "id") + private Long id; + //业务id + @ApiModelProperty(value = "业务id") + private String vehicleAuditLogId; + //审批批次(1.普通车辆.2危险化学品车辆) + @ApiModelProperty(value = "审批批次(1.普通车辆.2危险化学品车辆)") + private Integer batchType; + //审批状态(0,申请;2.更新) + @ApiModelProperty(value = "审批状态(0,申请;2.更新)") + private Integer batchState; + //车辆id + @ApiModelProperty(value = "车辆id") + private Long vehicleMessageId; + //审批人id + @ApiModelProperty(value = "审批人id") + private Long userId; + //审批人姓名 + @ApiModelProperty(value = "审批人姓名") + private String userName; + //审批部门id + @ApiModelProperty(value = "审批部门id") + private Long deptId; + //审批部门名称 + @ApiModelProperty(value = "审批部门名称") + private String deptName; + //审批步骤排序 + @ApiModelProperty(value = "审批步骤排序") + private Integer stepSort; + //审批状态(1未开始.2通过.3不通过) + @ApiModelProperty(value = "审批状态(1未开始.2通过.3不通过)") + private Integer status; + //审批状态(0正常,1.废除) + @ApiModelProperty(value = "审批状态(0正常,1.废除)") + private Integer stepType; + //驳回备注 + @ApiModelProperty(value = "驳回备注") + private String comments; + + @ApiModelProperty(value = "车辆信息") + private VehicleMessageCO vehicleMessageCO; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountByCorpDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountByCorpDO.java new file mode 100644 index 0000000..61e2452 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleCountByCorpDO.java @@ -0,0 +1,27 @@ +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 java.util.Date; + +/** + * web-infrastructure + * + * @Author guoyuepeng + * @Date 2025-11-15 11:41:21 + */ +@Data +public class VehicleCountByCorpDO extends BaseDO { + + private String corpId; + private String corpName; + private String corpVehicleCount; + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java index 650c76b..fec80b0 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleMessageMapper.java @@ -1,8 +1,14 @@ package com.zcloud.primeport.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zcloud.primeport.persistence.dataobject.VehicleCountByCorpDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; /** * web-infrastructure @@ -11,6 +17,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface VehicleMessageMapper extends BaseMapper { + IPage listCountFromCorp(Page> page, @Param("params") Map parmas); - } +} 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 5198242..09c0e0c 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 @@ -3,8 +3,10 @@ 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.VehicleCountByCorpDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; +import java.util.List; import java.util.Map; /** @@ -14,5 +16,11 @@ import java.util.Map; */ public interface VehicleMessageRepository extends BaseRepository { PageResponse listPage(Map parmas); + + + PageResponse listCountFromCorp(Map parmas); + + + List listAll(Long [] ids); } 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 77a039b..0ffa3a6 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 @@ -3,16 +3,21 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.VehicleCountByCorpDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; import com.zcloud.primeport.persistence.mapper.VehicleMessageMapper; import com.zcloud.primeport.persistence.repository.VehicleMessageRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -30,9 +35,23 @@ public class VehicleMessageRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(parmas); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); - queryWrapper.orderByDesc("create_time"); IPage result = vehicleMessageMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public PageResponse listCountFromCorp(Map parmas) { + Page> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),Integer.parseInt(parmas.get("pageSize").toString())); + IPage iPage = vehicleMessageMapper.listCountFromCorp(page, parmas); + return PageHelper.pageToResponse(iPage, iPage.getRecords()); + } + + @Override + public List listAll(Long[] ids) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id", ids); + return vehicleMessageMapper.selectList(queryWrapper); + } + } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml b/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml index 01e3cd2..593fcde 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleMessageMapper.xml @@ -3,6 +3,17 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +