From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BillingModeVerifyMessageListener.java |   36 +++++-------------------------------
 1 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BillingModeVerifyMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BillingModeVerifyMessageListener.java
index 6f6e9ad..fcd2bab 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BillingModeVerifyMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/listener/BillingModeVerifyMessageListener.java
@@ -14,6 +14,7 @@
 import com.ruoyi.integration.rocket.model.BillingModeVerifyMessage;
 import com.ruoyi.integration.rocket.util.EnhanceMessageHandler;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.MessageModel;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.beans.BeanUtils;
@@ -23,21 +24,16 @@
 @Slf4j
 @Component
 @RocketMQMessageListener(
-        consumerGroup = "enhance_consumer_group",
-        topic = "rocket_enhance",
-        selectorExpression = "*",
+        messageModel = MessageModel.CLUSTERING,
+        consumerGroup = "charge_billing_mode_verify",
+        topic = "charge_billing_mode_verify",
+        selectorExpression = "billing_mode_verify",
         consumeThreadMax = 5 //默认是64个线程并发消息,配置 consumeThreadMax 参数指定并发消费线程数,避免太大导致资源不够
 )
 public class BillingModeVerifyMessageListener extends EnhanceMessageHandler<BillingModeVerifyMessage> implements RocketMQListener<BillingModeVerifyMessage> {
 
     @Autowired
     private BillingModeVerifyService billingModeVerifyService;
-    @Autowired
-    private IotMessageProduce iotMessageProduce;
-    @Autowired
-    private MessageUtil messageUtil;
-    @Autowired
-    private AccountingStrategyDetailClient accountingStrategyDetailClient;
 
     @Override
     protected void handleMessage(BillingModeVerifyMessage message) throws Exception {
@@ -48,28 +44,6 @@
         BeanUtils.copyProperties(message,billingModeVerify);
         billingModeVerifyService.create(billingModeVerify);
         // 业务处理
-        BillingModeVerifyReply billingModeVerifyReply = new BillingModeVerifyReply();
-        if(message.getBilling_model_code().equals("0")){
-            // 首次
-            billingModeVerifyReply.setCharging_pile_code(billingModeVerify.getCharging_pile_code());
-            billingModeVerifyReply.setBilling_model_code("0");
-            billingModeVerifyReply.setBilling_model_result(1);
-        }else {
-            // 查询桩使用的模版
-            CheckChargingStrategyDTO dto = new CheckChargingStrategyDTO();
-            dto.setCode(message.getBilling_model_code());
-            dto.setStrategyDetailId(Integer.valueOf(message.getBilling_model_code()));
-            Boolean check = accountingStrategyDetailClient.checkChargingStrategy(dto).getData();
-            // 校验计费模版是否准确
-            billingModeVerifyReply.setCharging_pile_code(billingModeVerify.getCharging_pile_code());
-            billingModeVerifyReply.setBilling_model_code(message.getBilling_model_code());
-            if(check){
-                billingModeVerifyReply.setBilling_model_result(0);
-            }else {
-                billingModeVerifyReply.setBilling_model_result(1);
-            }
-        }
-        iotMessageProduce.sendMessage(billingModeVerifyReply.getCharging_pile_code(), ServiceIdMenu.BILLING_MODE_VERIFY_REPLY.getKey(),messageUtil.billingModeVerifyReply(billingModeVerifyReply));
     }
 
     @Override

--
Gitblit v1.7.1