From 77f3c6a7167fa17db443b42445b3552f90496d09 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Wed, 1 Apr 2026 15:29:50 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aapp=E8=A7=92=E6=A0=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/primeport/web/app/AppCountController.java | 5 ++++- .../command/convertor/VehicleApplyCoConvertor.java | 2 +- .../primeport/command/query/VehicleApplyQueryExe.java | 7 ++++--- .../zcloud/primeport/service/VehicleApplyServiceImpl.java | 3 ++- .../com/zcloud/primeport/api/VehicleApplyServiceI.java | 3 ++- .../primeport/persistence/dataobject/AppCountDTO.java | 6 +++++- .../primeport/persistence/dataobject/VehicleApplyDO.java | 8 ++++++++ .../primeport/persistence/mapper/VehicleApplyMapper.java | 3 ++- .../persistence/repository/VehicleApplyRepository.java | 3 ++- .../repository/impl/VehicleApplyRepositoryImpl.java | 3 ++- 10 files changed, 32 insertions(+), 11 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/app/AppCountController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/app/AppCountController.java index b285b49..4a7b4ee 100644 --- a/web-adapter/src/main/java/com/zcloud/primeport/web/app/AppCountController.java +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/app/AppCountController.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.web.app; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.api.VehicleApplyServiceI; import com.zcloud.primeport.dto.clientobject.AppCountCO; @@ -8,6 +9,8 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Api(tags = "App统计角标") @RequestMapping("/${application.gateway}/appStatisticsCorner") @RestController @@ -15,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; public class AppCountController { private final VehicleApplyServiceI vehicleApplyService; @RequestMapping("/getAppCount") - public SingleResponse getAppCount() { + public MultiResponse getAppCount() { return vehicleApplyService.getAppCount(); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java index d7388d3..c52fc67 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/convertor/VehicleApplyCoConvertor.java @@ -28,6 +28,6 @@ public interface VehicleApplyCoConvertor { List converCOsToDtos(List vehicleApplyDOs); VehicleApplyCO converDOToCO(VehicleApplyDO vehicleApplyDO); - AppCountCO converAppCountDTOToAppCountCO(AppCountDTO appCountDTO); + List converAppCountDTOsToAppCountCOs(List appCountDTO); } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java index 6f538c6..e298e74 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.command.query; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -96,11 +97,11 @@ public class VehicleApplyQueryExe { } - public SingleResponse getAppCount() { + public MultiResponse getAppCount() { Map parmas = new HashMap<>(); parmas.put("userId", AuthContext.getUserId()); - AppCountDTO appCountDTO = vehicleApplyRepository.getAppCount(parmas); - return SingleResponse.of(vehicleApplyCoConvertor.converAppCountDTOToAppCountCO(appCountDTO)); + List appCountDTO = vehicleApplyRepository.getAppCount(parmas); + return MultiResponse.of(vehicleApplyCoConvertor.converAppCountDTOsToAppCountCOs(appCountDTO)); } } diff --git a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java index 69da834..842bcd9 100644 --- a/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.service; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -162,7 +163,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { } @Override - public SingleResponse getAppCount() { + public MultiResponse getAppCount() { return vehicleApplyQueryExe.getAppCount(); } } diff --git a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java index 88f548c..cc04b51 100644 --- a/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java +++ b/web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java @@ -1,5 +1,6 @@ package com.zcloud.primeport.api; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.domain.model.VehicleApplyE; @@ -48,6 +49,6 @@ public interface VehicleApplyServiceI { Map checkLicenceNoBlack(String licenceNo); - SingleResponse getAppCount(); + MultiResponse getAppCount(); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/AppCountDTO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/AppCountDTO.java index 84625d4..41dde69 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/AppCountDTO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/AppCountDTO.java @@ -1,9 +1,13 @@ package com.zcloud.primeport.persistence.dataobject; import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; @Data -public class AppCountDTO { +@NoArgsConstructor +public class AppCountDTO implements Serializable { private String type; private String belongType; private Long auditUserId; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java index a50f0e9..f4b59bb 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java @@ -133,5 +133,13 @@ public class VehicleApplyDO extends BaseDO { @ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName") @TableField(exist = false) private String checkDepartmentName; + + + @TableField(exist = false) + private String type; + @TableField(exist = false) + private String belongType; + @TableField(exist = false) + private int waitAuditCount; } 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 744ec13..3526033 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 @@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -32,6 +33,6 @@ public interface VehicleApplyMapper extends BaseMapper { VehicleApplyDO getInfoById(Long id); - AppCountDTO getAppCount(@Param("params") Map parmas); + List getAppCount(@Param("params") Map parmas); } 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 2c69bea..2a7c896 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 @@ -7,6 +7,7 @@ import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -24,6 +25,6 @@ public interface VehicleApplyRepository extends BaseRepository { VehicleApplyDO getInfoById(Long id); - AppCountDTO getAppCount(Map parmas); + List getAppCount(Map parmas); } 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 4df30f7..09f6b7c 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 @@ -23,6 +23,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -86,7 +87,7 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl parmas) { + public List getAppCount(Map parmas) { return vehicleApplyMapper.getAppCount(parmas); } }