Forráskód Böngészése

修改后端查询展示bug

oyq28 3 éve
szülő
commit
4735f4e9dc

+ 2 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/MqInit.java

@@ -59,7 +59,8 @@ public class MqInit implements ApplicationRunner {
         //新增MQ公共异常
         dynamicRabbitMq.addQueue(BizConstant.MQ_GLOBAL_EXCEPTION);
         dynamicRabbitMq.startListener(BizConstant.MQ_GLOBAL_EXCEPTION);
-        //dynamicRabbitMq.startListener(BizConstant.MQ_EQUIPMENT_STATUS);
+        dynamicRabbitMq.addQueue(BizConstant.MQ_EQUIPMENT_STATUS);
+        dynamicRabbitMq.startListener(BizConstant.MQ_EQUIPMENT_STATUS);
 
         //添加三个线边库轮询虚拟的MQ
 //        dynamicRabbitMq.addQueue(DemoLineConstant.NODE_RESOURCE_ZLZX_XBK);

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

@@ -70,12 +70,13 @@ public class DynamicRabbitMq {
             container.setQueueNames(queueName);
             log.info("动态添加mq监听成功,交换机:{},路由key:{},队列:{}", DRIECT_EXCHANGE, routingKey, queueName);
         }
+
         container.setPrefetchCount(100);
         container.setAcknowledgeMode(AcknowledgeMode.AUTO);//消费者需手动确认
         container.setConsumersPerQueue(1);
         container.setMessageListener(consumerHandler);
         //配置重发机制
-        container.setAdviceChain(createRetry());
+        //container.setAdviceChain(createRetry());
         container.setDefaultRequeueRejected(false);
         container.start();
     }

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -34,7 +34,7 @@
         <include refid="Base_Column_List"/>
         from (
             select a.*,b.categoryDesc,b.name as brandName,b.no as brandNo,b.specification,0 as lockNum,0 as availableNum, z.org_id from imcs_s_stock_info a
-            left join view_stock_goods b on a.spec_id = b.specId
+            left join view_stock_goods b on a.goods_id = b.id
             left join (
                 select st.id,CONCAT_WS('-',sh.shelvesDesc,st.name) as shelvesDesc, sh.no from imcs_s_storge st
                 left join (