格式化代码

src/main/java/com/persagy/cache/AlarmInfoCache.java

@@ -44,7 +44,7 @@ public class AlarmInfoCache {
      * 报警定义  <报警定义标识，报警时间状态>
      * 报警定义标识默认为：报警编码-报警对象id
      */
-    private ConcurrentHashMap<String, AlarmState> alarmStateMap = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, AlarmState> alarmStateMap = new ConcurrentHashMap<>();
 
     /**
      * @param alarmDefine:

src/main/java/com/persagy/cache/CurrentDataCache.java

@@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap;
 @Component
 public class CurrentDataCache {
 
-    private ConcurrentHashMap<String, Double> latestIOTDataMap = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, Double> latestIOTDataMap = new ConcurrentHashMap<>();
 
     /**
      * @param meterId: 表号

src/main/java/com/persagy/client/WebSocketClientFactory.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -106,7 +107,7 @@ public class WebSocketClientFactory {
                 String message = msg;
                 if (compress) {
                     try {
-                        byte[] byteArrayMsg = GZIPCompressUtil.uncompress(msg.getBytes("ISO-8859-1"));
+                        byte[] byteArrayMsg = GZIPCompressUtil.uncompress(msg.getBytes(StandardCharsets.ISO_8859_1));
                         message = new String(byteArrayMsg);
                     } catch (Exception e) {
                         log.error("解密失败！", e);

src/main/java/com/persagy/demo/netty/websocket/server/NettyServer.java

@@ -28,6 +28,7 @@ public class NettyServer {
     public static void main(String[] args) throws Exception {
         new NettyServer(8888).start();
     }
+
     public void start() throws Exception {
         EventLoopGroup bossGroup = new NioEventLoopGroup();
 

src/main/java/com/persagy/job/AlarmExpireJob.java

@@ -64,7 +64,7 @@ public class AlarmExpireJob extends QuartzJobBean {
      * 恢复时刻信息
      */
     private String endInfo;
-    private AtomicLong nums = new AtomicLong(1L);
+    private final AtomicLong nums = new AtomicLong(1L);
 
     public String getState() {
         return state;

src/main/java/com/persagy/job/ExpireAlarmQueue.java

@@ -25,8 +25,6 @@ public class ExpireAlarmQueue {
     private ExpireAlarmQueue() {
     }
 
-    ;
-
     //单例队列
     public static ExpireAlarmQueue getExpireAlarmMessageQueue() {
         return SingletonHolder.queue;
@@ -55,6 +53,6 @@ public class ExpireAlarmQueue {
         /**
          * 静态初始化器，由JVM来保证线程安全
          */
-        private static ExpireAlarmQueue queue = new ExpireAlarmQueue();
+        private static final ExpireAlarmQueue queue = new ExpireAlarmQueue();
     }
 }

src/main/java/com/persagy/job/NettyMessageQueue.java

@@ -25,8 +25,6 @@ public class NettyMessageQueue {
     private NettyMessageQueue() {
     }
 
-    ;
-
     //单例队列
     public static NettyMessageQueue getNettyMessageQueue() {
         return SingletonHolder.queue;
@@ -55,6 +53,6 @@ public class NettyMessageQueue {
         /**
          * 静态初始化器，由JVM来保证线程安全
          */
-        private static NettyMessageQueue queue = new NettyMessageQueue();
+        private static final NettyMessageQueue queue = new NettyMessageQueue();
     }
 }

src/main/java/com/persagy/netty/client/CenterChannelInitializer.java

@@ -9,9 +9,9 @@ import io.netty.channel.socket.SocketChannel;
 
 
 public class CenterChannelInitializer extends ChannelInitializer<SocketChannel> {
-    private AlarmDefineService alarmDefineService;
-    private NettyClient nettyClient;
-    private AlarmRecordRepository alarmRecordRepository;
+    private final AlarmDefineService alarmDefineService;
+    private final NettyClient nettyClient;
+    private final AlarmRecordRepository alarmRecordRepository;
 
     public CenterChannelInitializer(AlarmDefineService alarmDefineService, NettyClient nettyClient, AlarmRecordRepository alarmRecordRepository) {
         this.alarmDefineService = alarmDefineService;

src/main/java/com/persagy/netty/client/CenterClientHandler.java

@@ -8,7 +8,6 @@ import com.alibaba.fastjson.TypeReference;
 import com.persagy.cache.AlarmInfoCache;
 import com.persagy.constant.CommonConst;
 import com.persagy.entity.AlarmDefine;
-import com.persagy.entity.AlarmRecord;
 import com.persagy.entity.NettyMessage;
 import com.persagy.entity.ZktAlarmRecordDO;
 import com.persagy.job.NettyMessageQueue;
@@ -20,7 +19,6 @@ import io.netty.channel.SimpleChannelInboundHandler;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -31,9 +29,9 @@ public class CenterClientHandler extends SimpleChannelInboundHandler<NettyMessag
     // Reconnect when the server sends nothing for 10 seconds.
     private static final int READ_TIMEOUT = Integer.parseInt(System.getProperty("readTimeout", "10"));
 
-    private AlarmDefineService alarmDefineService;
-    private NettyClient nettyClient;
-    private AlarmRecordRepository alarmRecordRepository;
+    private final AlarmDefineService alarmDefineService;
+    private final NettyClient nettyClient;
+    private final AlarmRecordRepository alarmRecordRepository;
 
     public CenterClientHandler(AlarmDefineService alarmDefineService, NettyClient nettyClient, AlarmRecordRepository alarmRecordRepository) {
         this.alarmDefineService = alarmDefineService;

src/main/java/com/persagy/netty/util/SerializationUtil.java

@@ -13,9 +13,9 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class SerializationUtil {
 
-    private static Map<Class<?>, Schema<?>> cachedSchema = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, Schema<?>> cachedSchema = new ConcurrentHashMap<>();
 
-    private static Objenesis objenesis = new ObjenesisStd();
+    private static final Objenesis objenesis = new ObjenesisStd();
 
     private SerializationUtil() {
 

src/main/java/com/persagy/utils/GZIPCompressUtil.java

@@ -3,6 +3,7 @@ package com.persagy.utils;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -20,7 +21,7 @@ public class GZIPCompressUtil {
     }
 
     public static String uncompress(String str) throws IOException {
-        String message = new String(GZIPCompressUtil.uncompress(str.getBytes("ISO-8859-1")));
+        String message = new String(GZIPCompressUtil.uncompress(str.getBytes(StandardCharsets.ISO_8859_1)));
         return message;
     }
 

src/main/java/com/persagy/utils/LockUtil.java

@@ -21,7 +21,7 @@ import java.util.concurrent.locks.ReentrantLock;
 public class LockUtil {
 
     //创建 SingleObject 的一个对象
-    private static LockUtil instance = new LockUtil();
+    private static final LockUtil instance = new LockUtil();
     public Lock lock = new ReentrantLock();
     public Condition condition = lock.newCondition();
     AtomicInteger num = new AtomicInteger(0);

src/main/java/com/persagy/utils/NetworkUtil.java

@@ -65,7 +65,7 @@ public class NetworkUtil {
         } else if (ip.length() > 15) {
             String[] ips = ip.split(",");
             for (int index = 0; index < ips.length; index++) {
-                String strIp = (String) ips[index];
+                String strIp = ips[index];
                 if (!("unknown".equalsIgnoreCase(strIp))) {
                     ip = strIp;
                     break;

src/main/java/com/persagy/utils/StringUtil.java

@@ -251,10 +251,7 @@ public class StringUtil {
     public static boolean isJSONObject(String content) {
         try {
             Object jsobj = JSONObject.parse(content);
-            if (jsobj instanceof JSONObject) {
-                return true;
-            }
-            return false;
+            return jsobj instanceof JSONObject;
         } catch (Exception e) {
             return false;
         }
@@ -269,10 +266,7 @@ public class StringUtil {
     public static boolean isJSONArray(String content) {
         try {
             Object jsobj = JSONObject.parse(content);
-            if (jsobj instanceof JSONArray) {
-                return true;
-            }
-            return false;
+            return jsobj instanceof JSONArray;
         } catch (Exception e) {
             return false;
         }
@@ -445,7 +439,7 @@ public class StringUtil {
      * @return true or false
      */
     public static boolean getBoolean(Object obj) {
-        return isEmpty(obj) ? false : Boolean.valueOf(obj.toString());
+        return !isEmpty(obj) && Boolean.valueOf(obj.toString());
     }
 
     public static void main(String[] args) {

src/main/resources/application-Pj5001120003.yml

@@ -3,7 +3,7 @@ group:
   code: XG   #标识哪个接团 比如万达使用WD
   alarm:
     #需要更改
-    host: 192.168.64.16 #39.102.43.179  #netty IP
+    host: 127.0.0.1 #39.102.43.179  #netty IP
     #需要更改
     port: 9986          #netty 端口8826
     #需要更改