diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeDispatchConfigurationController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeWorkOrderConfigurationController.java similarity index 75% rename from ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeDispatchConfigurationController.java rename to ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeWorkOrderConfigurationController.java index 9bbe935..3a40a29 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeDispatchConfigurationController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeWorkOrderConfigurationController.java @@ -4,11 +4,12 @@ import com.cdzy.common.model.request.PageParam; import com.cdzy.common.model.response.JsonResult; import com.cdzy.operations.model.dto.EbikeSaveConfigurationDto; import com.cdzy.operations.model.dto.EbikeUpdateConfigurationDto; -import com.cdzy.operations.model.entity.EbikeDispatchConfiguration; -import com.cdzy.operations.service.EbikeDispatchConfigurationService; +import com.cdzy.operations.model.entity.EbikeWorkOrderConfiguration; +import com.cdzy.operations.service.EbikeWorkOrderConfigurationService; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,17 +20,17 @@ import org.springframework.web.bind.annotation.RestController; import static com.cdzy.operations.model.entity.table.EbikeDispatchConfigurationTableDef.EBIKE_DISPATCH_CONFIGURATION; /** - * 调度配置 控制层 + * 工单配置 控制层 * * @author yanglei * @since 2026-01-08 17:08 */ @RestController -@RequestMapping("/ebikeDispatchConfiguration") -public class EbikeDispatchConfigurationController { +@RequestMapping("/ebikeWorkOrderConfiguration") +public class EbikeWorkOrderConfigurationController { @Resource - private EbikeDispatchConfigurationService dispatchConfigurationService; + private EbikeWorkOrderConfigurationService dispatchConfigurationService; /** * 添加。 @@ -38,7 +39,7 @@ public class EbikeDispatchConfigurationController { * @return 主键id */ @PostMapping("save") - public JsonResult save(@RequestBody EbikeSaveConfigurationDto dto) { + public JsonResult save(@RequestBody @Validated EbikeSaveConfigurationDto dto) { dispatchConfigurationService.saveConfiguration(dto); return JsonResult.success(); } @@ -62,7 +63,7 @@ public class EbikeDispatchConfigurationController { * @return {@code true} 更新成功,{@code false} 更新失败 */ @PostMapping("update") - public JsonResult update(@RequestBody EbikeUpdateConfigurationDto dto) { + public JsonResult update(@RequestBody @Validated EbikeUpdateConfigurationDto dto) { dispatchConfigurationService.updateConfiguration(dto); return JsonResult.success(); } @@ -75,7 +76,7 @@ public class EbikeDispatchConfigurationController { */ @GetMapping("getById") public JsonResult getById(@RequestParam("configurationId") Long configurationId) { - EbikeDispatchConfiguration result = dispatchConfigurationService.getById(configurationId); + EbikeWorkOrderConfiguration result = dispatchConfigurationService.getById(configurationId); return JsonResult.success(result); } @@ -89,7 +90,7 @@ public class EbikeDispatchConfigurationController { public JsonResult page(PageParam page) { QueryWrapper queryWrapper = QueryWrapper.create() .select(EBIKE_DISPATCH_CONFIGURATION.ALL_COLUMNS); - Page orderPage = dispatchConfigurationService.pageAs(page.getPage(), queryWrapper, EbikeDispatchConfiguration.class); + Page orderPage = dispatchConfigurationService.pageAs(page.getPage(), queryWrapper, EbikeWorkOrderConfiguration.class); return JsonResult.success(orderPage); } } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeDispatchConfigurationMapper.java b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeDispatchConfigurationMapper.java index 087e03b..849747c 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeDispatchConfigurationMapper.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/mapper/EbikeDispatchConfigurationMapper.java @@ -1,6 +1,6 @@ package com.cdzy.operations.mapper; -import com.cdzy.operations.model.entity.EbikeDispatchConfiguration; +import com.cdzy.operations.model.entity.EbikeWorkOrderConfiguration; import com.mybatisflex.core.BaseMapper; /** @@ -10,5 +10,5 @@ import com.mybatisflex.core.BaseMapper; * @since 2025-12-03 16:21 */ -public interface EbikeDispatchConfigurationMapper extends BaseMapper { +public interface EbikeDispatchConfigurationMapper extends BaseMapper { } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSaveConfigurationDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSaveConfigurationDto.java index de0340e..960f0a9 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSaveConfigurationDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeSaveConfigurationDto.java @@ -1,6 +1,5 @@ package com.cdzy.operations.model.dto; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; @@ -30,6 +29,12 @@ public class EbikeSaveConfigurationDto { /** * 配置项骑行时长 */ - @NotBlank(message = "调度完成后多长时间内骑行是有效的不能为空") + @NotNull(message = "调度完成后多长时间内骑行是有效的不能为空") private Integer rideDuration; + + /** + * 巡检间隔时长(日) + */ + @NotNull(message = "巡检间隔时长不能为空") + private Integer inspectionIntervalDuration; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUpdateConfigurationDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUpdateConfigurationDto.java index af41207..a4621a6 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUpdateConfigurationDto.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUpdateConfigurationDto.java @@ -1,6 +1,5 @@ package com.cdzy.operations.model.dto; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; @@ -32,4 +31,9 @@ public class EbikeUpdateConfigurationDto { * 配置项骑行时长 */ private Integer rideDuration; + + /** + * 巡检间隔时长(日) + */ + private Integer inspectionIntervalDuration; } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeDispatchConfiguration.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeWorkOrderConfiguration.java similarity index 85% rename from ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeDispatchConfiguration.java rename to ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeWorkOrderConfiguration.java index c20e6a2..4e47ff3 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeDispatchConfiguration.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeWorkOrderConfiguration.java @@ -13,7 +13,7 @@ import java.io.Serializable; import java.time.LocalDateTime; /** - * 车辆调度配置 实体类 + * 工单配置 实体类 * * @author yanglei * @since 2025-12-03 16:18 @@ -23,8 +23,8 @@ import java.time.LocalDateTime; @Builder @NoArgsConstructor @AllArgsConstructor -@Table("ebike_dispatch_configuration") -public class EbikeDispatchConfiguration implements Serializable { +@Table("ebike_work_order_configuration") +public class EbikeWorkOrderConfiguration implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -50,6 +50,11 @@ public class EbikeDispatchConfiguration implements Serializable { */ private Integer rideDuration; + /** + * 巡检间隔时长(日) + */ + private Integer inspectionIntervalDuration; + /** * 创建时间 */ diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeDispatchConfigurationService.java b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeWorkOrderConfigurationService.java similarity index 71% rename from ebike-operations/src/main/java/com/cdzy/operations/service/EbikeDispatchConfigurationService.java rename to ebike-operations/src/main/java/com/cdzy/operations/service/EbikeWorkOrderConfigurationService.java index 1050569..08d8f53 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeDispatchConfigurationService.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeWorkOrderConfigurationService.java @@ -2,24 +2,24 @@ package com.cdzy.operations.service; import com.cdzy.operations.model.dto.EbikeSaveConfigurationDto; import com.cdzy.operations.model.dto.EbikeUpdateConfigurationDto; -import com.cdzy.operations.model.entity.EbikeDispatchConfiguration; +import com.cdzy.operations.model.entity.EbikeWorkOrderConfiguration; import com.mybatisflex.core.service.IService; /** - * 车辆相关配置 服务层 + * 工单配置 服务层 * * @author yanglei * @since 2025-12-03 16:22 */ -public interface EbikeDispatchConfigurationService extends IService { +public interface EbikeWorkOrderConfigurationService extends IService { /** * 根据运营商id获取配置项(sql会自动拼接运营商id) * * @return 配置项 */ - EbikeDispatchConfiguration getConfigurationByOperationId(Long operationId); + EbikeWorkOrderConfiguration getConfigurationByOperationId(Long operationId); /** * 保存配置项 diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java index 25733fd..70ce243 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java @@ -29,7 +29,7 @@ import com.cdzy.operations.model.entity.EbikeBikeInfo; import com.cdzy.operations.model.entity.EbikeBikeOrder; import com.cdzy.operations.model.entity.EbikeBikeQr; import com.cdzy.operations.model.entity.EbikeDefaultBillingConfiguration; -import com.cdzy.operations.model.entity.EbikeDispatchConfiguration; +import com.cdzy.operations.model.entity.EbikeWorkOrderConfiguration; import com.cdzy.operations.model.entity.EbikeEcuInfo; import com.cdzy.operations.model.entity.EbikeInventoryRecord; import com.cdzy.operations.model.entity.EbikeRegion; @@ -39,7 +39,7 @@ import com.cdzy.operations.model.entity.EbikeSpecialDay; import com.cdzy.operations.model.entity.EbikeSpecialTime; import com.cdzy.operations.model.vo.*; import com.cdzy.operations.service.EbikeBikeInfoService; -import com.cdzy.operations.service.EbikeDispatchConfigurationService; +import com.cdzy.operations.service.EbikeWorkOrderConfigurationService; import com.cdzy.operations.service.EbikeEcuInfoService; import com.cdzy.operations.service.EbikeInventoryRecordService; import com.cdzy.operations.service.EbikeInventoryService; @@ -128,7 +128,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl implements EbikeDispatchConfigurationService { +public class EbikeWorkOrderConfigurationServiceImpl extends ServiceImpl implements EbikeWorkOrderConfigurationService { @Override - public EbikeDispatchConfiguration getConfigurationByOperationId(Long operationId) { + public EbikeWorkOrderConfiguration getConfigurationByOperationId(Long operationId) { QueryWrapper queryWrapper = QueryWrapper.create() .select(EBIKE_DISPATCH_CONFIGURATION.ALL_COLUMNS) .and(EBIKE_DISPATCH_CONFIGURATION.OPERATOR_ID.eq(operationId, Objects.nonNull(operationId))); @@ -40,10 +40,11 @@ public class EbikeDispatchConfigurationServiceImpl extends ServiceImpl