升级hutool, 新增 json转csv方法

PHM-admin/phm-manage/src/main/java/com/phm/manage/util/JsonUtils.java

@@ -0,0 +1,55 @@
+package com.phm.manage.util;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.phm.manage.domain.common.CommonResult;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description JsonUtils
+ * @Author WGK
+ * @Date 2023/10/10 22:33
+ */
+public class JsonUtils {
+
+    /**
+     * 返回值转JSON
+     *
+     * @param commonResult 公共返回值
+     * @return 结果
+     * @throws JsonProcessingException Exception
+     */
+    public static String convertJson(CommonResult commonResult) throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        return objectMapper.writeValueAsString(commonResult);
+    }
+
+    /**
+     * json 转 csv
+     *
+     * @param jsonArray 数组
+     * @return csv 结果
+     */
+    public static List<String> jsonArrayToCsv(JSONArray jsonArray) {
+        // 获取CSV的表头
+        List<String> headers = new ArrayList<>(jsonArray.getJSONObject(0).keySet());
+        // 构造CSV行列表
+        List<String> csvLines = jsonArray.stream().map(jsonObject -> {
+            StringBuilder line = new StringBuilder();
+            for (String header : headers) {
+                // 根据表头获取对应的值，并追加到CSV行中
+                line.append(((JSONObject) jsonObject).get(header)).append(",");
+            }
+            // 移除末尾的逗号
+            return line.substring(0, line.length() - 1);
+        }).collect(Collectors.toList());
+        // 在CSV行列表开头添加表头
+        csvLines.add(0, String.join(",", headers));
+        return csvLines;
+    }
+}

PHM-admin/phm-netty/src/main/java/com/phm/netty/domain/Message.java

@@ -48,7 +48,7 @@ public class Message implements Serializable {
     /**
      * 毫秒时间戳，从2020.1.1开始
      */
-    private long timestamp = DateUtil.current(false) - DateUtil.parse("2020-01-01").getTime();
+    private long timestamp = DateUtil.current() - DateUtil.parse("2020-01-01").getTime();
 
     /**
      * 数据源

PHM-admin/phm-netty/src/main/java/com/phm/netty/server/handler/ByteArrayMessageHandler.java

@@ -12,7 +12,7 @@ import com.phm.netty.domain.Message;
 import com.phm.netty.enums.OrderEnum;
 import com.phm.netty.service.IProcessService;
 import com.phm.netty.utils.ChannelMap;
-import com.phm.netty.utils.JsonUtils;
+import com.phm.manage.util.JsonUtils;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;

PHM-admin/phm-netty/src/main/java/com/phm/netty/service/impl/ProcessService.java

@@ -12,7 +12,7 @@ import com.phm.manage.service.ISortieService;
 import com.phm.netty.domain.Message;
 import com.phm.netty.enums.OrderEnum;
 import com.phm.netty.service.IProcessService;
-import com.phm.netty.utils.JsonUtils;
+import com.phm.manage.util.JsonUtils;
 import com.phm.system.service.ISysDictTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

PHM-admin/phm-netty/src/main/java/com/phm/netty/utils/JsonUtils.java

@@ -1,25 +0,0 @@
-package com.phm.netty.utils;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.phm.manage.domain.common.CommonResult;
-
-/**
- * @Description JsonUtils
- * @Author WGK
- * @Date 2023/10/10 22:33
- */
-public class JsonUtils {
-
-    /**
-     * 返回值转JSON
-     *
-     * @param commonResult 公共返回值
-     * @return 结果
-     * @throws JsonProcessingException Exception
-     */
-    public static String convertJson(CommonResult commonResult) throws JsonProcessingException {
-        ObjectMapper objectMapper = new ObjectMapper();
-        return objectMapper.writeValueAsString(commonResult);
-    }
-}

PHM-admin/pom.xml

@@ -31,7 +31,7 @@
         <jwt.version>0.9.1</jwt.version>
         <lombok.version>1.18.28</lombok.version>
         <netty-all.version>4.1.86.Final</netty-all.version>
-        <hutool.version>4.6.0</hutool.version>
+        <hutool.version>5.8.23</hutool.version>
         <dameng.version>8.1.1.49</dameng.version>
         <es.version>7.12.1</es.version>
         <easy-es.version>2.0.0-beta4</easy-es.version>