1.update

-package com.topdraw.config;
-
-public class LocalConstants {
-
-    // 小屏侧
-    public static final String ENV_MOBILE = "mobile";
-
-    // 大屏侧
-    public static final String ENV_VIS = "vis";
-
-    // 服务侧
-    public static final String ENV_SERVICE = "service";
-
-    // 管理侧
-    public static final String ENV_MANAGEMENT = "management";
-
-    // 大屏类型
-    public static final int DEVICE_VIS = 1;
-
-    // 小屏类型
-    public static final int DEVICE_MOBILE = 2;
-
-    // 平台类型
-    public static final String PLATFORM_TYPE_SERVICE = "service";
-    public static final String PLATFORM_TYPE_MANAGEMENT = "management";
-
-    //会员平台类型 类型 1：大屏；2：小屏
-    public static final Integer MEMBER_PLATFORM_TYPE_VIS = 1;
-    public static final Integer MEMBER_PLATFORM_TYPE_WEIXIN = 2;
-
-    // 重庆_重数_vis
-    public static final String APP_CODE_CHONGQING_CHONGSHU_VIS = "CHONGQING_chongshu_vis";
-
-
-    // 事件类型 3:参加活动
-    public static final Integer EVT_TYPE_ACTIVITY = 3;
-}

@@ -38,7 +38,9 @@ public class RabbitMqConfig {
 
     /** 路由(事件)--direct route.key*/
     // 事件，uc-gateway
-    public static final String UC_ROUTE_KEY_DIRECT_EVENT_AAA = "uc.route.key.direct.event.aaa";
+//    public static final String UC_ROUTE_KEY_DIRECT_EVENT_AAA = "uc.route.key.direct.event.aaa";
+    public static final String UC_ROUTE_KEY_DIRECT_EVENT_AAA = "gateway.common.consumer.event.direct";
+    public static final String UC_EVENTBUS_TOPIC = "uc.eventbus.aa";
     // uc-service 服务侧
     public static final String UC_ROUTE_KEY_DIRECT_EVENT_BBB = "uc.route.key.direct.event.bbb";
     // uc-service 管理侧
@@ -46,6 +48,8 @@ public class RabbitMqConfig {
 
     public static final String ENGINE_TO_IPTV_CONSUMER_MEMBER_DIRECT = "engine.iptv.consumer.member.direct";
 
+
+
     @Value("${mutil-mq.service.host}")
     private String serviceHost;
     @Value("${mutil-mq.service.port}")
@@ -124,6 +128,10 @@ public class RabbitMqConfig {
         return u;
     }
 
+
+    public static final String UC_EVENTBUS = "uc.eventbus";
+    public static final String UC_EVENTBUS_KEY = "uc.eventbus.*.topic";
+
     /**
      * 处理事件
      * @return org.springframework.amqp.core.Queue
@@ -135,5 +143,29 @@ public class RabbitMqConfig {
         return new Queue(UC_ROUTE_KEY_DIRECT_EVENT_AAA);
     }
 
+    /**
+     * 处理事件
+     * @return org.springframework.amqp.core.Queue
+     * @author XiangHan
+     * @date 2021/9/7 10:19 上午
+     */
+    @Bean
+    public Queue eventTopic() {
+        return new Queue(UC_EVENTBUS_TOPIC);
+    }
+
 
+    @Bean
+    TopicExchange eventBusDirect() {
+        return ExchangeBuilder.topicExchange(UC_EVENTBUS)
+                .durable(true).build();
+    }
+
+    @Bean
+    Binding collectionAddBinding(TopicExchange eventBusDirect, Queue eventTopic) {
+        return BindingBuilder
+                .bind(eventTopic)
+                .to(eventBusDirect)
+                .with(UC_EVENTBUS_KEY);
+    }
 }

-package com.topdraw.config;
-
-import cn.hutool.core.util.ObjectUtil;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ServiceEnvConfig {
-
-    // uc两侧部署，需配置位于哪一侧 mobile小屏侧 vis大屏侧
-    public static String UC_SERVICE_TYPE;
-
-    @Value("${service.area:mobile}")
-    public void setUcServiceType(String ucServiceType) {
-        UC_SERVICE_TYPE = ucServiceType;
-    }
-
-    public static boolean isMobile() {
-        return ObjectUtil.equals(UC_SERVICE_TYPE, LocalConstants.ENV_MOBILE);
-    }
-
-    public static boolean isVis() {
-        return ObjectUtil.equals(UC_SERVICE_TYPE, LocalConstants.ENV_VIS);
-    }
-
-
-    // service: 服务侧  management: 管理侧
-    public static String UC_SERVICE_PLATFORM;
-
-    @Value("${service.platform:management}")
-    public void setUcServicePlatform(String ucServicePlatform) {
-        UC_SERVICE_PLATFORM = ucServicePlatform;
-    }
-
-    public static boolean isService() {
-        return ObjectUtil.equals(UC_SERVICE_PLATFORM, LocalConstants.ENV_SERVICE);
-    }
-
-    public static boolean isManagement() {
-        return ObjectUtil.equals(UC_SERVICE_PLATFORM, LocalConstants.ENV_MANAGEMENT);
-    }
-
-}

@@ -31,11 +31,11 @@ public class UcEngineEventConsumer {
      * @author Hongyan Wang
      * @date 2021/9/7 11:26 上午
      */
-    @RabbitHandler
+   /* @RabbitHandler
     @RabbitListener(bindings = {
             @QueueBinding(value = @Queue(value = RabbitMqConfig.ENGINE_TO_IPTV_CONSUMER_MEMBER_DIRECT),
                     exchange = @Exchange(value = ExchangeTypes.DIRECT))
-    }, containerFactory = "serviceRabbitListenerContainerFactory")
+    }, containerFactory = "serviceRabbitListenerContainerFactory")*/
     public void ucEventConsumer(String content) {
         log.info(" receive dataSync msg , content is : {} ", content);
         TableOperationMsg tableOperationMsg = this.parseContent(content);

+package com.topdraw.mq.consumer;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.topdraw.config.RabbitMqConfig;
+import com.topdraw.mq.domain.DataSyncMsg;
+import com.topdraw.resttemplate.RestTemplateClient;
+import com.topdraw.util.JSONUtil;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.ExchangeTypes;
+import org.springframework.amqp.rabbit.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+
+import java.sql.Timestamp;
+
+@Component
+@Slf4j
+public class UcEventBusConsumer {
+
+    @Autowired
+    RestTemplateClient restTemplateClient;
+
+    @Autowired
+    AutoRoute autoUser;
+
+    /**
+     * 事件
+     * @param content
+     * @description 基础数据同步
+     * @author Hongyan Wang
+     * @date 2021/9/7 11:26 上午
+     */
+    @RabbitHandler/*
+    @RabbitListener(bindings = {
+            @QueueBinding(value = @Queue(value = RabbitMqConfig.UC_EVENTBUS_TOPIC),
+                    exchange = @Exchange(type = ExchangeTypes.TOPIC, name = RabbitMqConfig.UC_EVENTBUS),
+                    key = RabbitMqConfig.UC_EVENTBUS_KEY)
+    }, containerFactory = "managementRabbitListenerContainerFactory")*/
+    @RabbitListener(queues = RabbitMqConfig.UC_EVENTBUS_TOPIC, containerFactory = "managementRabbitListenerContainerFactory")
+    public void ucEventConsumer(String content) {
+        log.info(" receive dataSync msg , content is : {} ", content);
+        DataSyncMsg dataSyncMsg = this.parseContent(content);
+//        this.taskDeal(dataSyncMsg);
+        log.info("ucEventConsumer ====>>>> end");
+    }
+
+    /**
+     * 数据解析
+     * @param content
+     * @return
+     */
+      /*{
+            "evt": "play”,  // 表示播放
+            "deviceType": 1, // 1代表大屏
+            "time": "2022-04-01 00:10:09”,
+            "msgData": {
+                    "platformAccount": "itv094430@“, // 大屏用户账号
+                    "playDuration": 60, // 播放时长，单位分钟
+                    "mediaId": 3433, // 节目id，此次是累计计算，可不传
+                    "mediaCode": "media_123”, // 节目标识，同上
+                    "mediaName": "白宫陷落” // 节目名称，同上
+            }
+        }*/
+    private DataSyncMsg parseContent(String content) {
+
+        CommonMsg commonMsg = JSONUtil.parseMsg2Object(content, CommonMsg.class);
+
+        String evt = commonMsg.getEvt();
+        switch (evt.toUpperCase()) {
+
+            case "PLAY":
+                PlayContent playContent = JSONUtil.parseMsg2Object(content, PlayContent.class);
+                System.out.println(playContent);
+                break;
+
+        }
+
+        DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(content,DataSyncMsg.class);
+        Assert.notNull(dataSyncMsg,"ERROR -->> operationConsumer -->> parseContent -->> 【dataSyncMsg】 not be null !!");
+        DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
+        Assert.notNull(msgData,"ERROR -->> operationConsumer -->> parseContent -->> 【msgData】 not be null !!");
+        return dataSyncMsg;
+    }
+
+    /**
+     * 任务处理
+     * @param dataSyncMsg
+     */
+    private void taskDeal(DataSyncMsg dataSyncMsg) {
+        this.restTemplateClient.dealTask(dataSyncMsg);
+    }
+
+    @Data
+    static class PlayContent {
+        private String evt;
+        private Integer deviceType;
+        private String time;
+        private MsgData msgData;
+
+        @Data
+        static class MsgData {
+            private String platformAccount;
+            private Integer playDuration;
+            private Long mediaId;
+            private String mediaCode;
+            private String mediaName;
+        }
+    }
+
+    @Data
+    static class CommonMsg {
+        private String evt;
+        private Integer deviceType;
+        private String time;
+    }
+}

@@ -36,7 +36,7 @@ public class UcGatewayEventConsumer {
     public void ucEventConsumer(String content) {
         log.info(" receive dataSync msg , content is : {} ", content);
         DataSyncMsg dataSyncMsg = this.parseContent(content);
-        this.taskDeal(dataSyncMsg);
+        //this.taskDeal(dataSyncMsg);
         log.info("ucEventConsumer ====>>>> end");
     }
 

@@ -155,8 +155,8 @@ public class WeiXinEventConsumer {
                 String eventKey = wechatMsg.getString("EventKey");
 
                 SubscribeBean subscribeBean = new SubscribeBean();
-                subscribeBean.setAppId(appid);
-                subscribeBean.setOpenId(openid);
+                subscribeBean.setAppid(appid);
+                subscribeBean.setOpenid(openid);
                 subscribeBean.setUnionid(unionid);
                 subscribeBean.setEventKey(eventKey);
 

@@ -53,6 +53,7 @@ public class DataSyncMsg implements Serializable {
         private Long mediaId;
         private Long itemId;
         private String param;
+        private String description;
     }
 
 }

@@ -10,10 +10,10 @@ import lombok.NoArgsConstructor;
 public class SubscribeBean {
 
     /**  */
-    private String openId;
+    private String openid;
 
     /**  */
-    private String appId;
+    private String appid;
 
     private String unionid;
 

@@ -41,7 +41,7 @@ public class RestTemplateClient {
     }
 
     public JSONObject dealTask(DataSyncMsg dataSyncMsg) {
-        String url = BASE_URL + "/ucEngine/api/taskOperation/dealTask";
+        String url = BASE_URL + "/uce/taskOperation/dealTask";
         log.info("request uc : url is " + url + ", dataSyncMsg is " + dataSyncMsg);
         String content = JSON.toJSONString(dataSyncMsg);
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
@@ -63,7 +63,7 @@ public class RestTemplateClient {
 
     public JSONObject getMemberInfo(Long memberId) {
         JSONObject resultSet = null;
-        String url = BASE_URL + "/api/member/findById/" + memberId;
+        String url = BASE_URL + "/uce/member/findById/" + memberId;
         log.info("request uc : url is " + url + ", memberId is " + memberId);
         ResponseEntity<String> responseEntity = restTemplate.getForEntity(url, String.class);
         if (responseEntity.getStatusCode().is2xxSuccessful()) {
@@ -78,7 +78,7 @@ public class RestTemplateClient {
     }
 
     public String createMemberAddress(MemberAddress member) {
-        String url = BASE_URL + "/api/MemberAddress/create";
+        String url = BASE_URL + "/uce/memberAddress/create";
         log.info("request uc : url is " + url + ", memberId is " + JSONObject.toJSONString(member));
         restTemplate.postForEntity(url, member, String.class);
        /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, member, String.class);
@@ -91,7 +91,7 @@ public class RestTemplateClient {
     }
 
     public String unsubscribe(SubscribeBean subscribeBean) {
-        String url = BASE_URL + "/ucEngine/api/userOperation/unsubscribe";
+        String url = BASE_URL + "/uce/userOperation/unsubscribe";
         String content = JSON.toJSONString(subscribeBean);
 
         HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
@@ -107,7 +107,7 @@ public class RestTemplateClient {
     }
 
     public String subscribe(SubscribeBean subscribeBean) {
-        String url = BASE_URL + "/ucEngine/api/userOperation/subscribe";
+        String url = BASE_URL + "/uce/userOperation/subscribe";
         String content = JSON.toJSONString(subscribeBean);
 
         HashMap<String, String> objectObjectHashMap = new HashMap<>();
@@ -124,7 +124,7 @@ public class RestTemplateClient {
     }
 
     public String sendQrCodeMessage(String content) {
-        String url = BASE_URL + "/ucEngine/api/userOperation/sendQrCodeMessage";
+        String url = BASE_URL + "/uce/userOperation/sendQrCodeMessage";
         restTemplate.postForEntity(url, content, String.class);
        /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, content, String.class);
         String entityBody = "";
@@ -136,7 +136,7 @@ public class RestTemplateClient {
     }
 
     public String addCollection(String content) {
-        String url = BASE_URL + "/ucEngine/api/userOperation/addCollection";
+        String url = BASE_URL + "/uce/userOperation/addCollection";
         //处理接口调用 中文不显示问题
         content = new String(Base64.getEncoder().encode(content.getBytes(StandardCharsets.UTF_8)));
 
@@ -151,7 +151,7 @@ public class RestTemplateClient {
     }
 
     public String deleteCollection(String content) {
-        String url = BASE_URL + "/ucEngine/api/userOperation/deleteCollection";
+        String url = BASE_URL + "/uce/userOperation/deleteCollection";
         restTemplate.postForEntity(url, content, String.class);
        /* ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, content, String.class);
         String entityBody = "";
@@ -163,7 +163,7 @@ public class RestTemplateClient {
     }
 
     public String deleteAllCollection(String content) {
-        String url = BASE_URL + "/ucEngine/api/userOperation/deleteAllCollection";
+        String url = BASE_URL + "/uce/userOperation/deleteAllCollection";
         restTemplate.postForEntity(url, content, String.class);
         /*ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, content, String.class);
         String entityBody = "";