feat(controller): 修复吞吐各个接口的查询时间问题

- 引入 Jackson 的 @JsonFormat 注解用于日期格式化
- 添加 Spring 的 @DateTimeFormat 注解用于日期参数解析
- 配置 startTime 和 endTime 参数的日期时间格式为 yyyy-MM-dd HH:mm:ss
- 确保日期参数在请求中的正确序列化和反序列化
This commit is contained in:
2026-03-25 10:16:19 +08:00
parent 6cb78bd3bf
commit c01074582d

View File

@@ -4,9 +4,12 @@ import java.util.List;
import java.util.Arrays;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
@@ -129,8 +132,8 @@ public class WmsCoilWarehouseOperationLogController extends BaseController {
@RequestParam Long secondWarehouseId,
@RequestParam(required = false) Integer operationType,
@RequestParam(required = false) Integer inOutType,
@RequestParam(required = false) Date startTime,
@RequestParam(required = false) Date endTime) {
@RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
@RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
return R.ok(iWmsCoilWarehouseOperationLogService.queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, operationType, inOutType, startTime, endTime));
}
@@ -148,8 +151,8 @@ public class WmsCoilWarehouseOperationLogController extends BaseController {
@RequestParam @NotNull(message = "钢卷ID不能为空") Long coilId,
@RequestParam(required = false) Integer operationType,
@RequestParam(required = false) Integer inOutType,
@RequestParam(required = false) Date startTime,
@RequestParam(required = false) Date endTime) {
@RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
@RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
return R.ok(iWmsCoilWarehouseOperationLogService.queryByCoilId(coilId, operationType, inOutType, startTime, endTime));
}
@@ -168,8 +171,8 @@ public class WmsCoilWarehouseOperationLogController extends BaseController {
@RequestParam Long secondWarehouseId,
@RequestParam(required = false) Integer operationType,
@RequestParam(required = false) Integer inOutType,
@RequestParam(required = false) Date startTime,
@RequestParam(required = false) Date endTime,
@RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
@RequestParam(required = false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
HttpServletResponse response) {
List<WmsCoilWarehouseOperationLogExportVo> list = iWmsCoilWarehouseOperationLogService.exportBySecondWarehouseIdAndTimeRange(secondWarehouseId, operationType, inOutType, startTime, endTime);
ExcelUtil.exportExcel(list, "钢卷库区操作记录导出", WmsCoilWarehouseOperationLogExportVo.class, response);