瀏覽代碼

修改调用energy-alarm-service接口的bug

lixing 3 年之前
父節點
當前提交
10ee710968

+ 5 - 0
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/feign/AlarmCondition.java

@@ -1,9 +1,12 @@
 package com.persagy.apm.energyalarmstarter.alarmengine.feign;
 
 import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -14,6 +17,8 @@ import java.util.List;
  **/
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class AlarmCondition {
     /**
      * 主键

+ 4 - 0
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/feign/BaseRequestBody.java

@@ -17,6 +17,10 @@ public class BaseRequestBody {
      */
     private String userId;
     /**
+     * 当前用户密码
+     */
+    private String pd;
+    /**
      * 集团编码
      */
     private String groupCode;

+ 4 - 0
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/feign/ObjConditionRel.java

@@ -1,7 +1,9 @@
 package com.persagy.apm.energyalarmstarter.alarmengine.feign;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 设备与报警条件的关联
@@ -11,6 +13,8 @@ import lombok.Data;
  **/
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ObjConditionRel {
     /**
      * 报警对象id

+ 6 - 3
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/feign/service/AlarmServiceImpl.java

@@ -23,6 +23,9 @@ public class AlarmServiceImpl {
     @Autowired
     EnergyAlarmServiceClient energyAlarmServiceClient;
 
+    /** 设置一个假的用户密码 */
+    private final String pd = "pd";
+
     /**
      * 全量查询报警条件
      *
@@ -34,7 +37,7 @@ public class AlarmServiceImpl {
      */
     public List<AlarmCondition> queryAllAlarmCondition(String userId, String groupCode) {
         CommonResult<List<AlarmCondition>> listCommonResult = energyAlarmServiceClient.queryAllAlarmCondition(
-                BaseRequestBody.builder().userId(userId).groupCode(groupCode).build());
+                BaseRequestBody.builder().userId(userId).groupCode(groupCode).pd(pd).build());
         if (listCommonResult == null) {
             return new ArrayList<>();
         }
@@ -52,7 +55,7 @@ public class AlarmServiceImpl {
      */
     public List<ProjectVO> queryProjects(String userId, String groupCode) {
         CommonResult<List<ProjectVO>> listCommonResult = energyAlarmServiceClient.queryProjects(
-                BaseRequestBody.builder().userId(userId).groupCode(groupCode).build());
+                BaseRequestBody.builder().userId(userId).groupCode(groupCode).pd(pd).build());
         if (listCommonResult == null) {
             return new ArrayList<>();
         }
@@ -71,7 +74,7 @@ public class AlarmServiceImpl {
      */
     public List<ObjConditionRel> queryObjAlarmConditionRel(String userId, String groupCode, String projectId) {
         CommonResult<List<ObjConditionRel>> listCommonResult = energyAlarmServiceClient.queryObjAlarmConditionRel(
-                BaseRequestBody.builder().userId(userId).groupCode(groupCode).projectId(projectId).build());
+                BaseRequestBody.builder().userId(userId).groupCode(groupCode).pd(pd).projectId(projectId).build());
         if (listCommonResult == null) {
             return new ArrayList<>();
         }

+ 7 - 2
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/netty/NettyAlarmMsgBaseHandler.java

@@ -61,8 +61,13 @@ public class NettyAlarmMsgBaseHandler extends ChannelInboundHandlerAdapter {
      * @version: V1.0
      */
     private Channel getChannel(String projectId) {
+        Channel channel;
+        if (StringUtils.isBlank(projectId)) {
+            channel = socketChannelMap.get(allProjects);
+            return channel;
+        }
         // 项目上的消息只推送给一个边缘端来处理
-        Channel channel = socketChannelMap.get(projectId);
+        channel = socketChannelMap.get(projectId);
         if (channel == null) {
             channel = socketChannelMap.get(allProjects);
         }
@@ -274,7 +279,7 @@ public class NettyAlarmMsgBaseHandler extends ChannelInboundHandlerAdapter {
         try {
             NettyAlarmMessage nettyMessage = StringUtil.transferItemToDTO(msg.toString(), NettyAlarmMessage.class);
             switch (nettyMessage.getOpCode()) {
-                case ACCEPTED:
+                case CONNECT:
                     /* 接收到边缘端创建连接请求,存储连接请求的projectId和channel映射关系,
                      * 以后向边缘端发送请求时,通过projectId获取到对应的channel
                      */

+ 2 - 2
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/netty/NettyAlarmServer.java

@@ -60,8 +60,8 @@ public class NettyAlarmServer {
         log.info("NettyServer开始初始化...");
         bossGroup = new NioEventLoopGroup();
         workGroup = new NioEventLoopGroup();
-        UnorderedThreadPoolEventExecutor businessGroup = new UnorderedThreadPoolEventExecutor(10, new DefaultThreadFactory("business"));
-
+//        UnorderedThreadPoolEventExecutor businessGroup = new UnorderedThreadPoolEventExecutor(10, new DefaultThreadFactory("business"));
+        EventLoopGroup businessGroup = new NioEventLoopGroup();
         try {
             // (服务端启动类)ServerBootstrap负责初始化netty服务器,并且开始监听端口的socket请求
             ServerBootstrap startNetty = new ServerBootstrap();