修改企业bug和展示

imcs-admin-boot/imcs-authority-server/src/main/java/com/github/zuihou/job/DashboardJob.java

@@ -104,12 +104,14 @@ public class DashboardJob {
         BaseContextHandler.setTenant("0000");
 
         List<String> userIds = webSocketServer.getUserIds();
-        userIds.forEach(item->{
-            List<Session> sessions = webSocketServer.getSessions(item);
-            String userid = this.parseJWT(item).get("userid").toString();
-            this.broadCastData(userid, sessions);
-            //webSocketServer.BroadCastInfo(pushMsg, sessions);
-        });
+        if(userIds.size()>0) {
+            userIds.forEach(item -> {
+                List<Session> sessions = webSocketServer.getSessions(item);
+                String userid = this.parseJWT(item).get("userid").toString();
+                this.broadCastData(userid, sessions);
+                //webSocketServer.BroadCastInfo(pushMsg, sessions);
+            });
+        }
     }
 
     private void broadCastData(String userid, List<Session> sessions){

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/ConsumerHandler.java

@@ -43,12 +43,12 @@ public class ConsumerHandler implements ChannelAwareMessageListener {
             e.printStackTrace();
             log.error("MQ异常:"+e.getMessage());
             //是否重试请求
-            //if (message.getMessageProperties().getRedelivered()) {
-            //    channel.basicNack(deliveryTag, false, false);//消息消费失败将丢弃该消息
-            //}else{
+            if (e.getMessage().equals("节点参数异常")) {
+                channel.basicNack(deliveryTag, false, false);//消息消费失败将丢弃该消息
+            }else{
                 log.error("消息消费失败重新进入队列");
                 channel.basicNack(deliveryTag, false, true);
-            //}
+            }
         }
     }
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -197,14 +197,14 @@ public class TaskWorkNode {
             AAutoNodeLog log = AAutoNodeLog.builder().build();
             log.setExeResult("0").setManual("0").setFeedback("当前任务节点为空");
             autoNodeLogService.save(log);
-            throw new RuntimeException("当前任务节点为空");
+            throw new RuntimeException("节点参数异常");
         }
         TTask tTask = taskMapper.selectById(taskNode.getTaskId());
         if (tTask == null || tTask.getStatus() == "3") {
             AAutoNodeLog log = AAutoNodeLog.builder().build();
             log.setTaskNodeId(taskNode.getId()).setExeResult("0").setManual("0").setFeedback("当前任务为空");
             autoNodeLogService.save(log);
-            throw new RuntimeException("当前任务为空");
+            throw new RuntimeException("节点参数异常");
         }
 //        //获取配置序数据
         //任务初始化判断
@@ -332,7 +332,7 @@ public class TaskWorkNode {
         } catch (BizException e) {
             e.printStackTrace();
             JSONObject errJsonObject = new JSONObject();
-            errJsonObject.put("code", "2");
+            errJsonObject.put("code", "exception");
             errJsonObject.put("msg", e.getMessage());
             returnData = errJsonObject.toJSONString();
             logger.error("调用接口发生异常" + e.getMessage());
@@ -355,6 +355,8 @@ public class TaskWorkNode {
                     //执行异常处理（无须人工处理和警报提示)
                     log.setExeResult("0").setManual("0").setFeedback(retJson.getString("msg"));
                 }
+            }else{
+                log.setExeResult("0").setManual("0").setFeedback("接口响应超时");
             }
             if (log.getId() == null) {
                 autoNodeLogService.save(log);

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/AAutoNodeLogMapper.xml

@@ -23,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time ,create_user,update_time,update_user,method, execute_time,manual,zone_id,org_id,
+        id,create_time ,create_user,update_time,update_user,method, execute_time,manual,zone_id,org_id,task_id, task_node_id,
         auto_node_id, exe_status, exe_result, start_time, end_time, feedback, feedback_file, status, resourceName,instructionName,procedureName,nodeNo
     </sql>