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

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

@@ -434,6 +434,7 @@ public class TaskWorkNode {
             repeatCheckOnCount = Integer.valueOf(repeatCount.toString()) + 1;
         }
         if(repeatCheckOnCount > 3){
+            msgUtil.redis_del("repeatCheckOnCount"+taskNode.getId());
             return null;
         }else{
             msgUtil.redis_set("repeatCheckOnCount"+taskNode.getId(),repeatCheckOnCount,10, TimeUnit.MINUTES);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -997,6 +997,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("taskNodeId",taskNode0.getId().toString());
                 jsonObject.put("bizType",BizConstant.MQ_TASK_NODE_TYPE_COMMON);
+                log.info("推送mq队列{}消息{}",taskNode0.getResourceId().toString(),jsonObject.toString());
                 dynamicRabbitMq.sendMsg(taskNode0.getResourceId().toString(),jsonObject.toString());
             }
         }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/PlanServiceImpl.java

@@ -400,7 +400,7 @@ public class PlanServiceImpl extends SuperServiceImpl<PlanMapper, Plan> implemen
         for(Map<String,String> data : checkPlanCuttingTools){
             data.put("hasCuttingToolsFlag","是");
             String cuttingTools = data.get("needCuttingTools");
-            String hasCuttingTools = data.get("hasCuttingTools");
+            String hasCuttingTools = StringUtils.isBlank(data.get("hasCuttingTools"))?"":data.get("hasCuttingTools");
             List<String> ori = Arrays.asList(cuttingTools.split(","));
             List<String> compare = Arrays.asList(hasCuttingTools.split(","));
             for(String cuttingName : ori){

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -1294,7 +1294,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
      */
     @Override
     public R taskNodeCallback(TaskNodeCallBackDTO bean) {
-        log.info("回调参数======================" + JSONObject.toJSONString(bean));
+        log.info("指令回调参数======================" + JSONObject.toJSONString(bean));
         BaseContextHandler.setTenant("0000");
         //取出参数
         String code = bean.getCode();

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/DynamicRabbitMq.java

@@ -70,7 +70,7 @@ public class DynamicRabbitMq {
             container.setQueueNames(queueName);
             log.info("动态添加mq监听成功,交换机:{},路由key:{},队列:{}", DRIECT_EXCHANGE, routingKey, queueName);
         }
-        container.setPrefetchCount(2);
+        container.setPrefetchCount(100);
         container.setAcknowledgeMode(AcknowledgeMode.MANUAL);//消费者需手动确认
         container.setConsumersPerQueue(1);
         container.setMessageListener(consumerHandler);

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanMapper.xml

@@ -193,18 +193,18 @@
                 GROUP_CONCAT(ibbpt.tool_name) AS needCuttingTools
                 FROM imcs_b_bom_procedure_tool ibbpt
                 GROUP BY ibbpt.procedure_id,
-                ibbpt.resource_id) produceCuttingTools,
+                ibbpt.resource_id) produceCuttingTools left join
             (SELECT
                 icc.machine_id AS resourceId,
                 GROUP_CONCAT(icc.cutting_tool_name) AS hasCuttingTools
             FROM imcs_collect_cutting icc
-            GROUP BY icc.machine_id) resourceCuttingTools
+            GROUP BY icc.machine_id) resourceCuttingTools ON produceCuttingTools.resourceId = resourceCuttingTools.resourceId
         WHERE ippp.bom_id = ibb.id
         AND ibb.id = ibbvi.bom_id
         AND ibbvi.use_status = '1'
         AND ibbp.bom_id = ibbvi.bom_id
         AND ibbp.id = produceCuttingTools.procedureId
-        AND produceCuttingTools.resourceId = resourceCuttingTools.resourceId
+
         <if test="planId != null and planId != ''">
             and ippp.plan_id in (${planId})
         </if>