销售订单报检区分物料属性

zouyu

昨天 a7418fdc3875d68b03f5d89ceaa0c66a8e3902cd

 cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java

@@ -128,11 +128,12 @@
                case ".docx":
                    map = analysisString(data, userMap, device, entrustCode, sampleCode);
                    break;
                case ".xls":
                case ".xlsx":
                    map = analysisList(data, userMap, device, entrustCode, sampleCode);
                    break;
                case ".xls":
                    map = analysisTxt(data, userMap, device, entrustCode, sampleCode);
                case ".pngInExcel":
                    map = analysisPngInExcel(data, userMap, device, entrustCode, sampleCode);
                    break;
                case ".txt":
                    map = analysisTxt(data, userMap, device, entrustCode, sampleCode);
@@ -345,23 +346,25 @@
                }
            }
            // 拼接数采配置
            List<Object> result = new ArrayList<>();
            for (int i = 0; i < numberOfDataEntries.get(); i++) {
                String aggregate = "";
                for (int j = 0; j < v.size(); j++) {
                    int index;
                    if (j == 0) {
                        index = i;
                    } else {
                        index = numberOfDataEntries.get() + i;
                    }
                    aggregate += list.get(index).toString() + ",";
                }
                int lastIndex = aggregate.lastIndexOf(",");
                String substring = aggregate.substring(0, lastIndex);
                result.add(substring);

            }
            List<Object> result = new ArrayList<>(list);
//            String join = String.join(",", list.stream().map(String::valueOf).collect(Collectors.toList()));
//            result.add(join);
//            for (int i = 0; i < numberOfDataEntries.get(); i++) {
//                String aggregate = "";
//                for (int j = 0; j < v.size(); j++) {
//                    int index;
//                    if (j == 0) {
//                        index = i;
//                    } else {
//                        index = numberOfDataEntries.get() + i;
//                    }
//                    aggregate += list.get(index).toString() + ",";
//                }
//                int lastIndex = aggregate.lastIndexOf(",");
//                String substring = aggregate.substring(0, lastIndex);
//                result.add(substring);
//
//            }
            // 进行公式计算
            Object resultValue = calculationFormula(result, v.get(0), k, device);
            map.put(k, resultValue);
@@ -571,6 +574,45 @@
    }

    /**
     * 解析excel中识别到的图片内容
     *
     * @param data       采集到的文件字符串
     * @param dataConfig 用户配置好的x,y轴定位数据与参照物
     * @return
     */
    private static Map<String, Object> analysisPngInExcel(String data, Map<String, List<DataConfig>> dataConfig,
                                                   Device device, String entrustCode, String sampleCode) {
        Map<String, Object> map = new HashMap<>();
        //处理data
        Map<String,List<Object>> dataMap = new HashMap<>();
        String[] rows = data.split("\n");
        String[] headRow = rows[0].split(" ");//获取表头列表
        for (int i = 0; i < headRow.length; i++) {
            //数据最多五条
            List<Object> vals = new ArrayList<>();
            for (int j = 1; j <= 5; j++) {
                String[] cols = rows[j].split(" ");
                vals.add(cols[i]);
            }
            dataMap.put(headRow[i],vals);
        }
        dataConfig.forEach((k, v) -> {
            List<Object> list = new ArrayList<>();
            v.stream().sorted(Comparator.comparing(DataConfig::getX)).forEach(config->{
                for (Map.Entry<String, List<Object>> entry : dataMap.entrySet()) {
                    if(entry.getKey().contains(config.getReferx())){
                        list.addAll(entry.getValue());
                    }
                }
            });
            // 进行公式计算
            Object resultValue = calculationFormula(list, v.get(0), k, device);
            map.put(k, resultValue);
        });
        return map;
    }

    /**
     * @param data       采集到的文件字符串
     * @param dataConfig 用户配置好的x,y轴定位数据与参照物
     * @return