From 5ffc5c22b0833d8f569e99eb775d08ca28676c7d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 14:37:16 +0800
Subject: [PATCH] 细节调整2
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 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 a25b518..5a95626 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
@@ -1,5 +1,7 @@
package com.fzzy.igds.utils;
+import com.fzzy.igds.camera.data.ydqly.YdQlyNode;
+import com.fzzy.igds.constant.GrainFrequence;
import com.ruoyi.common.config.FrameworkConfig;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.ShiroUtils;
@@ -31,6 +33,10 @@
*/
public static Map<String, String> contextSnCompanyIdMap = new HashMap<>();
+ /**
+ * 娴佸獟浣撹妭鐐逛娇鐢�
+ */
+ public static List<YdQlyNode> nodeList = null;
/**
* 鐢熸垚椤哄簭ID锛氬勾鏈堟棩鏃跺垎绉掓绉�(17浣�) + 搴忓垪鍙�(4浣�) = 21浣�
@@ -69,8 +75,8 @@
}
}
- if (null == prefix) return String.format("%s%04d", currentTimestamp, seq);
- return prefix + "_" + String.format("%s%04d", currentTimestamp, seq);
+ if (null == prefix) return String.format("%s%02d", currentTimestamp, seq);
+ return prefix + "_" + String.format("%s%02d", currentTimestamp, seq);
}
@@ -93,6 +99,11 @@
public static String getLoginUserName() {
SysUser user = ShiroUtils.getSysUser();
return null == user ? "绯荤粺" : user.getUserName();
+ }
+
+ public static String getLoginName() {
+ SysUser user = ShiroUtils.getSysUser();
+ return null == user ? "sys" : user.getLoginName();
}
public static SysUser getLoginUser() {
@@ -178,4 +189,52 @@
public static String getTimeId(int start, int end) {
return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss") + RandomUtils.nextInt(start, end);
}
+
+
+ /**
+ * 濡傛灉鐢ㄦ埛鏄簱鍖虹敤鎴凤紝鍒ゆ柇鏄惁鏁版嵁鍏徃绾у埆
+ *
+ * @param userDeptId 褰撳墠鐢ㄦ埛閮ㄩ棬ID
+ * @return 濡傛灉閮ㄩ棬ID澶т簬闀垮害7璇存槑鏄簱鍖猴紝鍚﹀垯灏辨槸鍏徃绾у埆
+ */
+ public static boolean isDepotUser(String userDeptId) {
+ if(StringUtils.isBlank(userDeptId)) return false;
+ return userDeptId.length() > 7;
+ }
+
+
+ /**
+ * 鏍规嵁绯荤粺閰嶇疆鐨勬壒娆￠鐜囪幏鍙栨壒娆＄紪鍙�
+ *
+ * @param freq
+ * @return
+ */
+ public static String getBatchIdByFireq(String freq) {
+ // 涓�澶╀竴娆�
+ if (GrainFrequence.FREQ_02.getCode().equals(freq)) {
+ return DateFormatUtils.format(new Date(), "yyyyMMdd") + "1801";
+ }
+
+ // 涓�澶╀袱娆�
+ if (GrainFrequence.FREQ_03.getCode().equals(freq)) {
+ String hour = DateFormatUtils.format(new Date(), "HH");
+ if (Integer.valueOf(hour) >= 0 && Integer.valueOf(hour) <= 12) {
+ return DateFormatUtils.format(new Date(), "yyyyMMdd") + "1301";
+ } else {
+ return DateFormatUtils.format(new Date(), "yyyyMMdd") + "1802";
+ }
+ }
+ return getDefaultBatchId();
+ }
+
+ public static String getDefaultBatchId() {
+ return DateFormatUtils.format(new Date(), "yyyyMMddHHmm");
+ }
+
+ public static void main(String[] args) {
+ for (int i = 0; i < 10; i++){
+ String id = generateId();
+ System.out.println(id);
+ }
+ }
}
--
Gitblit v1.9.3