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 new file mode 100644 index 0000000..b285b49 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/primeport/web/app/AppCountController.java @@ -0,0 +1,21 @@ +package com.zcloud.primeport.web.app; + +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.api.VehicleApplyServiceI; +import com.zcloud.primeport.dto.clientobject.AppCountCO; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "App统计角标") +@RequestMapping("/${application.gateway}/appStatisticsCorner") +@RestController +@AllArgsConstructor +public class AppCountController { + private final VehicleApplyServiceI vehicleApplyService; + @RequestMapping("/getAppCount") + public SingleResponse 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 7287976..d7388d3 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 @@ -1,7 +1,10 @@ package com.zcloud.primeport.command.convertor; +import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.primeport.dto.clientobject.AppCountCO; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.persistence.dataobject.AppCountDTO; import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import org.mapstruct.Mapper; @@ -24,5 +27,7 @@ public interface VehicleApplyCoConvertor { List converDOsToCOs(List vehicleApplyDOs); List converCOsToDtos(List vehicleApplyDOs); VehicleApplyCO converDOToCO(VehicleApplyDO vehicleApplyDO); + + AppCountCO converAppCountDTOToAppCountCO(AppCountDTO 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 cecd97c..6f538c6 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,12 +1,16 @@ package com.zcloud.primeport.command.query; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.dto.SingleResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.primeport.command.convertor.VehicleApplyCoConvertor; import com.zcloud.primeport.dto.VehicleApplyPageQry; +import com.zcloud.primeport.dto.clientobject.AppCountCO; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; +import com.zcloud.primeport.persistence.dataobject.AppCountDTO; import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.dataobject.VehicleAuditDO; @@ -91,5 +95,12 @@ public class VehicleApplyQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public SingleResponse getAppCount() { + Map parmas = new HashMap<>(); + parmas.put("userId", AuthContext.getUserId()); + AppCountDTO appCountDTO = vehicleApplyRepository.getAppCount(parmas); + return SingleResponse.of(vehicleApplyCoConvertor.converAppCountDTOToAppCountCO(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 6e66ed9..69da834 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 @@ -13,6 +13,7 @@ import com.zcloud.primeport.command.query.VehicleApplyQueryExe; import com.zcloud.primeport.domain.enums.AuditEnum; import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.AppCountCO; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; @@ -85,7 +86,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { } Map result = new HashMap<>(); result.put("available", true); - if (vehicleApplyRepository.count(queryWrapper) == 0) { + if (vehicleApplyRepository.count(queryWrapper) != 0) { result.put("available", false); result.put("availableMessage", "该车牌号已存在"); } @@ -159,5 +160,10 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI { } return result; } + + @Override + public SingleResponse 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 4f85dd9..88f548c 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 @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.primeport.domain.model.VehicleApplyE; import com.zcloud.primeport.dto.*; +import com.zcloud.primeport.dto.clientobject.AppCountCO; import com.zcloud.primeport.dto.clientobject.FgsVehicleCountCo; import com.zcloud.primeport.dto.clientobject.VehicleApplyCO; import com.zcloud.primeport.dto.clientobject.VehicleAuditCO; @@ -46,5 +47,7 @@ public interface VehicleApplyServiceI { void xgfCarAuthorization(CarAuthCmd cmd); Map checkLicenceNoBlack(String licenceNo); + + SingleResponse getAppCount(); } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/AppCountCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/AppCountCO.java new file mode 100644 index 0000000..04fad3a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/AppCountCO.java @@ -0,0 +1,16 @@ +package com.zcloud.primeport.dto.clientobject; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppCountCO { + @ApiModelProperty(value = "one_level_car-》一级车,two_level_car二级车,one_level_person-》一级口门人,two_level_person-》封闭区域人",name = "type") + private String type; + @ApiModelProperty(value = "one_level_car-》车辆所属类型 1-股份员工车辆,2-股份单位车辆,3-分公司员工车辆,4-分公司单位车辆 ,5-相关方车辆, 6:临时车辆,7检查部门车辆8,驻港单位员工车辆,9驻港单位公车。two_level_car二级车-》申请归属1股份2分公司3相关方4临时人员5分公司内部车辆。one_level_person-》申请归属1股份2分公司3相关方4临时人员。two_level_person-》申请归属1股份2分公司3相关方4临时人员",name = "belongType") + private String belongType; + @ApiModelProperty(value = "审批人ID",name = "auditUserId") + private Long auditUserId; + @ApiModelProperty(value = "待审批数量",name = "waitAuditCount") + private int waitAuditCount; +} 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 new file mode 100644 index 0000000..84625d4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/AppCountDTO.java @@ -0,0 +1,11 @@ +package com.zcloud.primeport.persistence.dataobject; + +import lombok.Data; + +@Data +public class AppCountDTO { + private String type; + private String belongType; + private Long auditUserId; + 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 ac74191..744ec13 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; +import com.zcloud.primeport.persistence.dataobject.AppCountDTO; import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import org.apache.ibatis.annotations.Mapper; @@ -30,5 +31,7 @@ public interface VehicleApplyMapper extends BaseMapper { IPage fgsCount(Page> page, @Param("params") HashMap qry); VehicleApplyDO getInfoById(Long id); + + AppCountDTO 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 d6cd7b5..2c69bea 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 @@ -2,6 +2,7 @@ package com.zcloud.primeport.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; +import com.zcloud.primeport.persistence.dataobject.AppCountDTO; import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; @@ -22,5 +23,7 @@ public interface VehicleApplyRepository extends BaseRepository { PageResponse getCarByVehicleBelongType(Map params); VehicleApplyDO getInfoById(Long id); + + AppCountDTO 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 169b8fa..4df30f7 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 @@ -13,6 +13,7 @@ import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.domain.enums.AuditEnum; import com.zcloud.primeport.domain.enums.MenuEnum; import com.zcloud.primeport.domain.enums.VehicleBelongTypeEnum; +import com.zcloud.primeport.persistence.dataobject.AppCountDTO; import com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto; import com.zcloud.primeport.persistence.dataobject.VehicleApplyDO; import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO; @@ -83,5 +84,10 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl parmas) { + return vehicleApplyMapper.getAppCount(parmas); + } } diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index cdb0712..0d5aa79 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -146,5 +146,66 @@ LEFT JOIN mkmj m on va.mkmj_id = m.id WHERE va.id = #{id} +