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 9dc38ae..d67c669 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 @@ -7,10 +7,7 @@ import com.alibaba.cola.dto.SingleResponse; 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.VehicleMessageAddCmd; -import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; -import com.zcloud.primeport.dto.VehicleMessagePageQry; -import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,26 +38,6 @@ public class VehicleMessageController { SSOUser ssoUser = AuthContext.getCurrentUser(); return vehicleMessageService.add(cmd); } - - @ApiOperation("分页") - @PostMapping("/list") - public PageResponse page(@RequestBody VehicleMessagePageQry qry) { - return vehicleMessageService.listPage(qry); - } - - @ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - } - - @ApiOperation("删除多个") - @DeleteMapping("/ids") - public Response removeBatch(@RequestParam Long[] ids) { - vehicleMessageService.removeBatch(ids); - return SingleResponse.buildSuccess(); - } - @ApiOperation("新增-监管端,分子公司人员车辆") @PostMapping("/saveFroCorp") public SingleResponse addForCorp(@Validated @RequestBody VehicleMessageForCorpAddCmd cmd) { @@ -84,5 +61,22 @@ public class VehicleMessageController { VehicleMessageCO infoById = vehicleMessageService.getInfoById(id); return SingleResponse.of(infoById); } + @ApiOperation("分页") + @PostMapping("/list") + public PageResponse page(@RequestBody VehicleMessagePageQry qry) { + return vehicleMessageService.listPage(qry); + } + /** + * 开启/关闭 + * @param statusCmd + * @return + */ + @ApiOperation("修改状态") + @PutMapping("/editStatus") + public SingleResponse editStatus(@Validated @RequestBody VehicleMessageStatusCmd statusCmd) { + vehicleMessageService.updateStatus(statusCmd); + return SingleResponse.buildSuccess(); + } + } diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java index 1a7ef43..9cc8f95 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleMessageUpdateExe.java @@ -5,6 +5,7 @@ import com.zcloud.primeport.domain.gateway.VehicleAuditLogGateway; import com.zcloud.primeport.domain.gateway.VehicleMessageGateway; import com.zcloud.primeport.domain.model.VehicleAuditLogE; import com.zcloud.primeport.domain.model.VehicleMessageE; +import com.zcloud.primeport.dto.VehicleMessageStatusCmd; import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -61,5 +62,17 @@ public class VehicleMessageUpdateExe { throw new BizException("修改失败"); } } + + + @Transactional(rollbackFor = Exception.class) + public void updateStatus(VehicleMessageStatusCmd statusCmd) { + VehicleMessageE vehicleMessageE = new VehicleMessageE(); + BeanUtils.copyProperties(statusCmd, vehicleMessageE); + vehicleMessageE.updateFromCorp(vehicleMessageE); + boolean res = vehicleMessageGateway.update(vehicleMessageE); + if (!res) { + throw new BizException("修改失败"); + } + } } 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 a325a1d..412c4a8 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 @@ -6,10 +6,7 @@ import com.zcloud.primeport.command.VehicleMessageAddExe; import com.zcloud.primeport.command.VehicleMessageRemoveExe; import com.zcloud.primeport.command.VehicleMessageUpdateExe; import com.zcloud.primeport.command.query.VehicleMessageQueryExe; -import com.zcloud.primeport.dto.VehicleMessageAddCmd; -import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; -import com.zcloud.primeport.dto.VehicleMessagePageQry; -import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -71,5 +68,12 @@ public class VehicleMessageServiceImpl implements VehicleMessageServiceI { VehicleMessageCO vehicleMessageCO = vehicleMessageQueryExe.queryById(id); return vehicleMessageCO; } + + @Override + public void updateStatus(VehicleMessageStatusCmd statusCmd) { + vehicleMessageUpdateExe.updateStatus(statusCmd); + } + + } 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 49a42d9..47171f5 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 @@ -3,10 +3,7 @@ package com.zcloud.primeport.api; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.primeport.dto.VehicleMessageAddCmd; -import com.zcloud.primeport.dto.VehicleMessageForCorpAddCmd; -import com.zcloud.primeport.dto.VehicleMessagePageQry; -import com.zcloud.primeport.dto.VehicleMessageUpdateCmd; +import com.zcloud.primeport.dto.*; import com.zcloud.primeport.dto.clientobject.VehicleMessageCO; /** @@ -30,5 +27,6 @@ public interface VehicleMessageServiceI { VehicleMessageCO getInfoById(Long id); + void updateStatus(VehicleMessageStatusCmd statusCmd); } 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 ae3a2f4..4bc23c5 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 @@ -26,5 +26,8 @@ public class VehicleAuditLogPageQry extends PageQuery { @ApiModelProperty("车辆ID") private String eqVehicleMessageId; + + @ApiModelProperty("审批状态(0,申请;2.更新)") + private String eqBatchState; } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.java new file mode 100644 index 0000000..7ac4886 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/primeport/dto/VehicleMessageStatusCmd.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.NotEmpty; + +/** +* web-client +* @Author guoyuepeng +* @Date 2025-11-15 11:41:21 +*/ +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class VehicleMessageStatusCmd extends Command { + @ApiModelProperty(value = "id", name = "id", required = true) + @NotEmpty(message = "id不能为空") + private Long id; + @ApiModelProperty(value = "进出港权限(1:有 2：无)", name = "mkmjPermission", required = true) + @NotEmpty(message = "进出港权限(1:有 2：无)不能为空") + private String mkmjPermission; +} +