|
@@ -5,6 +5,7 @@ import com.fdkankan.repair.bean.UpgradeBean;
|
|
|
import com.fdkankan.repair.service.ISceneUpgradeToV4Service;
|
|
|
import com.rabbitmq.client.Channel;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
+import java.util.HashMap;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.amqp.core.Message;
|
|
|
import org.springframework.amqp.rabbit.annotation.Queue;
|
|
@@ -45,9 +46,13 @@ public class RabbitMqListener {
|
|
|
String correlationId = (String) correlation;
|
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
|
log.info("场景升级开始,队列名:{},id:{},消息体:{}", upgradeToV4, correlationId, msg);
|
|
|
- UpgradeBean upgradeBean = JSON.parseObject(msg, UpgradeBean.class);
|
|
|
+// UpgradeBean upgradeBean = JSON.parseObject(msg, UpgradeBean.class);
|
|
|
+ HashMap hashMap = JSON.parseObject(msg, HashMap.class);
|
|
|
+ int sceneProId = (int)hashMap.get("sceneProId");
|
|
|
+ boolean reUpgrade = (boolean)hashMap.get("reUpgrade");
|
|
|
+
|
|
|
//迁移数据
|
|
|
- sceneUpgradeToV4Service.upgrade(upgradeBean);
|
|
|
+ sceneUpgradeToV4Service.upgrade(sceneProId, reUpgrade);
|
|
|
log.info("场景升级结束,队列名:{},id:{}", upgradeToV4, correlationId);
|
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
|
}
|