From 82c36e2b434fa7a1c16b0448aa4cf1483107f79c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 02 十二月 2025 16:28:20 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/utils/Utils.java |  249 +++++++++----------------------------------------
 1 files changed, 48 insertions(+), 201 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index ac35d91..f78bac3 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,18 +1,19 @@
 package com.zy.asrs.utils;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.core.common.Arith;
 import com.core.common.Cools;
-import com.zy.core.properties.SlaveProperties;
+import com.core.common.SpringUtils;
+import com.zy.common.utils.RedisUtil;
+import com.zy.core.enums.RedisKeyType;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
 
-/**
- * Created by vincent on 2020/8/27
- */
 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,174 +37,13 @@
         }
     }
 
-    public static Integer getGroupRow(Integer row) {
-        switch (row) {
-            case 1:
-            case 2:
-            case 3:
-                return 3;
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-                return 4;
-            case 8:
-            case 9:
-            case 10:
-            case 11:
-                return 11;
-            case 12:
-            case 13:
-            case 14:
-                return 12;
-            case 15:
-            case 16:
-            case 17:
-            case 18:
-                return 18;
-            case 19:
-            case 20:
-            case 21:
-                return 19;
-            default:
-                throw new RuntimeException("搴撲綅瑙f瀽寮傚父");
-        }
-    }
-
-
-    public static Integer getGroupRow(String locNo){
-        int row = getRow(locNo);
-        return getGroupRow(row);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-    // -------------------------------------------------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘繁搴撲綅
-     */
-    public static boolean isDeepLoc(SlaveProperties slaveProperties, String locNo){
-        if (slaveProperties.isDoubleDeep()) {
-            int row = getRow(locNo);
-            return slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘繁搴撲綅
-     */
-    public static boolean isDeepLoc(SlaveProperties slaveProperties, Integer row){
-        if (slaveProperties.isDoubleDeep()) {
-            return slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘祬搴撲綅
-     */
-    public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
-        if (slaveProperties.isDoubleDeep()) {
-            int row = getRow(locNo);
-            return !slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鍒ゆ柇鏄惁涓烘祬搴撲綅
-     */
-    public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
-        if (slaveProperties.isDoubleDeep()) {
-            return !slaveProperties.getDoubleLocs().contains(row);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * 鑾峰彇 娣卞簱浣嶅搴旂殑娴呭簱浣嶅彿
-     */
-    public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
-        int row = getRow(deepLoc);
-        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
-        int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
-        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
-    }
-
-    /**
-     * 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
-     */
-    public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
-        int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
-        return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
-    }
-
-    /**
-     * 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
-     */
-    public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
-        int row = getRow(shallowLoc);
-        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
-        int targetRow;
-        if (remainder == 2) {
-            targetRow = row - 1;
-        } else if (remainder == 3) {
-            targetRow = row + 1;
-        } else {
-            throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
-        }
-        return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-    }
-
-    /**
-     * 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
-     */
-    public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
-        int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
-        int targetRow;
-        if (remainder == 2) {
-            targetRow = shallowRow - 1;
-        } else if (remainder == 3) {
-            targetRow = shallowRow + 1;
-        } else {
-            throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
-        }
-        return targetRow;
-    }
-
     /**
      * 閫氳繃搴撲綅鍙疯幏鍙� 鎺�
      */
     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("搴撲綅瑙f瀽寮傚父");
     }
@@ -213,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("搴撲綅瑙f瀽寮傚父");
     }
@@ -223,46 +64,52 @@
      */
     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("搴撲綅瑙f瀽寮傚父");
     }
 
-    /**
-     * 閫氳繃鎺掑垪灞傛嫾鎺ュ嚭搴撲綅鍙�
-     */
-    public static String append(int row, int bay, int lev) {
-        return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
+    public static String getLocNo(Number row, Number bay, Number lev) {
+        return row + LOC_NO_FLAG + bay + LOC_NO_FLAG + lev;
     }
 
-
-    /**
-     * 褰撴绱㈠埌鍙屾繁搴撲綅鐨勬祬搴撲綅鏃讹紝濡傛灉娣卞簱浣嶆棤璐э紝鍒欐斁鍏ュ搴旂殑娣卞簱浣�
-     */
-    public static void toDeepIfEmptyByShallow(String shallowLoc) {
-        int row = getRow(shallowLoc);
-        int remainder = (int) Arith.remainder(row, 4);
-        int targetRow = 0;
-        if (remainder == 2) {
-            targetRow = row - 1;
-        } else if (remainder == 3) {
-            targetRow = row + 1;
-        } else {
-            throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+    public static boolean isJSON(String value) {
+        try {
+            JSONObject jsonData = JSON.parseObject(value);
+            if (jsonData == null) {
+                return false;
+            }
+            return true;
+        } catch (Exception e) {
+            return false;
         }
-        String targetLoc = zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
-
     }
 
-    public static void main(String[] args) {
-        SlaveProperties slaveProperties = new SlaveProperties();
-        slaveProperties.setDoubleDeep(true);
-        List<Integer> list = new ArrayList<>();
-        list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
-        slaveProperties.setDoubleLocs(list);
-        slaveProperties.setGroupCount(4);
-        Integer deepRow = getDeepRow(slaveProperties, 6);
-        System.out.println(deepRow);
+    //鑾峰彇璁惧鏃ュ織閲囬泦鏃堕棿
+    public static int getDeviceLogCollectTime() {
+        int defaultTime = 200;
+        try {
+            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);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return defaultTime;
     }
 }

--
Gitblit v1.9.1