Skip to content

向汉 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit b8817df0 b8817df08220623cc38545b47cb081d828e1fc93 by xianghan
Options

1.update

1 parent b5fbd670
Inline Side-by-side
Showing 2 changed files with 50 additions and 15 deletions
...@@ -31,11 +31,11 @@ public class UcEngineIptv2ManagementConsumer { ...@@ -31,11 +31,11 @@ public class UcEngineIptv2ManagementConsumer {
31 * @author Hongyan Wang 31 * @author Hongyan Wang
32 * @date 2021/9/7 11:26 上午 32 * @date 2021/9/7 11:26 上午
33 */ 33 */
34 /* @RabbitHandler 34 /*@RabbitHandler
35 @RabbitListener(bindings = { 35 @RabbitListener(bindings = {
36 @QueueBinding(value = @Queue(value = RabbitMqConfig.ENGINE_TO_MANAGEMENT_DIRECT), 36 @QueueBinding(value = @Queue(value = RabbitMqConfig.ENGINE_TO_MANAGEMENT_DIRECT),
37 exchange = @Exchange(value = ExchangeTypes.DIRECT)) 37 exchange = @Exchange(value = ExchangeTypes.DIRECT))
38 }, containerFactory = "managementRabbitListenerContainerFactory")*/ 38 }, containerFactory = "serviceRabbitListenerContainerFactory")*/
39 public void ucEventConsumer(String content) { 39 public void ucEventConsumer(String content) {
40 log.info(" receive dataSync msg , content is : {} ", content); 40 log.info(" receive dataSync msg , content is : {} ", content);
41 TableOperationMsg tableOperationMsg = this.parseContent(content); 41 TableOperationMsg tableOperationMsg = this.parseContent(content);
......
...@@ -100,6 +100,9 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -100,6 +100,9 @@ public class UcEventBusIptv2ManagementUcEngine {
100 dataSyncMsg.setEventType(evt); 100 dataSyncMsg.setEventType(evt);
101 DataSyncMsg.MsgData msgData1 = new DataSyncMsg.MsgData(); 101 DataSyncMsg.MsgData msgData1 = new DataSyncMsg.MsgData();
102 102
103
104 Integer playDurationValueTotal = 0;
105
103 if (StringUtils.isNotBlank(platformAccount)) { 106 if (StringUtils.isNotBlank(platformAccount)) {
104 107
105 UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount); 108 UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
...@@ -110,17 +113,17 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -110,17 +113,17 @@ public class UcEventBusIptv2ManagementUcEngine {
110 Map<Object, Object> hmget = 113 Map<Object, Object> hmget =
111 this.redisUtils.hmget(key); 114 this.redisUtils.hmget(key);
112 115
113 Integer playDurationValueTotal = 0;
114 int maxSize = 1; 116 int maxSize = 1;
115 if (MapUtils.isNotEmpty(hmget)) { 117 if (MapUtils.isNotEmpty(hmget)) {
118
116 Set<Object> objects = hmget.keySet(); 119 Set<Object> objects = hmget.keySet();
117 for (Object key_ : objects) {
118 120
119 if (Objects.nonNull(key_)) { 121 Integer playDurationValueTotal_ = 0;
122 for (Object key_ : objects) {
120 123
121 if (key_.toString().equalsIgnoreCase("total")) { 124 if (key_.toString().equalsIgnoreCase("total")) {
122 Integer playDurationValueTotal_ = Integer.valueOf(hmget.get(key_).toString()); 125 playDurationValueTotal_ = Integer.valueOf(hmget.get(key_).toString());
123 if (playDurationValueTotal_ >= 30) { 126 if (playDurationValueTotal_ > 1440) {
124 maxSize = objects.size(); 127 maxSize = objects.size();
125 Integer maxTotal = maxSize+1; 128 Integer maxTotal = maxSize+1;
126 Integer playDurationValue = Integer.valueOf(hmget.get(key_).toString()); 129 Integer playDurationValue = Integer.valueOf(hmget.get(key_).toString());
...@@ -133,21 +136,20 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -133,21 +136,20 @@ public class UcEventBusIptv2ManagementUcEngine {
133 } 136 }
134 } 137 }
135 138
139 }
140
136 maxSize = objects.size(); 141 maxSize = objects.size();
137 142
138 Integer playDurationValue = Integer.valueOf(hmget.get("total").toString()); 143 playDurationValueTotal = playDurationValueTotal_ + playDuration;
139 playDurationValueTotal = playDurationValue+playDuration;
140 144
141 Map<String, Object> map = new HashMap<>(); 145 Map<String, Object> map = new HashMap<>();
142 map.put(String.valueOf(maxSize+1), playDuration); 146 map.put(String.valueOf(maxSize+1), playDuration);
143 map.put("total", playDurationValueTotal); 147 map.put("total", playDurationValueTotal);
144 this.redisUtils.hmset(key, map, 172800); 148 this.redisUtils.hmset(key, map, 172800);
145 149
146 }
147
148 }
149 150
150 } else { 151 } else {
152
151 playDurationValueTotal = playDuration; 153 playDurationValueTotal = playDuration;
152 Map<String, Object> map = new HashMap<>(); 154 Map<String, Object> map = new HashMap<>();
153 map.put("total", playDurationValueTotal); 155 map.put("total", playDurationValueTotal);
...@@ -157,13 +159,45 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -157,13 +159,45 @@ public class UcEventBusIptv2ManagementUcEngine {
157 } 159 }
158 160
159 DataSyncMsg dataSyncMsg1 = null; 161 DataSyncMsg dataSyncMsg1 = null;
160 if (playDurationValueTotal >= PLAY_30) { 162 if (playDurationValueTotal > 0 && playDurationValueTotal <= PLAY_30) {
163 log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
164 log.info("===>> start dealTask");
165 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
166 dataSyncMsg, msgData1, userTvDTO);
167 }
168
169 if (playDurationValueTotal >= 31 && playDurationValueTotal <= 60) {
161 log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal); 170 log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
162 log.info("===>> start dealTask"); 171 log.info("===>> start dealTask");
163 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDuration, 172
173 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, 30,
174 dataSyncMsg, msgData1, userTvDTO);
175 this.taskDeal(dataSyncMsg1);
176
177 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
164 dataSyncMsg, msgData1, userTvDTO); 178 dataSyncMsg, msgData1, userTvDTO);
179
165 } 180 }
181 if (playDurationValueTotal >= 61 && playDurationValueTotal <= 1440) {
182 log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
183 log.info("===>> start dealTask");
166 184
185 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, 30,
186 dataSyncMsg, msgData1, userTvDTO);
187 this.taskDeal(dataSyncMsg1);
188
189 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, 60,
190 dataSyncMsg, msgData1, userTvDTO);
191 this.taskDeal(dataSyncMsg1);
192
193 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
194 dataSyncMsg, msgData1, userTvDTO);
195 }
196
197 log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
198 log.info("===>> start dealTask");
199 /*dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
200 dataSyncMsg, msgData1, userTvDTO);*/
167 return dataSyncMsg1; 201 return dataSyncMsg1;
168 202
169 } 203 }
...@@ -180,7 +214,8 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -180,7 +214,8 @@ public class UcEventBusIptv2ManagementUcEngine {
180 return null; 214 return null;
181 } 215 }
182 216
183 private DataSyncMsg getDataSyncMsg(String time, Integer deviceType, String mediaCode, Long mediaId, String mediaName, Integer playDuration, DataSyncMsg dataSyncMsg, DataSyncMsg.MsgData msgData1, UserTvDTO userTvDTO) { 217 private DataSyncMsg getDataSyncMsg(String time, Integer deviceType, String mediaCode, Long mediaId, String mediaName,
218 Integer playDuration, DataSyncMsg dataSyncMsg, DataSyncMsg.MsgData msgData1, UserTvDTO userTvDTO) {
184 String priorityMemberCode = userTvDTO.getPriorityMemberCode(); 219 String priorityMemberCode = userTvDTO.getPriorityMemberCode();
185 log.info("priorityMemberCode ==>> {}", priorityMemberCode); 220 log.info("priorityMemberCode ==>> {}", priorityMemberCode);
186 String memberCode = ""; 221 String memberCode = "";
......