From 124ecca15d3c5d6dcefa9a27aaa3c07c556674e9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 12:34:42 +0800
Subject: [PATCH] PK8000逻辑处理

---
 cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java |  534 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 316 insertions(+), 218 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
index b2ffe28..ab8db5b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
@@ -9,9 +9,11 @@
 import com.yuanchu.mom.exception.ErrorException;
 import com.yuanchu.mom.pojo.DataConfig;
 import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.vo.Result;
 
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -27,25 +29,38 @@
 
     private static final String splitIdentifier = "@-@"; // 鑷畾涔夊敮涓�鏍囪瘑鍒嗗壊绗�
 
+    public static final String frequency = "frequency";
+
     /**
      * 鏁伴噰鍏ュ彛
-     * @param request
+     *
      * @param dataConfig
      * @param device
      * @return
      */
-    public static Result<?> dataAcquisitionEntrance(HttpServletRequest request, List<DataConfig> dataConfig, Device device, String entrustCode, String sampleCode) {
-        String ipAddress = request.getRemoteAddr();
-        // 闃叉鍥炵幆鍦板潃鍙樹负IPv6
-        String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
-        String http = HTTP + ip + GETFILE + "?filePath=" + device.getCollectUrl() + "&fileExtension=" + device.getFileType();
+    public static Map<String, String> dataAcquisitionEntrance(List<DataConfig> dataConfig, Device device, String entrustCode, String sampleCode, String ip) {
+        /**
+         * filePath 鏂囦欢閲囬泦璺緞
+         * fileExtension 鏂囦欢鍚庣紑
+         * entrustCode 濮旀墭缂栧彿
+         * sampleCode 鏍峰搧缂栧彿
+         * mdbEntrustCode mdb鏂囦欢闇�瑕侊細濮旀墭缂栧彿瀛楁
+         * mdbSampleCode mdb鏂囦欢闇�瑕侊細鏍峰搧缂栧彿瀛楁
+         */
+        String http = HTTP + ip + GETFILE +
+                "?filePath=" + device.getCollectUrl() +
+                "&fileExtension=" + device.getFileType() +
+                "&entrustCode=" + entrustCode +
+                "&sampleCode=" + sampleCode +
+                "&mdbEntrustCode=" + device.getMdbEntrustCode() +
+                "&mdbSampleCode=" + device.getMdbSampleCode();
         String result = null;
         try {
             result = HttpUtil.get(http);
         } catch (IORuntimeException e) {
             throw new ErrorException("鎵�鍦ㄧ數鑴戞湭瀹夎鎴栨湭鍚姩锛歀IMS鏂囦欢閲囬泦鍣紒");
         }
-        JSONObject jsonObject =  JSON.parseObject(result);
+        JSONObject jsonObject = JSON.parseObject(result);
         if (Objects.equals(jsonObject.get("code"), 1)) {
             if (ObjectUtils.isEmpty(jsonObject.get("msg"))) {
                 throw new ErrorException("鏈煡璇㈠埌鏁版嵁锛屽彲鑳芥枃浠惰矾寰勯厤缃敊璇紒");
@@ -56,7 +71,11 @@
         } else {
             String data = jsonObject.get("data").toString();
             // 鑰冭檻鍒颁竴涓娴嬮」鍙兘浼氬瓨鍦ㄥ涓暟閲囬厤缃紝鎵�浠ラ渶瑕佽繘琛屽垎缁�
-            Map<String, List<DataConfig>> userMap = dataConfig.stream().collect(Collectors.groupingBy(DataConfig::getInsProductItem));
+            Map<String, List<DataConfig>> userMap = dataConfig.stream()
+                    .peek(i -> i.setInsProductItem(
+                            i.getInspectionItem().equals(i.getInspectionItemSubclass()) ? i.getInspectionItem() + "," : i.getInspectionItem() + "," + i.getInspectionItemSubclass()
+                    ))
+                    .collect(Collectors.groupingBy(DataConfig::getInsProductItem));
             Map<String, String> map;
             switch (device.getFileType()) {
                 case ".docx":
@@ -72,7 +91,7 @@
                     map = analysisList(data, userMap);
                     break;
                 case ".mdb":
-                    map = analysisMdb(data, userMap, entrustCode, sampleCode);
+                    map = analysisMdb(data, userMap);
                     break;
                 case ".db":
                     map = analysisDb(data, userMap);
@@ -86,52 +105,52 @@
             }
             // 濡傛灉瀛樺湪瀛樺偍鍦板潃锛屽垯绉诲姩鍦板潃
             if (ObjectUtils.isNotEmpty(device.getStorageUrl())) {
-                String s = HTTP + ip + MOVEFILE + "?startFilePath=" + device.getCollectUrl() + "&endFilePath=" + device.getStorageUrl();
+                String s = HTTP + ip + MOVEFILE + "?startFilePath=" + device.getCollectUrl() + "&endFilePath=" + device.getStorageUrl() + "&fileType=" + device.getFileType();
                 String storageUrlResult = HttpUtil.get(s);
-                JSONObject storageUrlResultJson =  JSON.parseObject(storageUrlResult);
-                if (Objects.equals(storageUrlResultJson.get("code"), 1)) {
-                    if (ObjectUtils.isEmpty(storageUrlResultJson.get("msg"))) {
-                        throw new ErrorException("瀛樺偍鍦板潃閿欒锛屽彲鑳芥枃浠惰矾寰勯厤缃敊璇紒");
-                    } else {
-                        throw new ErrorException("鏈煡閿欒锛岃鑱旂郴绠$悊鍛橈紒");
-                    }
-                }
+                JSONObject storageUrlResultJson = JSON.parseObject(storageUrlResult);
             }
-            map.put("frequency", "1");
-            return Result.success(map);
+            return map;
         }
+    }
+
+    public static String createFrequency(String entrustCode, String sampleCode) {
+        String key = frequency + ":" + entrustCode + ":" + sampleCode;
+        boolean b = RedisUtil.hasKey(key);
+        String frequencyValue;
+        if (b) {
+            long incr = RedisUtil.incr(key, 1);
+            frequencyValue = String.valueOf(incr);
+        } else {
+            RedisUtil.set(key, 1);
+            frequencyValue = "1";
+        }
+        return frequencyValue;
     }
 
     /**
      * 闇�瑕侀�氳繃X,Y杞村畾浣�
+     *
      * @param data
      * @param dataConfig
      * @return
      */
     private static Map<String, String> analysisDb(String data, Map<String, List<DataConfig>> dataConfig) {
         JSONObject jsonObject = JSON.parseObject(data);
-        JSONArray dataList = JSONArray.parseArray(jsonObject.get("data").toString());
-        JSONArray columnList = JSONArray.parseArray(jsonObject.get("column").toString());
         Map<String, String> map = new HashMap<>();
+        if (jsonObject.isEmpty()) {
+            return map;
+        }
+        JSONArray dataList = JSONArray.parseArray(jsonObject.get("data").toString());
         dataConfig.forEach((k, v) -> {
             List<Object> list = new ArrayList<>();
             for (int config = 0; config < v.size(); config++) {
-                String referx = v.get(config).getReferx();
-                if(ObjectUtils.isEmpty(v.get(config).getX()) && ObjectUtils.isEmpty(v.get(config).getY())) {
-                    continue;
-                }
-                int x = Integer.parseInt(v.get(config).getX());
-                int y = Integer.parseInt(v.get(config).getY());
-                String key = "";
-                for (int i = 0; i < columnList.size(); i++) {
-                    if (columnList.get(i).equals(referx)) {
-                        key = columnList.get(i + x).toString();
+                String referx = getRefer(v.get(config).getReferx());
+                for (int i = 0; i < dataList.size(); i++) {
+                    JSONObject jsonObject1 = JSON.parseObject(dataList.get(i).toString());
+                    Object o = jsonObject1.get(referx);
+                    if (ObjectUtils.isNotEmpty(o)) {
+                        list.add(o);
                     }
-                }
-                JSONObject jsonObject1 = JSON.parseObject(dataList.get(y).toString());
-                Object o = jsonObject1.get(key);
-                if (ObjectUtils.isNotEmpty(o)) {
-                    list.add(o);
                 }
             }
             // 杩涜鍏紡璁$畻
@@ -142,34 +161,26 @@
     }
 
     /**
-     * 闇�瑕侀�氳繃X,Y杞村畾浣�
      * @param data
      * @param dataConfig
      * @return
      */
-    private static Map<String, String> analysisMdb(String data, Map<String, List<DataConfig>> dataConfig, String entrustCode, String sampleCode) {
+    private static Map<String, String> analysisMdb(String data, Map<String, List<DataConfig>> dataConfig) {
         JSONObject jsonObject = JSON.parseObject(data);
-        JSONArray dataList = JSONArray.parseArray(jsonObject.get("data").toString());
-        JSONArray columnList = JSONArray.parseArray(jsonObject.get("column").toString());
         Map<String, String> map = new HashMap<>();
+        if (jsonObject.isEmpty()) {
+            return map;
+        }
+        JSONArray dataList = JSONArray.parseArray(jsonObject.get("data").toString());
         dataConfig.forEach((k, v) -> {
             List<Object> list = new ArrayList<>();
             for (int config = 0; config < v.size(); config++) {
-                String referx = v.get(config).getReferx();
-                int x = Integer.parseInt(v.get(config).getX());
-                String key = "";
-                for (int i = 0; i < columnList.size(); i++) {
-                    if (columnList.get(i).equals(referx)) {
-                        key = columnList.get(i + x).toString();
-                    }
-                }
+                String referx = getRefer(v.get(config).getReferx());
                 for (int i = 0; i < dataList.size(); i++) {
                     JSONObject jsonObject1 = JSON.parseObject(dataList.get(i).toString());
-                    if (entrustCode.equals(jsonObject1.get("OrderNumber")) && sampleCode.equals(jsonObject1.get("SampleNumber"))) {
-                        Object o = jsonObject1.get(key);
-                        if (ObjectUtils.isNotEmpty(o)) {
-                            list.add(o);
-                        }
+                    Object o = jsonObject1.get(referx);
+                    if (ObjectUtils.isNotEmpty(o)) {
+                        list.add(o);
                     }
                 }
             }
@@ -181,9 +192,11 @@
     }
 
     private static Pattern SPATTERN = Pattern.compile("([-+])?\\d+(\\.\\d+)?");
+
     /**
      * 鍙渶X杞�
-     * @param data 閲囬泦鍒扮殑鏂囦欢瀛楃涓�
+     *
+     * @param data       閲囬泦鍒扮殑鏂囦欢瀛楃涓�
      * @param dataConfig 鐢ㄦ埛閰嶇疆濂界殑x,y杞村畾浣嶆暟鎹笌鍙傜収鐗�
      * @return
      */
@@ -192,15 +205,15 @@
         dataConfig.forEach((k, v) -> {
             List<Object> list = new ArrayList<>();
             for (int config = 0; config < v.size(); config++) {
-                String referx = v.get(config).getReferx();
-                String xResult = null;
+                String referx = getRefer(v.get(config).getReferx());
+                String result = null;
                 // 閫氳繃\n灏嗗瓧绗︿覆鍒嗗壊涓鸿
                 String[] aColumnY = data.split("\n");
                 List<String> list1 = new ArrayList<>();
                 // 璇ュ惊鐜緱鍑虹敤鎴烽厤缃殑y杞�
                 for (int i = 0; i < aColumnY.length; i++) {
                     String addDataWithSpaces = referx.replaceAll("", " ");
-                    int x = Integer.parseInt(v.get(config).getX());
+                    int x = getXOrY(v.get(config).getX(), k, "X");
                     if (aColumnY[i].contains(addDataWithSpaces)) {
                         Matcher matcher = SPATTERN.matcher(aColumnY[i]);
                         while (matcher.find()) {
@@ -209,11 +222,11 @@
                         }
                     }
                     if (ObjectUtils.isNotEmpty(list1)) {
-                        xResult = list1.get(x);
+                        result = list1.get(x);
                     }
                 }
-                if (ObjectUtils.isNotEmpty(xResult)) {
-                    list.add(xResult);
+                if (ObjectUtils.isNotEmpty(result)) {
+                    list.add(result);
                 }
             }
             // 杩涜鍏紡璁$畻
@@ -225,16 +238,142 @@
 
     /**
      * 浠庢枃浠朵腑鎻愬彇鍑烘潵鐨勬枃瀛楋紝濡傛灉鏈夊叕寮忥紝杩涜鍏紡璁$畻锛屽惁鍒欏彇鍒楄〃绗竴涓��
-     * @param list 鎻愬彇鍑虹殑鏁板瓧
+     *
+     * @param list       鎻愬彇鍑虹殑鏁板瓧
      * @param dataConfig 瀛樺偍鍏紡鐨勫璞�
      * @return
      */
     private static String calculationFormula(List<Object> list, DataConfig dataConfig, String insProductItem) {
+        if (list.size() == 0) {
+            return null;
+        }
         // 濡傛灉涓嶄负绌猴紝杩涜鍏紡璁$畻
         if (ObjectUtils.isNotEmpty(dataConfig.getFormula())) {
+            String formula = dataConfig.getFormula();
+            //棣栧厛灏唋ist杞崲涓篵igdecmic
+            List<BigDecimal> bigDecimalList = list.stream()
+                    .map(obj -> {
+                        return new BigDecimal((obj).toString());
+                    }).collect(Collectors.toList());
+            System.out.println(bigDecimalList);
 
-            return null;
-        // 鍚﹀垯锛氭病鏈夊叕寮忎唬琛ㄤ笉闇�瑕佽绠楋紝鐩存帴鎻愬彇List閲岄潰鐨勬暟鎹�
+            //灏嗕腑鏂囩殑(杞崲鑻辨枃鐨�())
+            formula = formula.replace("锛�", "(")
+                    .replace("锛�", ")")
+                    .replace("锛�", ",");
+            //鐒跺悗鎻愬彇鑻辨枃瀛楁瘝,鍏ㄩ儴杞崲涓哄ぇ鍐�
+            String[] strs = formula.split("[^A-Za-z]+");
+            String upperStr = "";
+            for (String str : strs) {
+                upperStr += str.toUpperCase();
+            }
+            if (upperStr.equals("")) {
+                throw new ErrorException(formula + "閲岄潰鐨勫叕寮忔病鏈夊嚱鏁�");
+            }
+            //鐒跺悗鑾峰彇鏈�澶栭潰鎷彿閲岄潰鐨勫��,鍐嶆牴鎹�","鍒嗗壊
+            int start = formula.indexOf("(");
+            int end = -1;
+            int a = 0;
+            for (int i = start; i < formula.length(); i++) {
+                char c = formula.charAt(i);
+                if (c == '(') {
+                    a++;
+                } else if (c == ')') {
+                    a--;
+                    if (a == 0) {
+                        end = i;
+                    }
+                }
+            }
+            if (start == -1 || end == -1) {
+                throw new ErrorException("鍏紡鎷彿涓嶅尮閰�: " + formula);
+            }
+
+            String inner = formula.substring(start + 1, end);
+            List<String> arguments = new ArrayList<>();
+            int depth = 0;
+            StringBuilder currentArgument = new StringBuilder();
+            for (
+                    char c : inner.toCharArray()) {
+                if (c == ',' && depth == 0) {
+                    arguments.add(currentArgument.toString());
+                    currentArgument.setLength(0);
+                } else {
+                    if (c == '(') {
+                        depth++;
+                    } else if (c == ')') {
+                        depth--;
+                    }
+                    currentArgument.append(c);
+                }
+            }
+            arguments.add(currentArgument.toString());
+            String[] bracketStrs = arguments.toArray(new String[0]);
+
+            List<BigDecimal> results = new ArrayList<>();
+            for (
+                    String expr : bracketStrs) {
+                System.out.println("鏇挎崲鍓�" + expr);
+                Pattern pattern = Pattern.compile("\\b\\d+\\b");
+                Matcher matcher = pattern.matcher(expr);
+                StringBuffer sb = new StringBuffer();
+                while (matcher.find()) {
+                    int index = Integer.parseInt(matcher.group()) - 1;
+                    if (index < bigDecimalList.size()) {
+                        matcher.appendReplacement(sb, bigDecimalList.get(index).toString());
+                    } else {
+                        throw new ErrorException("琛ㄨ揪寮忎腑鐨勪笅鏍� " + index + " 瓒呭嚭鑼冨洿");
+                    }
+                }
+                matcher.appendTail(sb);
+                System.out.println("鏇挎崲鍚�" + sb.toString());
+                //璁$畻
+                ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
+                try {
+                    Object result = engine.eval(sb.toString());
+                    results.add(new BigDecimal(result.toString()));
+                } catch (Exception e) {
+                    throw new IllegalArgumentException("鏃犳硶璁$畻琛ㄨ揪寮�: " + sb, e);
+                }
+            }
+            // 鏍规嵁鍑芥暟鍚嶇О杩涜鐩稿簲璁$畻
+            BigDecimal finalResult;
+            switch (upperStr) {
+                case "MAX":
+                    finalResult = results.stream().max(BigDecimal::compareTo)
+                            .orElseThrow(() -> new IllegalArgumentException("鏃犳硶璁$畻MAX鍊�"));
+                    break;
+                case "MIN":
+                    finalResult = results.stream().min(BigDecimal::compareTo)
+                            .orElseThrow(() -> new IllegalArgumentException("鏃犳硶璁$畻MIN鍊�"));
+                    break;
+                case "SUM":
+                    finalResult = results.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+                    break;
+                case "ABS":
+                    finalResult = results.stream().map(BigDecimal::abs).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    break;
+                case "AVERAGE":
+                    finalResult = results.stream().reduce(BigDecimal.ZERO, BigDecimal::divide)
+                            .divide(BigDecimal.valueOf(results.size()), 2, BigDecimal.ROUND_HALF_UP);
+                    break;
+                case "MEDIAN":
+                    int size = results.size();
+                    if (size % 2 == 1) {
+                        finalResult = results.get(size / 2);
+                    } else {
+                        BigDecimal sum = results.get(size / 2 - 1).add(results.get(size / 2));
+                        finalResult = sum.divide(BigDecimal.valueOf(2), 2, BigDecimal.ROUND_HALF_UP);
+                    }
+                    break;
+                default:
+                    throw new UnsupportedOperationException("鏆備笉鏀寔鍑芥暟: " + upperStr);
+            }
+            System.out.println(results);
+            System.out.println("璁$畻缁撴灉: " + finalResult);
+
+            return finalResult.toString();
+            // 鍚﹀垯锛氭病鏈夊叕寮忎唬琛ㄤ笉闇�瑕佽绠楋紝鐩存帴鎻愬彇List閲岄潰鐨勬暟鎹�
         } else {
             // 杩欓噷鍙細鍙栧垪琛ㄧ涓�涓暟鎹�
             if (list.size() > 1) {
@@ -247,192 +386,151 @@
 
     /**
      * 瑙f瀽String鏁版嵁
-     * @param data 閲囬泦鍒扮殑鏂囦欢瀛楃涓�
+     *
+     * @param data       閲囬泦鍒扮殑鏂囦欢瀛楃涓�
      * @param dataConfig 鐢ㄦ埛閰嶇疆濂界殑x,y杞村畾浣嶆暟鎹笌鍙傜収鐗�
      * @return
      */
     private static Map<String, String> analysisTxt(String data, Map<String, List<DataConfig>> dataConfig) {
         Map<String, String> map = new HashMap<>();
         dataConfig.forEach((k, v) -> {
-            List<Object> list = new ArrayList<>();
-            for (int config = 0; config < v.size(); config++) {
-                String referx = v.get(config).getReferx();
-                String refery = v.get(config).getRefery();
-                String xResult = null;
-                String yResult = null;
-                // 閫氳繃\n灏嗗瓧绗︿覆鍒嗗壊涓鸿
-                String[] aColumnY = data.split("\n");
-                // 璇ュ惊鐜緱鍑虹敤鎴烽厤缃殑y杞�
-                for (int i = 0; i < aColumnY.length; i++) {
-                    // 寰楀嚭鐢ㄦ埛閰嶇疆鐨剎杞�
-                    String[] aLineX = aColumnY[i].split(",");
-                    for (int j = 0; j < aLineX.length; j++) {
-                        if (ObjectUtils.isNotEmpty(referx) && aLineX[j].contains(referx)) {
-                            try {
-                                int x = Integer.parseInt(v.get(config).getX());
-                                xResult = aLineX[j + x];
-                            } catch (Exception e) {}
-                        }
-                        if (ObjectUtils.isNotEmpty(refery) && aLineX[j].contains(refery)) {
-                            try {
-                                int y = Integer.parseInt(v.get(config).getY());
-                                String[] split = aColumnY[i + y].split(",");
-                                yResult = split[split.length - 1];
-                            } catch (Exception e) {}
-                        }
-                    }
-                }
-                if (ObjectUtils.isNotEmpty(xResult) && ObjectUtils.isNotEmpty(yResult)) {
-                    if(xResult.equals(yResult)) {
-                        list.add(xResult);
-                    } else {
-                        throw new ErrorException(k + "椤圭洰X杞村�硷細" + xResult + "锛孻杞村�硷細" + yResult + "鍙栧緱鐨勬暟鎹笉鐩稿悓锛佽妫�鏌ユ暟閲囬厤缃紒");
-                    }
-                }
-            }
+            List<Object> list = analyzeData(data, v, k, ",");
             // 杩涜鍏紡璁$畻
-            if (list.size() > 0) {
-                String resultValue = calculationFormula(list, v.get(0), k);
-                map.put(k, resultValue);
-            } else {
-                map.put(k, null);
-            }
+            String resultValue = calculationFormula(list, v.get(0), k);
+            map.put(k, resultValue);
         });
         return map;
     }
 
     /**
-     *
-     * @param data 閲囬泦鍒扮殑鏂囦欢瀛楃涓�
+     * @param data       閲囬泦鍒扮殑鏂囦欢瀛楃涓�
      * @param dataConfig 鐢ㄦ埛閰嶇疆濂界殑x,y杞村畾浣嶆暟鎹笌鍙傜収鐗�
      * @return
      */
     private static Map<String, String> analysisString(String data, Map<String, List<DataConfig>> dataConfig) {
-        String processingDataAfterSpaces = data.replaceAll("  +", splitIdentifier).replaceAll("\r", "");
+        String processingDataAfterSpaces = data
+                .replaceAll("  +", splitIdentifier)
+                .replaceAll("\r", "")
+                .replaceAll(" ", "");
         Map<String, String> map = new HashMap<>();
         dataConfig.forEach((k, v) -> {
-            List<Object> list = new ArrayList<>();
-            for (int config = 0; config < v.size(); config++) {
-                String referx = v.get(config).getReferx();
-                String refery = v.get(config).getRefery();
-                String xResult = null;
-                String yResult = null;
-                // 閫氳繃\n灏嗗瓧绗︿覆鍒嗗壊涓鸿
-                String[] aColumnY = processingDataAfterSpaces.split("\n");
-                // 璇ュ惊鐜緱鍑虹敤鎴烽厤缃殑y杞�
-                for (int i = 0; i < aColumnY.length; i++) {
-                    if (aColumnY[i].replaceAll(" ", "").contains(refery.replaceAll(" ", ""))) {
-                        int y = Integer.parseInt(v.get(config).getY());
-                        int x = Integer.parseInt(v.get(config).getX());
-                        String[] split = aColumnY[i + y].split(splitIdentifier);
-                        for (int i1 = 0; i1 < split.length; i1++) {
-                            if (split[i1].replaceAll(" ", "").equals(referx.replaceAll(" ", ""))) {
-//                                split[i1 + x]
-                            }
-                        }
-//                        String[] aLineX = aColumnY[i].split(splitIdentifier);
-//                        try {
-//                            int y = Integer.parseInt(v.get(config).getY());
-//                            String[] split = aColumnY[i + y].split(splitIdentifier);
-//                            yResult = split[split.length - 1];
-//                        } catch (Exception e) {}
-                    }
-                    // 寰楀嚭鐢ㄦ埛閰嶇疆鐨剎杞�
-
-//                    for (int j = 0; j < aLineX.length; j++) {
-//                        if (ObjectUtils.isNotEmpty(referx) && aLineX[j].replaceAll(" ", "").contains(referx.replaceAll(" ", ""))) {
-//                            try {
-//                                int x = Integer.parseInt(v.get(config).getX());
-//                                xResult = aLineX[j + x];
-//                            } catch (Exception e) {}
-//                        }
-//
-//                    }
-                }
-                if (ObjectUtils.isNotEmpty(yResult)) {
-                    yResult = yResult.replaceAll(" ", "");
-                    // 缁撴灉鍖呭惈鐗规畩瀛楃锛岄渶瑕佸墧闄ゆ帀
-                    if(yResult.contains("=")) {
-                        String[] split = yResult.split("=");
-                        list.add(split[split.length - 1]);
-                    } else if (yResult.contains(":")) {
-                        String[] split = yResult.split(":");
-                        list.add(split[split.length - 1].replaceAll("%",  ""));
-                    }
-                }
-                System.out.println(xResult + "=========" + yResult);
-                if (ObjectUtils.isNotEmpty(xResult) && ObjectUtils.isNotEmpty(yResult)) {
-                    if(xResult.equals(yResult)) {
-                        list.add(xResult);
-                    } else {
-                        throw new ErrorException("X杞村�硷細" + xResult + "锛孻杞村�硷細" + yResult + "鍙栧緱鐨勬暟鎹笉鐩稿悓锛佽妫�鏌ユ暟閲囬厤缃紒");
-                    }
-                }
-            }
+            List<Object> list = analyzeData(processingDataAfterSpaces, v, k, splitIdentifier);
             // 杩涜鍏紡璁$畻
-            if (list.size() > 0) {
-                String resultValue = calculationFormula(list, v.get(0), k);
-                map.put(k, resultValue);
-            } else {
-                map.put(k, null);
-            }
+            String resultValue = calculationFormula(list, v.get(0), k);
+            map.put(k, resultValue);
         });
         return map;
     }
 
     /**
      * 鍙朮锛孻涓や釜瀹氫綅
-     * @param data 閲囬泦鍒扮殑鏂囦欢瀛楃涓�
+     *
+     * @param data       閲囬泦鍒扮殑鏂囦欢瀛楃涓�
      * @param dataConfig 鐢ㄦ埛閰嶇疆濂界殑x,y杞村畾浣嶆暟鎹笌鍙傜収鐗�
      * @return
      */
     public static Map<String, String> analysisList(String data, Map<String, List<DataConfig>> dataConfig) {
         Map<String, String> map = new HashMap<>();
         dataConfig.forEach((k, v) -> {
-            List<Object> list = new ArrayList<>();
-            for (int config = 0; config < v.size(); config++) {
-                String referx = v.get(config).getReferx();
-                String refery = v.get(config).getRefery();
-                String xResult = null;
-                String yResult = null;
-                // 閫氳繃\n灏嗗瓧绗︿覆鍒嗗壊涓鸿
-                String[] aColumnY = data.split("\n");
-                // 璇ュ惊鐜緱鍑虹敤鎴烽厤缃殑y杞�
-                for (int i = 0; i < aColumnY.length; i++) {
-                    // 寰楀嚭鐢ㄦ埛閰嶇疆鐨剎杞�
-                    String[] aLineX = aColumnY[i].split(splitIdentifier);
-                    for (int j = 0; j < aLineX.length; j++) {
-                        if (ObjectUtils.isNotEmpty(referx) && referx.equals(aLineX[j])) {
-                            try {
-                                int x = Integer.parseInt(v.get(config).getX());
-                                xResult = aLineX[j + x];
-                            } catch (Exception e) {}
-                        }
-                        if (ObjectUtils.isNotEmpty(refery) && refery.equals(aLineX[j])) {
-                            try {
-                                int y = Integer.parseInt(v.get(config).getY());
-                                String aColumnData = aColumnY[i + y]; // 鑾峰彇鍒扮Y琛岀殑鏁版嵁
-                                yResult = aColumnData.split(splitIdentifier)[j];
-                            } catch (Exception e) {}
-                        }
-                    }
-                }
-                if (ObjectUtils.isNotEmpty(xResult) && ObjectUtils.isNotEmpty(yResult)) {
-                    if(xResult.equals(yResult)) {
-                        list.add(xResult);
-                    } else {
-                        throw new ErrorException("X杞村�硷細" + xResult + "锛孻杞村�硷細" + yResult + "鍙栧緱鐨勬暟鎹笉鐩稿悓锛佽妫�鏌ユ暟閲囬厤缃紒");
-                    }
-                }
-            }
+            // 鐢ㄦ埛鍙兘缁欎竴涓瓙椤圭洰閰嶇疆浜嗗涓厤缃紝鍗充竴涓」鐩彇澶氫釜鍊硷紝鎵�浠ラ渶瑕佸惊鐜�
+            List<Object> list = analyzeData(data, v, k, splitIdentifier);
             // 杩涜鍏紡璁$畻
-            if (list.size() > 0) {
-                String resultValue = calculationFormula(list, v.get(0), k);
-                map.put(k, resultValue);
-            } else {
-                map.put(k, null);
-            }
+            String resultValue = calculationFormula(list, v.get(0), k);
+            map.put(k, resultValue);
         });
         return map;
     }
+
+    // 鐢变簬鍦ㄦ柟娉曚腑浼氬ぇ閲忕殑鍒ゆ柇锛屾墍浠ュ仛涓�涓柟娉�
+    private static int getXOrY(String value, String k, String tips) {
+        try {
+            return Integer.parseInt(value);
+        } catch (NumberFormatException e) {
+            throw new ErrorException(k + "锛氭湭閰嶇疆" + tips + "鍧愭爣杞寸殑鍊硷紒");
+        }
+    }
+
+    // 闃叉鍙傜収鐗╀负绌烘姤閿欙紝杩涜鍒ゆ柇濡傛灉涓虹┖璧嬪�肩┖瀛楃
+    private static String getRefer(String refer) {
+        return ObjectUtils.isNotEmpty(refer) ? refer.replaceAll(" ", "") : "";
+    }
+
+    public static List<Object> analyzeData(String data, List<DataConfig> v, String k, String split) {
+        List<Object> list = new ArrayList<>();
+        for (int config = 0; config < v.size(); config++) {
+            // 鍙栦袱涓敤鎴烽厤缃殑鍙傜収鐗�
+            String referx = getRefer(v.get(config).getReferx());
+            String refery = getRefer(v.get(config).getRefery());
+            // 鏈�缁堢粨鏋�
+            String result = null;
+            // 閫氳繃\n灏嗗瓧绗︿覆鍒嗗壊涓鸿
+            String[] aColumnY = data.replaceAll(" ", "").split("\n");
+            Integer end = null;
+            // 閲囬泦鏁版嵁锛歒杞�
+            for (int i = 0; i < aColumnY.length; i++) {
+                // 鍙杧鐨勫�硷紝闃叉鎶ラ敊
+                int x = getXOrY(v.get(config).getX(), k, "X");
+                // 濡傛灉Y涓嶺鐢ㄦ埛閮介厤缃簡鍒欐墽琛�
+                if (ObjectUtils.isNotEmpty(refery)) {
+                    // 鍙朰鍧愭爣鍊�
+                    int y = getXOrY(v.get(config).getY(), k, "Y");
+                    // 缂撳瓨Y鐨勭粨鏉熷��
+                    if (ObjectUtils.isEmpty(end) && aColumnY[i].contains(refery)) {
+                        end = i + y;
+                    }
+                    // 鍒ゆ柇鏄惁鍦ㄥ弬鐓х墿涓鸿捣鍒帮紝Y鍧愭爣鍊间负鏈�缁堣寖鍥�
+                    if (ObjectUtils.isNotEmpty(end) && i <= end) {
+                        String[] aLineX = aColumnY[i].split(split);
+                        for (int j = 0; j < aLineX.length; j++) {
+                            if (aLineX[j].contains(referx)) {
+                                try {
+                                    result = aLineX[j + x];
+                                } catch (Exception e) {
+                                    throw new ErrorException(k + "锛歑杞村畾浣嶈秴鍑猴紒");
+                                }
+                                break;
+                            }
+                        }
+                    }
+                    // 濡傛灉鍙厤缃簡X锛屽垯鎵ц涓嬮潰鐨勪唬鐮�
+                } else if (aColumnY[i].contains(referx) && ObjectUtils.isEmpty(refery)) {
+                    String[] aLineX = aColumnY[i].split(split);
+                    for (int j = 0; j < aLineX.length; j++) {
+                        if (aLineX[j].contains(referx)) {
+                            try {
+                                result = aLineX[j + x];
+                            } catch (Exception e) {
+                                throw new ErrorException(k + "锛歑杞村畾浣嶈秴鍑猴紒");
+                            }
+                        }
+                    }
+                }
+            }
+            // 闃叉璁$畻鍏紡鐨勬椂鍊欏嚭鐜帮細[null] 杩欑鏁版嵁
+            if (ObjectUtils.isNotEmpty(result)) {
+                String formatProcessing = getFormatProcessing(result);
+                list.add(formatProcessing);
+            }
+        }
+        return list;
+    }
+
+    public static String getFormatProcessing(String value) {
+        value = value.replaceAll("%", "");
+        if (value.contains("=")) {
+            String[] split = value.split("=");
+            return split[split.length - 1];
+        } else if (value.contains(":")) {
+            String[] split = value.split(":");
+            return split[split.length - 1];
+        } else {
+            return value;
+        }
+    }
+
+    public static String getIp(HttpServletRequest request) {
+        String ipAddress = request.getRemoteAddr();
+        // 闃叉鍥炵幆鍦板潃鍙樹负IPv6
+        return ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
+    }
 }

--
Gitblit v1.9.3