From 2689c8fec95018952784bd8d032afb5a194a6616 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 02 九月 2025 00:17:45 +0800
Subject: [PATCH] 增加文件监控
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 c768300..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,21 +1,32 @@
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 {
+ /**
+ * 鐘舵�侊細1 鍚敤
+ */
+ public static final int STATUS_ENABLE = 1;
+ /**
+ * 鐘舵�侊細2 绂佺敤
+ */
+ public static final int STATUS_DISABLED = 2;
private String name;
private String code;
/**
- * 鎵�灞炴満搴婄粍ID
+ * 鎵�灞炴満搴婄粍code锛屽瓧鍏竚achine_group
*/
- private Long machineGroupId;
+ private String machineGroupCode;
/**
* 鏈哄櫒瑙勬牸:01杞﹀簥/02閾ｅ簥,鍦ㄤ笟鍔″瓧鍏搁厤缃紙key=machine_spec锛�
*/
@@ -45,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