From fe024501537f84baa38d3f09367b757a5719b77a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 28 十一月 2025 16:44:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index a55a484..3c7d165 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -4,10 +4,16 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.common.utils.RedisUtil;
+import com.zy.core.enums.RedisKeyType;
+
import java.text.DecimalFormat;
+import java.util.HashMap;
public class Utils {
+ private static final String LOC_NO_FLAG = "-";
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
public static float scale(Float f){
@@ -36,7 +42,8 @@
*/
public static int getRow(String locNo) {
if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(0, 2));
+ String[] split = locNo.split(LOC_NO_FLAG);
+ return Integer.parseInt(split[0]);
}
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
@@ -46,7 +53,8 @@
*/
public static int getBay(String locNo) {
if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(2, 5));
+ String[] split = locNo.split(LOC_NO_FLAG);
+ return Integer.parseInt(split[1]);
}
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
@@ -56,13 +64,14 @@
*/
public static int getLev(String locNo) {
if (!Cools.isEmpty(locNo)) {
- return Integer.parseInt(locNo.substring(5, 7));
+ String[] split = locNo.split(LOC_NO_FLAG);
+ return Integer.parseInt(split[2]);
}
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
public static String getLocNo(Number row, Number bay, Number lev) {
- return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+ return row + LOC_NO_FLAG + bay + LOC_NO_FLAG + lev;
}
public static boolean isJSON(String value) {
@@ -76,4 +85,26 @@
return false;
}
}
+
+ //鑾峰彇璁惧鏃ュ織閲囬泦鏃堕棿
+ public static int getDeviceLogCollectTime() {
+ int defaultTime = 200;
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ if (redisUtil == null) {
+ return defaultTime;
+ }
+
+ Object object = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+ if (object == null) {
+ return defaultTime;
+ }
+
+ HashMap<String, String> systemConfigMap = (HashMap<String, String>) object;
+ String deviceLogCollectTime = systemConfigMap.get("deviceLogCollectTime");
+ if(deviceLogCollectTime == null){
+ return defaultTime;
+ }
+
+ return Integer.parseInt(deviceLogCollectTime);
+ }
}
--
Gitblit v1.9.1