Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java

@@ -392,6 +392,9 @@ public class HighFormworkSupportService {
      * @return
      */
     private Integer getAlarmState(String s) {
+        if (s == null) {
+            return 1;
+        }
         switch (s) {
             case "1":
                 return 1;