From 53fab3f56e8335fbf39fc07c4e10f6abdb0505bb Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 03 十二月 2025 18:48:11 +0800
Subject: [PATCH] 登记、化验、称重页面调整，及登记化验数据提交
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index 7134167..c23c9e4 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -22,16 +22,42 @@
private static final AtomicLong sequence = new AtomicLong(0);
private static String lastTimestamp = "";
+
//鍏ㄥ眬鐢ㄦ埛瀹炴椂鍧愬湪閮ㄩ棬
public static Map<String, String> contextUserDept = new HashMap<>();
/**
+ * 鍏ㄥ眬鐢ㄤ簬瀛樻斁SN涓庣粍缁囩紪鐮佺殑鍏崇郴锛屼緥濡傚垎鏈篠N鍜岀粍缁囩紪鐮佸叧绯�
+ */
+ public static Map<String, String> contextSnCompanyIdMap = new HashMap<>();
+
+
+ /**
* 鐢熸垚椤哄簭ID锛氬勾鏈堟棩鏃跺垎绉掓绉�(17浣�) + 搴忓垪鍙�(4浣�) = 21浣�
+ */
+ public static String generateId() {
+ String pattern = "yyyyMMddHHmmssSSS";
+ return generateId(null, pattern);
+ }
+
+ /**
+ * 鐢熸垚鍗曟嵁缂栫爜锛� (鏍煎紡: yyyyMMddHHmmss + 4浣嶉殢鏈烘暟)
+ * @param prefix
+ * @return
+ */
+ public static String generateOrderId(String prefix) {
+ String pattern = "yyyyMMddHHmmss";
+ return generateId(prefix, pattern);
+ }
+
+ /**
+ *
*
* @return
*/
- public static String generateId() {
- String currentTimestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
+ private static String generateId(String prefix, String pattern) {
+ if (null == pattern) pattern = "yyyyMMddHHmmss";
+ String currentTimestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern(pattern));
long seq;
synchronized (ContextUtil.class) {
if (currentTimestamp.equals(lastTimestamp)) {
@@ -39,12 +65,14 @@
} else {
sequence.set(0);
seq = 0;
-
lastTimestamp = currentTimestamp;
}
}
- return String.format("%s%04d", currentTimestamp, seq);
+
+ if (null == prefix) return String.format("%s%04d", currentTimestamp, seq);
+ return prefix + "_" + String.format("%s%04d", currentTimestamp, seq);
}
+
public static String UUID() {
return UUID.randomUUID().toString().replaceAll("-", "");
@@ -58,7 +86,7 @@
public static String getCompanyId() {
SysUser user = ShiroUtils.getSysUser();
- if(null != user) return user.getCompanyId();
+ if (null != user) return user.getCompanyId();
return FrameworkConfig.getCompanyId();
}
@@ -108,18 +136,38 @@
Integer index5 = 100001;
Integer index = 0;
String orderId = "001";
- if(StringUtils.isNotEmpty(oldOrderId)){
+ if (StringUtils.isNotEmpty(oldOrderId)) {
index = Integer.valueOf(oldOrderId);
}
- if(3 == num){
+ if (3 == num) {
orderId = ((index3 + index) + "").substring(1);
}
- if(4 == num){
+ if (4 == num) {
orderId = ((index4 + index) + "").substring(1);
}
- if(5 == num){
+ if (5 == num) {
orderId = ((index5 + index) + "").substring(1);
}
return orderId;
}
+
+ /**
+ * 瀛樻斁SN涓庢墍灞炵粍缁囩殑鍏崇郴
+ *
+ * @param sn
+ * @param companyId
+ */
+ public static void addSerCompany(String sn, String companyId) {
+ contextSnCompanyIdMap.put(sn, companyId);
+ }
+
+ /**
+ * 閫氳繃SN鑾峰彇褰撳墠SN鎵�灞炵殑缁勭粐
+ *
+ * @param sn
+ * @return
+ */
+ public static String getCompanyIdBySn(String sn) {
+ return contextSnCompanyIdMap.get(sn);
+ }
}
--
Gitblit v1.9.3