From a3a66aa959151e91f57be097b83f2a2715b502f5 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 31 三月 2025 13:11:36 +0800
Subject: [PATCH] 定时任务增加同步锁
---
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index ea168c3..c5cfbe3 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -86,9 +86,9 @@
private Date updateTime;
/**
- * 绫诲瀷 0:闈炵┖ 1:绌烘澘
+ * 绫诲瀷 1:闈炵┖ 2:绌烘澘
*/
- @ApiModelProperty(value = "绫诲瀷 0:闈炵┖ 1:绌烘澘")
+ @ApiModelProperty(value = "绫诲瀷 1:闈炵┖ 2:绌烘澘")
private Integer type;
/**
@@ -106,9 +106,9 @@
private Integer lineNumber;
/**
- * 宸ヤ綔绫诲瀷
+ * 宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
*/
- @ApiModelProperty(value = "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�")
+ @ApiModelProperty(value = "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�")
@TableField("wrk_type")
private Integer wrkType;
@@ -129,6 +129,18 @@
this.wrkEnd = wrkMast.getStaNo();
this.staStart = basDevp.getDevNo();
this.staEnd = getStaEnd(wrkMast.getStaNo());
+ this.createTime = now;
+ this.updateTime = now;
+ this.wrkSts = 0;
+ this.bignTime = now;
+ }
+
+ public WrkMastSta(Date now, Integer staStart) {
+ this.wrkNo = staStart.longValue()+19999L;
+ this.wrkStart = staStart;
+ this.wrkEnd = staStart;
+ this.staStart = staStart;
+ this.staEnd = staStart;
this.createTime = now;
this.updateTime = now;
this.wrkSts = 0;
@@ -200,5 +212,72 @@
}
}
+ public String getType$() {
+ if (Cools.isEmpty(this.type)) {
+ return "";
+ }
+ switch (this.type) {
+ case 1:
+ return "闈炵┖";
+ case 2:
+ return "绌烘澘";
+ default:
+ return "";
+ }
+ }
+
+ /**
+ * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
+ */
+ public String getWrkSts$() {
+ if (Cools.isEmpty(this.wrkSts)) {
+ try {
+ if (this.wrkSts==0){
+ return "鍒濆";
+ }
+ }catch (Exception e){
+ return "";
+ }
+ return "";
+ }
+ switch (this.wrkSts) {
+ case 0:
+ return "鍒濆";
+ case 1:
+ return "绛夊緟灏忚溅鍙�";
+ case 2:
+ return "绛夊緟灏忚溅鏀�";
+ case 3:
+ return "瀹屾垚";
+ default:
+ return "";
+ }
+ }
+
+ /**
+ * 宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ */
+ public String getWrkType$() {
+ if (Cools.isEmpty(this.wrkType)) {
+ return "";
+ }
+ switch (this.wrkType) {
+ case 1:
+ return "鍙犵洏";
+ case 2:
+ return "鎷嗙洏";
+ case 3:
+ return "鍙栨斁";
+ case 4:
+ return "琛岃蛋";
+ case 5:
+ return "婊″彇";
+ case 6:
+ return "婊℃斁";
+ default:
+ return "";
+ }
+ }
+
}
--
Gitblit v1.9.1