From 8b1b572427fb6b4a80980556af889ba68e7f63b5 Mon Sep 17 00:00:00 2001 From: Allenxy <13762749+chaosallen@user.noreply.gitee.com> Date: Wed, 9 Oct 2024 21:05:06 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=9E=9A=E4=B8=BE=E7=B1=BB=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fizz/business/constants/enums/NextUnitEnum.java | 3 ++- .../com/fizz/business/constants/enums/OperModeEnum.java | 3 ++- .../com/fizz/business/constants/enums/PlanStatusEnum.java | 3 ++- .../src/main/java/com/fizz/business/domain/CrmPdiPlan.java | 6 ++++++ .../src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java | 6 ++++++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java b/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java index c96a1c4..d6b0f08 100644 --- a/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java +++ b/business/src/main/java/com/fizz/business/constants/enums/NextUnitEnum.java @@ -10,6 +10,7 @@ import lombok.Getter; @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum NextUnitEnum { + COLD(1,"冷硬卷"), HOT(2,"退火卷"), OTHER(3,"其他"); @@ -25,6 +26,6 @@ public enum NextUnitEnum { return unit; } } - throw new IllegalArgumentException("Invalid code: " + code); + return OTHER; } } diff --git a/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java b/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java index 20314f2..e615133 100644 --- a/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java +++ b/business/src/main/java/com/fizz/business/constants/enums/OperModeEnum.java @@ -10,6 +10,7 @@ import lombok.Getter; @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OperModeEnum { + UNKNOWN(0,"未知"), FORCE(1,"轧制力模式"), ELONG(2,"延伸率模式"); @@ -24,7 +25,7 @@ public enum OperModeEnum { return modeEnum; } } - throw new IllegalArgumentException("Invalid code: " + code); + return UNKNOWN; } } diff --git a/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java b/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java index 2116c7e..efb72c2 100644 --- a/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java +++ b/business/src/main/java/com/fizz/business/constants/enums/PlanStatusEnum.java @@ -10,6 +10,7 @@ import lombok.Getter; @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PlanStatusEnum { + UNKNOWN("UNKNOWN","未知状态"), NEW("NEW","新计划"), READY("READY","准备好"), ONLINE("ONLINE","上线"), @@ -27,6 +28,6 @@ public enum PlanStatusEnum { return planStatus; } } - throw new IllegalArgumentException("Invalid status: " + status); + return UNKNOWN; } } diff --git a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java index 4a33992..a84440e 100644 --- a/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java +++ b/business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java @@ -2,6 +2,7 @@ package com.fizz.business.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fizz.business.constants.enums.NextUnitEnum; import com.fizz.business.constants.enums.OperModeEnum; import com.fizz.business.constants.enums.PlanStatusEnum; @@ -128,18 +129,23 @@ public class CrmPdiPlan implements Serializable { @ApiModelProperty(value = "厚度正偏差") private Float entryThickMintol; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "计划日期") private LocalDateTime createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "记录日期") private LocalDateTime insdate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "上线时间") private LocalDateTime onlineTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "开始日期") private LocalDateTime startDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束日期") private LocalDateTime endDate; } \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java index eccf1e0..6da3c3f 100644 --- a/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java +++ b/business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java @@ -1,5 +1,6 @@ package com.fizz.business.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fizz.business.constants.enums.NextUnitEnum; import com.fizz.business.constants.enums.OperModeEnum; import com.fizz.business.constants.enums.PlanStatusEnum; @@ -123,18 +124,23 @@ public class CrmPdiPlanVO { @ApiModelProperty(value = "厚度正偏差") private Float entryThickMintol; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "计划日期") private LocalDateTime createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "记录日期") private LocalDateTime insdate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "上线时间") private LocalDateTime onlineTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "开始日期") private LocalDateTime startDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束日期") private LocalDateTime endDate; }