From 5d99227a97b7b244893b748af28e7f78238d2951 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 05 九月 2025 01:15:15 +0800
Subject: [PATCH] 任务提醒，增加导出提醒；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
index 6fdee96..66b35a9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
@@ -1,13 +1,16 @@
package org.springblade.mdm.basesetting.machine.entity;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.base.BizEntity;
@Setter
@Getter
+@EqualsAndHashCode(callSuper = false)
@TableName("mdm_machine")
public class Machine extends BizEntity {
/**
@@ -53,12 +56,45 @@
*/
private String progSendDir;
/**
+ * send鏂囦欢澶逛繚鎸佹椂闂� 灏忔椂
+ */
+ private Integer sendDirExpiryHours;
+ /**
* 绋嬪簭鍥炰紶鐩綍',
*/
private String progReceiveDir;
/**
+ * receive鏂囦欢澶逛繚鎸佹椂闂� 灏忔椂
+ */
+ private Integer receiveDirExpiryHours;
+ /**
+ * 绋嬪簭闀挎湡瀛樺偍鐩綍
+ */
+ private String progTempDir;
+ /**
* 澶囨敞
*/
private String remark;
+ /**
+ * 娓呴櫎璺緞鏈熬鐨勬枩鏉�
+ * @param oriDir
+ * @return
+ */
+ public static String clearDirEnd(String oriDir){
+ return StringUtils.removeEnd(StringUtils.removeEnd(oriDir, "/"), "\\");
+ }
+
+ /**
+ * 鐩綍鏄惁鍙樻洿
+ * @param oriDir
+ * @param currentDir
+ * @return
+ */
+ public static boolean dirChanged(String oriDir,String currentDir){
+ String dir1 = clearDirEnd(oriDir);
+ String dir2 = clearDirEnd(currentDir);
+ return StringUtils.equals(dir1, dir2);
+ }
+
}
--
Gitblit v1.9.3