报警等级默认为报警定义的报警等级

src/main/java/com/persagy/dmp/starter/alarm/communication/netty/NettyAlarmServer.java

@@ -1,6 +1,5 @@
 package com.persagy.dmp.starter.alarm.communication.netty;
 
-import com.persagy.dmp.starter.alarm.service.NettyAlarmService;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
@@ -57,6 +56,7 @@ public class NettyAlarmServer {
      * @Description: 启动netty服务端
      */
     public void start() {
+        log.info("NettyServer开始初始化...");
         bossGroup = new NioEventLoopGroup();
         workGroup = new NioEventLoopGroup();
         UnorderedThreadPoolEventExecutor businessGroup = new UnorderedThreadPoolEventExecutor(10, new DefaultThreadFactory("business"));
@@ -87,23 +87,17 @@ public class NettyAlarmServer {
                     });
             channelFuture = startNetty.bind(new InetSocketAddress(port)).sync();
 
-            System.out.println("------服务端启动closeFuture前------------");
+            log.info("NettyServer初始化完成，启动netty服务端");
             channelFuture.channel().closeFuture().sync();
-            System.out.println("------服务端启动closeFuture后------------");
+
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            // if (channelFuture != null && channelFuture.isSuccess()) {
-            // System.out.println("------netty启动成功------------");
-            // } else {
-            // System.out.println("------netty启动失败------------");
-            // }
             // 关闭主线程组
             bossGroup.shutdownGracefully();
             // 关闭工作线程组
             workGroup.shutdownGracefully();
             businessGroup.shutdownGracefully();
-
         }
     }
 

src/main/java/com/persagy/dmp/starter/alarm/service/NettyAlarmService.java

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  * @version: V1.0
  **/
 @Slf4j
-public abstract class NettyAlarmService extends BaseService{
+public abstract class NettyAlarmService extends BaseService {
     @Autowired
     AlarmClient alarmClient;
 
@@ -132,14 +132,16 @@ public abstract class NettyAlarmService extends BaseService{
     /**
      * @description: 获取报警等级
      * @param: JSONObject 创建报警的参数
-     * @return: java.lang.String
+     * @return: 报警等级，默认为报警定义的报警等级
      * @exception:
      * @author: lixing
      * @company: Persagy Technology Co.,Ltd
      * @since: 2020/11/30 4:00 下午
      * @version: V1.0
      */
-    public abstract String getAlarmLevel(JSONObject data);
+    public String getAlarmLevel(JSONObject data) {
+        return data == null ? "" : data.getString("level");
+    }
 
     /**
      * @description: 获取报警备注
@@ -151,7 +153,7 @@ public abstract class NettyAlarmService extends BaseService{
      * @since: 2020/11/30 4:00 下午
      * @version: V1.0
      */
-    public abstract String getAlarmRemark(AlarmUrlParam data,String objId,String itemCode);
+    public abstract String getAlarmRemark(AlarmUrlParam data, String objId, String itemCode);
 
     /**
      * @description: 创建报警id
@@ -172,7 +174,7 @@ public abstract class NettyAlarmService extends BaseService{
         String itemCode = data.getString("itemCode");
 
         data.put("name", getAlarmName(objId));
-        data.put("remark", getAlarmRemark(getAlarmUrlParam(data),objId,itemCode));
+        data.put("remark", getAlarmRemark(getAlarmUrlParam(data), objId, itemCode));
         data.put("supplement", getAlarmSupplement(getAlarmUrlParam(data), objId));
         data.put("level", getAlarmLevel(data));