yumeng преди 4 години
родител
ревизия
8b6c51ccb4
променени са 1 файла, в които са добавени 12 реда и са изтрити 31 реда
  1. 12 31
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/JsonResourceUtil.java

+ 12 - 31
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/JsonResourceUtil.java

@@ -3,17 +3,17 @@ package org.jeecg.common.util;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.jeecg.common.constant.AccountReportConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import java.io.File;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by JQ.bi on 2020.06.03
@@ -82,45 +82,26 @@ public class JsonResourceUtil {
     /**
      * 拼接字段
      */
-    public static String joinFiled(Map<String, Map<String, Object>> mapMap, JSONArray array) {
-        System.err.println("获取的数据字段:" + mapMap);
+    public static String joinFiled(Map<String, Map<String,Object>> mapMap,JSONArray array) {
         StringBuilder sb = new StringBuilder();
-
-        for (int i = 0; i < array.size(); i++) {
-            String column = array.getString(i);
-            if (column == null || column == "") {
-                sb.append("").append(",");
-            } else {
-                Map<String, Object> stringObjectMap = mapMap.get(column);
-                if (stringObjectMap.isEmpty()) {
-                    System.err.println("获取数据为空的column:" + column);
-                    continue;
-                }
-
-
-                sb.append(mapMap.get(column).get("filed")).append(",");
-            }
-
-        }
-
-       /* array.forEach(it -> {
-            if (mapMap.get(String.valueOf(it)).isEmpty()) {
+        array.forEach(it -> {
+            if (mapMap.get(it.toString()).isEmpty()) {
                 sb.append(it).append(",");
             } else {
                 sb.append(mapMap.get(it.toString()).get("filed")).append(",");
             }
-        });*/
+        });
         return sb.deleteCharAt(sb.length() - 1).toString();
     }
 
     /**
      * 拼接title
      */
-    public static List<String> joinTitle(Map<String, Map<String, Object>> mapMap, JSONArray array) {
+    public static List<String> joinTitle(Map<String, Map<String,Object>> mapMap,JSONArray array) {
         List<String> titles = new ArrayList<>(20);
         array.forEach(it -> {
-            if (mapMap.get(String.valueOf(it)).isEmpty()) {
-                titles.add(String.valueOf(it));
+            if (mapMap.get(it.toString()).isEmpty()) {
+                titles.add(it.toString());
             } else {
                 titles.add(mapMap.get(it.toString()).get("comment").toString());
             }
@@ -131,7 +112,7 @@ public class JsonResourceUtil {
     /**
      * 拼接字段
      */
-    public static String joinAllFiled(Map<String, Map<String, Object>> mapMap) {
+    public static String joinAllFiled(Map<String, Map<String,Object>> mapMap) {
         StringBuilder sb = new StringBuilder();
         mapMap.forEach((k, v) -> sb.append(v.get("filed")).append(","));
         return sb.deleteCharAt(sb.length() - 1).toString();