From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 20 十一月 2024 18:48:23 +0800 Subject: [PATCH] 1、基于Timer实现定时执行的任务,并在满足条件下结束定时任务,为此实现抽象类TimerTaskJob类,并在UpgradeManager类中应用; 2、TreadJob类由TimerTaskJob替换,弃用TreadJob类。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java index a6aaed0..197d597 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoUnit.java @@ -3,6 +3,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.dy.common.po.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -21,13 +22,14 @@ public String projectName; @Schema(description = "杞亴缁勭紪鐮�") - private int groupCode; + private String groupCode; @Schema(description = "鐏屾簤鍗曞厓ID") private String unitId; @Schema(description = "鐏屾簤闈㈢Н") - private Integer area; + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) + private Double area; @Schema(description = "澶囨敞") private String remarks; @@ -49,4 +51,10 @@ */ @Schema(description = "鎿嶄綔鏃堕棿") private Date operateDt; + + @Schema(description = "鍙栨按鍙d") + public String intakeId; + + @Schema(description = "鍙栨按鍙e悕绉�") + public String intakeName; } -- Gitblit v1.8.0