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 57a4c78..19fc6c6 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 @@ -84,4 +84,13 @@ public class VehicleMessageQueryExe { public int countEnabledByLicenceNo(String licenceNo) { return vehicleMessageRepository.countEnabledByLicenceNo(licenceNo); } + + /** + * 根据用户ID获取该用户的车辆数量 + * @param userId 用户ID + * @return 车辆数量，如果没有则返回0 + */ + public int countByUserId(Long userId) { + return vehicleMessageRepository.countByUserId(userId); + } } \ No newline at end of file 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 ef07cbd..b210a85 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 @@ -85,10 +85,15 @@ public class VehicleMessageServiceImpl implements VehicleMessageServiceI { VehicleMessageCO vehicleMessageCO = vehicleMessageQueryExe.infoByLicenceNo(licenceNo); return vehicleMessageCO; } - + @Override public int countEnabledByLicenceNo(String licenceNo) { return vehicleMessageQueryExe.countEnabledByLicenceNo(licenceNo); } + @Override + public int countByUserId(Long userId) { + return vehicleMessageQueryExe.countByUserId(userId); + } + } 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 3775a90..4bf536d 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 @@ -35,7 +35,7 @@ public interface VehicleMessageServiceI { VehicleMessageCO infoByLicenceNo(String licenceNo ); - + /** * 根据车牌号查询启用状态的数据数量 * @param licenceNo 车牌号 @@ -43,4 +43,11 @@ public interface VehicleMessageServiceI { */ int countEnabledByLicenceNo(String licenceNo); + /** + * 根据用户ID获取该用户的车辆数量 + * @param userId 用户ID + * @return 车辆数量，如果没有则返回0 + */ + int countByUserId(Long userId); + } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateStatusCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateStatusCmd.java new file mode 100644 index 0000000..05dee2b --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/EmployeeMessageUpdateStatusCmd.java @@ -0,0 +1,25 @@ +package com.zcloud.primeport.dto; + +import com.alibaba.cola.dto.Command; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * web-client + * 更新员工消息状态命令 + * @Author guoyuepeng + * @Date 2025-12-18 14:32:14 + */ +@Data +public class EmployeeMessageUpdateStatusCmd extends Command { + + @ApiModelProperty(value = "员工消息ID", name = "id", required = true) + @NotNull(message = "员工消息ID不能为空") + private Long id; + + @ApiModelProperty(value = "状态：0-停用 1-启用", name = "status", required = true) + @NotNull(message = "状态不能为空") + private Integer status; +} \ No newline at end of file diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleStatusDTO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleStatusCO.java similarity index 72% rename from web-client/src/main/java/com/zcloud/primeport/dto/VehicleStatusDTO.java rename to web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleStatusCO.java index 6dfe684..24ec4f3 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleStatusDTO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleStatusCO.java @@ -1,4 +1,4 @@ -package com.zcloud.primeport.dto; +package com.zcloud.primeport.dto.clientobject; import lombok.Data; @@ -6,15 +6,15 @@ import lombok.Data; * 车辆状态数据传输对象 */ @Data -public class VehicleStatusDTO { - +public class VehicleStatusCO { + /** * 车牌号 */ private String licenceNo; - + /** * 启用状态车辆数量 */ private int enabledCount; -} \ No newline at end of file +} diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java index cc37dbe..498b30c 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/gateway/VehicleMessageGateway.java @@ -1,6 +1,7 @@ package com.zcloud.primeport.domain.gateway; import com.zcloud.primeport.domain.model.VehicleMessageE; +import com.zcloud.primeport.dto.VehicleAddCheckResultDTO; /** * web-domain @@ -41,7 +42,10 @@ public interface VehicleMessageGateway { /** * 根据用户ID获取这个用户有多少车辆 + * @param userId 用户ID + * @return 车辆数量 */ + Integer countByUserId(Long userId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java index a9080d6..61cccbf 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/gatewayimpl/VehicleMessageGatewayImpl.java @@ -72,5 +72,10 @@ public class VehicleMessageGatewayImpl implements VehicleMessageGateway { return vehicleMessageRepository.countEnabledByLicenceNo(licenceNo); } + @Override + public Integer countByUserId(Long userId) { + return vehicleMessageRepository.countByUserId(userId); + } + } 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 4cb9540..ffbe292 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 @@ -36,4 +36,11 @@ public interface VehicleMessageRepository extends BaseRepository queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("employee_vehicle_user_id", userId); + queryWrapper.eq("delete_enum", "FALSE"); + queryWrapper.eq("is_status", 1); + return vehicleMessageMapper.selectCount(queryWrapper).intValue(); + } + }