删除fastJSON

王勇
pom.xml
src/main/java/com/sunyo/wlpt/cgonms/provide/controller/NmsController.java
src/main/java/com/sunyo/wlpt/cgonms/provide/utils/GsonUtils.java
src/main/java/com/sunyo/wlpt/cgonms/provide/websocket/WebSocketServer.java
--- a/pom.xml
查看文件 @92c7278
+++ b/pom.xml
查看文件 @92c7278
@@ -144,12 +144,18 @@
             <artifactId>swagger-models</artifactId>
             <version>1.5.22</version>
         </dependency>
-
+        <!-- 添加Gson依赖
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.49</version>
         </dependency>
+        -->
+        <!-- 添加Gson依赖 -->
+        <dependency>
+             <groupId>com.google.code.gson</groupId>
+             <artifactId>gson</artifactId>
+        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
--- a/src/main/java/com/sunyo/wlpt/cgonms/provide/controller/NmsController.java
查看文件 @92c7278
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/controller/NmsController.java
查看文件 @92c7278
 package com.sunyo.wlpt.cgonms.provide.controller;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.sunyo.wlpt.cgonms.provide.domain.*;
 import com.sunyo.wlpt.cgonms.provide.feign.GetCgoAsmFeign;
 import com.sunyo.wlpt.cgonms.provide.feign.GetDataWareHouseFeign;
@@ -11,6 +12,7 @@ import com.sunyo.wlpt.cgonms.provide.response.ResultJson;
 import com.sunyo.wlpt.cgonms.provide.response.ResultWs;
 import com.sunyo.wlpt.cgonms.provide.service.*;
 import com.sunyo.wlpt.cgonms.provide.thread.ExitThreadPoolFactory;
+import com.sunyo.wlpt.cgonms.provide.utils.GsonUtils;
 import com.sunyo.wlpt.cgonms.provide.websocket.WebSocketServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -95,7 +97,8 @@ public class NmsController {
         String sid = request.getHeader("Authorization");
         log.info("token的值：" + sid);
         final String startTime = sdf.format(new Date());
-        String resultStart = JSON.toJSONString(new ResultWs("数据开始获取"));
+
+        String resultStart = GsonUtils.toJsonStr(new ResultWs("数据开始获取"));
         sendMsgByWebsocket(resultStart, sid);
         ResultJson resultJson = new ResultJson();
@@ -106,9 +109,9 @@ public class NmsController {
         resultExitData.setFlightDate(flightDate);
         resultExitData.setFlightNo(flightNo);
         List<ResultExitData> resultList = resultExitDataService.getResultExitDataInfo(resultExitData);
-        System.out.println("长度为：" + resultList.size());
+        log.info("长度为：" + resultList.size());
         ResultWs resultTotal = new ResultWs("一共" + resultList.size() + "条数据", resultList.size());
-        String resultTotalJs = JSON.toJSONString(resultTotal, SerializerFeature.DisableCircularReferenceDetect);
+        String resultTotalJs = GsonUtils.toJsonStr(resultTotal);
         sendMsgByWebsocket(resultTotalJs, sid);
         //控制index，查询数据的时候，保证索引的位置不出错
@@ -129,7 +132,7 @@ public class NmsController {
                             int temp = i + index;
                             ResultWs resultWs = new ResultWs("获取数据,第" + temp + "条", "201", temp, resultList.size());
-                            String resultJs = JSON.toJSONString(resultWs, SerializerFeature.DisableCircularReferenceDetect);
+                            String resultJs = GsonUtils.toJsonStr(resultWs);
                             sendMsgByWebsocket(resultJs, sid);
                         }
@@ -149,7 +152,7 @@ public class NmsController {
                             int temp = i + index;
                             ResultWs resultWs = new ResultWs("获取数据,第" + temp + "条", "201", temp, resultList.size());
-                            String resultJs = JSON.toJSONString(resultWs, SerializerFeature.DisableCircularReferenceDetect);
+                            String resultJs = GsonUtils.toJsonStr(resultWs);
                             sendMsgByWebsocket(resultJs, sid);
                         }
                         index = index + i;
@@ -168,7 +171,7 @@ public class NmsController {
                     resultList.set(i, result);
                     ResultWs resultWs = new ResultWs("获取数据,第" + i + "条", "201", i, resultList.size());
-                    String resultJs = JSON.toJSONString(resultWs, SerializerFeature.DisableCircularReferenceDetect);
+                    String resultJs = GsonUtils.toJsonStr(resultWs);
                     sendMsgByWebsocket(resultJs, sid);
                 }
@@ -180,9 +183,9 @@ public class NmsController {
             log.error("获取数据出错", e);
         }
         final String endTime = sdf.format(new Date());
-        System.out.println("出港信息，获取完毕,index的值为：" + index);
-        System.out.println("结束时间：" + endTime);
-        String resultJs = JSON.toJSONString(new ResultWs("获取数据,完成", resultList, "200", resultList.size(), resultList.size()));
+        log.info("出港信息，获取完毕,index的值为：" + index);
+        log.info("结束时间：" + endTime);
+        String resultJs = GsonUtils.toJsonStr(new ResultWs("获取数据,完成", resultList, "200", resultList.size(), resultList.size()));
         sendMsgByWebsocket(resultJs, sid);
         resultJson.setCode("200");
         resultJson.setData(resultList);
@@ -323,4 +326,6 @@ public class NmsController {
             e.printStackTrace();
         }
     }
+
+
 }
--- a/src/main/java/com/sunyo/wlpt/cgonms/provide/utils/GsonUtils.java 0 → 100644
查看文件 @92c7278
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/utils/GsonUtils.java 0 → 100644
查看文件 @92c7278
+package com.sunyo.wlpt.cgonms.provide.utils;
+
+import com.fasterxml.jackson.databind.deser.std.DateDeserializers;
+import com.fasterxml.jackson.databind.ser.std.DateSerializer;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.text.DateFormat;
+
+/**
+ * @author 子诚
+ * Description：
+ * 时间：2020/6/5 10:19
+ */
+public class GsonUtils {
+
+    private static Gson gson = null;
+
+    /**
+     * 判断gson对象是否存在了,不存在则创建对象
+     */
+    static {
+        if (gson == null) {
+            //gson = new Gson();
+            //当使用GsonBuilder方式时属性为空的时候输出来的json字符串是有键值key的,显示形式是"key":null，而直接new出来的就没有"key":null的
+            gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
+        }
+    }
+
+    /**
+     * 无参的私有构造方法
+     */
+    private GsonUtils() {
+    }
+
+    /**
+     * 封装一个 gson 将对象转换成json字符串的方法。
+     */
+    public static String toJsonStr(Object object) {
+        String gsonString = null;
+        if (gson != null) {
+            gsonString = gson.toJson(object);
+        }
+        return gsonString;
+    }
+}
--- a/src/main/java/com/sunyo/wlpt/cgonms/provide/websocket/WebSocketServer.java
查看文件 @92c7278
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/websocket/WebSocketServer.java
查看文件 @92c7278
 package com.sunyo.wlpt.cgonms.provide.websocket;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
+
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
-import com.alibaba.fastjson.JSON;
 import com.sunyo.wlpt.cgonms.provide.controller.NmsController;
-import com.sunyo.wlpt.cgonms.provide.response.ResultJson;
 import com.sunyo.wlpt.cgonms.provide.response.ResultWs;
+import com.sunyo.wlpt.cgonms.provide.utils.GsonUtils;
 import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
@@ -17,7 +15,7 @@ import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
 import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * Created by XYH on 2019/12/23.
@@ -54,7 +52,7 @@ public class WebSocketServer {
         log.info("有新窗口开始监听:" + sid + ",当前在线人数为" + getOnlineCount());
         this.sid = sid;
         try {
-            String resultStart = JSON.toJSONString(new ResultWs("连接成功，可以开始查询！" ));
+            String resultStart = GsonUtils.toJsonStr(new ResultWs("连接成功，可以开始查询！"));
             sendMessage(resultStart);
         } catch (IOException e) {
             log.error("websocket IO异常");