Skip to content

张云鹏 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit cf39040a cf39040a6963cd0af5994d4887a748c7bb8b64c4 by xianghan
Options

1.update

1 parent cb36cfdf
Inline Side-by-side
Showing 5 changed files with 51 additions and 23 deletions
...@@ -17,9 +17,9 @@ public interface TaskTemplateRepository extends JpaRepository<TaskTemplate, Long ...@@ -17,9 +17,9 @@ public interface TaskTemplateRepository extends JpaRepository<TaskTemplate, Long
17 17
18 Optional<TaskTemplate> findFirstByCode(String code); 18 Optional<TaskTemplate> findFirstByCode(String code);
19 19
20 TaskTemplate findByEvent(String event); 20 Optional<TaskTemplate> findByEvent(String event);
21 21
22 TaskTemplate findByType(Integer event); 22 Optional<TaskTemplate> findByType(Integer event);
23 23
24 @Modifying 24 @Modifying
25 @Transactional 25 @Transactional
......
...@@ -72,11 +72,13 @@ public class TaskTemplateServiceImpl implements TaskTemplateService { ...@@ -72,11 +72,13 @@ public class TaskTemplateServiceImpl implements TaskTemplateService {
72 72
73 @Override 73 @Override
74 public TaskTemplateDTO findByEvent(String event) { 74 public TaskTemplateDTO findByEvent(String event) {
75 return StringUtils.isNotEmpty(event) ? this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByEvent(event)) : null; 75 return StringUtils.isNotEmpty(event) ?
76 this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByEvent(event).orElseGet(TaskTemplate::new)) : null;
76 } 77 }
77 78
78 @Override 79 @Override
79 public TaskTemplateDTO findByType(Integer event) { 80 public TaskTemplateDTO findByType(Integer event) {
80 return Objects.nonNull(event) ? this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByType(event)) : null; 81 return Objects.nonNull(event) ?
82 this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByType(event).orElseGet(TaskTemplate::new)) : null;
81 } 83 }
82 } 84 }
......
...@@ -36,6 +36,16 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -36,6 +36,16 @@ public class MemberOperationServiceImpl implements MemberOperationService {
36 @Autowired 36 @Autowired
37 private ThreadPoolTaskExecutor threadPoolTaskExecutor; 37 private ThreadPoolTaskExecutor threadPoolTaskExecutor;
38 38
39 public void asyncUpdateMemberVip(MemberDTO memberDTO) {
40 String code = memberDTO.getCode();
41 MemberDTO memberDTO1 = this.findByCode(code);
42 memberDTO1.setVip(memberDTO.getVip());
43 memberDTO1.setVipExpireTime(memberDTO.getVipExpireTime());
44 Member member = new Member();
45 BeanUtils.copyProperties(memberDTO1, member);
46 this.update(member);
47 }
48
39 // @Cacheable(key = "#memberId") 49 // @Cacheable(key = "#memberId")
40 @Override 50 @Override
41 public MemberDTO findById(Long memberId) { 51 public MemberDTO findById(Long memberId) {
...@@ -76,6 +86,7 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -76,6 +86,7 @@ public class MemberOperationServiceImpl implements MemberOperationService {
76 86
77 @Override 87 @Override
78 public MemberDTO doUpdateMemberExp(Member member) { 88 public MemberDTO doUpdateMemberExp(Member member) {
89
79 return this.update(member); 90 return this.update(member);
80 } 91 }
81 92
......
...@@ -19,6 +19,7 @@ import com.topdraw.resttemplate.RestTemplateClient; ...@@ -19,6 +19,7 @@ import com.topdraw.resttemplate.RestTemplateClient;
19 import com.topdraw.util.DateUtil; 19 import com.topdraw.util.DateUtil;
20 import com.topdraw.util.FileUtil; 20 import com.topdraw.util.FileUtil;
21 import com.topdraw.util.JSONUtil; 21 import com.topdraw.util.JSONUtil;
22 import com.topdraw.util.TimestampUtil;
22 import com.topdraw.utils.RedisUtils; 23 import com.topdraw.utils.RedisUtils;
23 import lombok.Data; 24 import lombok.Data;
24 import lombok.extern.slf4j.Slf4j; 25 import lombok.extern.slf4j.Slf4j;
...@@ -117,7 +118,7 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -117,7 +118,7 @@ public class UcEventBusIptv2ManagementUcEngine {
117 case "PLAY": 118 case "PLAY":
118 PlayContent playContent = JSONUtil.parseMsg2Object(content, PlayContent.class); 119 PlayContent playContent = JSONUtil.parseMsg2Object(content, PlayContent.class);
119 120
120 PlayContent.MsgData msgData = playContent.getMsg(); 121 PlayContent.MsgData msgData = playContent.getMsgData();
121 if (Objects.nonNull(msgData)) { 122 if (Objects.nonNull(msgData)) {
122 String time = playContent.getTime(); 123 String time = playContent.getTime();
123 String formatDate = DateUtil.formatDate(time); 124 String formatDate = DateUtil.formatDate(time);
...@@ -168,13 +169,14 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -168,13 +169,14 @@ public class UcEventBusIptv2ManagementUcEngine {
168 Integer totalKey = this.getRedisTotalKey(hmget); 169 Integer totalKey = this.getRedisTotalKey(hmget);
169 Integer maxSize = totalKey + 1; 170 Integer maxSize = totalKey + 1;
170 171
171 this.checkTask(playDurationValueTotal, time, deviceType,
172 mediaCode, mediaId, mediaName, dataSyncMsg, msg, userTvDTO);
173
174 Map<String, Object> map = new HashMap<>(); 172 Map<String, Object> map = new HashMap<>();
175 map.put(String.valueOf(maxSize), playDuration); 173 map.put(String.valueOf(maxSize), playDuration);
176 map.put("total", playDurationValueTotal); 174 map.put("total", playDurationValueTotal);
177 this.redisUtils.hmset(key, map); 175 this.redisUtils.hmset(key, map);
176
177 this.checkTask(playDurationValueTotal, time, deviceType,
178 mediaCode, mediaId, mediaName, dataSyncMsg, msg, userTvDTO);
179
178 } 180 }
179 181
180 } 182 }
...@@ -192,16 +194,28 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -192,16 +194,28 @@ public class UcEventBusIptv2ManagementUcEngine {
192 Long mediaId, String mediaName, DataSyncMsg dataSyncMsg, 194 Long mediaId, String mediaName, DataSyncMsg dataSyncMsg,
193 DataSyncMsg.MsgData msgData, UserTvDTO userTvDTO) { 195 DataSyncMsg.MsgData msgData, UserTvDTO userTvDTO) {
194 196
197 // 检查播放记录任务
195 List<TaskAttrDTO> taskAttrDTOList = new ArrayList<>(); 198 List<TaskAttrDTO> taskAttrDTOList = new ArrayList<>();
196 TaskTemplateDTO taskTemplateDTO = this.taskTemplateService.findByType(8); 199 TaskTemplateDTO taskTemplateDTO = this.taskTemplateService.findByType(8);
197 if (Objects.nonNull(taskTemplateDTO.getId())) { 200 if (Objects.nonNull(taskTemplateDTO.getId())) {
198 List<Task> taskList = this.taskService.findByTemplateId(taskTemplateDTO.getId()); 201 List<Task> taskList = this.taskService.findByTemplateId(taskTemplateDTO.getId());
199 if (CollectionUtils.isNotEmpty(taskList)) { 202 if (CollectionUtils.isNotEmpty(taskList)) {
203
200 for (Task task : taskList) { 204 for (Task task : taskList) {
201 TaskAttrDTO taskAttrDTO = this.taskAttrService.findByTaskId(task.getId()); 205 TaskAttrDTO taskAttrDTO = this.taskAttrService.findByTaskId(task.getId());
202 taskAttrDTOList.add(taskAttrDTO); 206 taskAttrDTOList.add(taskAttrDTO);
203 } 207 }
208
209 } else {
210
211 return null;
212
204 } 213 }
214
215 } else {
216
217 return null;
218
205 } 219 }
206 220
207 List<List<Integer>> attrList = new ArrayList<>(); 221 List<List<Integer>> attrList = new ArrayList<>();
...@@ -219,6 +233,10 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -219,6 +233,10 @@ public class UcEventBusIptv2ManagementUcEngine {
219 233
220 } 234 }
221 235
236 } else {
237
238 return null;
239
222 } 240 }
223 241
224 int size = attrList.size(); 242 int size = attrList.size();
...@@ -232,12 +250,12 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -232,12 +250,12 @@ public class UcEventBusIptv2ManagementUcEngine {
232 Integer integer = attrList.get(i).get(0); 250 Integer integer = attrList.get(i).get(0);
233 251
234 if (playDurationValueTotal >= integer) { 252 if (playDurationValueTotal >= integer) {
235 dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, integer, dataSyncMsg, 253 dataSyncMsg1 = getDataSyncMsg(time, mediaCode, mediaId, mediaName, integer, dataSyncMsg,
236 msgData, userTvDTO); 254 msgData, userTvDTO);
237 dataSyncMsg1.setEvt("PLAY"); 255 dataSyncMsg1.setEvt("PLAY");
238 dataSyncMsg1.setEvent(8); 256 dataSyncMsg1.setEvent(8);
239 dataSyncMsg1.setTime(LocalDateTime.now()); 257 dataSyncMsg1.setTime(LocalDateTime.now());
240 dataSyncMsg1.setDeviceType(1); 258 dataSyncMsg1.setDeviceType(deviceType);
241 this.taskDeal(dataSyncMsg1); 259 this.taskDeal(dataSyncMsg1);
242 } 260 }
243 261
...@@ -276,10 +294,9 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -276,10 +294,9 @@ public class UcEventBusIptv2ManagementUcEngine {
276 294
277 } 295 }
278 296
279 private DataSyncMsg getDataSyncMsg(String time, Integer deviceType, String mediaCode, Long mediaId, String mediaName, 297 private DataSyncMsg getDataSyncMsg(String time, String mediaCode, Long mediaId, String mediaName,
280 Integer playDuration, DataSyncMsg dataSyncMsg, DataSyncMsg.MsgData msgData1, UserTvDTO userTvDTO) { 298 Integer playDuration, DataSyncMsg dataSyncMsg, DataSyncMsg.MsgData msgData1, UserTvDTO userTvDTO) {
281 String priorityMemberCode = userTvDTO.getPriorityMemberCode(); 299 String priorityMemberCode = userTvDTO.getPriorityMemberCode();
282 log.info("priorityMemberCode ==>> {}", priorityMemberCode);
283 String memberCode = ""; 300 String memberCode = "";
284 if (StringUtils.isNotBlank(priorityMemberCode)) { 301 if (StringUtils.isNotBlank(priorityMemberCode)) {
285 memberCode = priorityMemberCode; 302 memberCode = priorityMemberCode;
...@@ -287,14 +304,11 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -287,14 +304,11 @@ public class UcEventBusIptv2ManagementUcEngine {
287 memberCode = this.memberService.findById(userTvDTO.getMemberId()).getCode(); 304 memberCode = this.memberService.findById(userTvDTO.getMemberId()).getCode();
288 } 305 }
289 306
290 log.info("memberCode ==>> {}", priorityMemberCode);
291 if (StringUtils.isBlank(memberCode)) 307 if (StringUtils.isBlank(memberCode))
292 throw new EntityNotFoundException(MemberDTO.class, "memberCode", "memberCode is null"); 308 throw new EntityNotFoundException(MemberDTO.class, "memberCode", "memberCode is null");
293 309
294 msgData1.setMemberCode(memberCode); 310 msgData1.setMemberCode(memberCode);
295 311
296 // msgData1.setEvent(8);
297 // msgData1.setDeviceType(deviceType);
298 msgData1.setMediaId(mediaId); 312 msgData1.setMediaId(mediaId);
299 313
300 JSONObject param = new JSONObject(); 314 JSONObject param = new JSONObject();
...@@ -309,7 +323,6 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -309,7 +323,6 @@ public class UcEventBusIptv2ManagementUcEngine {
309 description.put("time", time); 323 description.put("time", time);
310 msgData1.setDescription(JSON.toJSONString(description)); 324 msgData1.setDescription(JSON.toJSONString(description));
311 dataSyncMsg.setMsg(msgData1); 325 dataSyncMsg.setMsg(msgData1);
312 log.info("dataSyncMsg ==>> {}", dataSyncMsg);
313 return dataSyncMsg; 326 return dataSyncMsg;
314 } 327 }
315 328
...@@ -327,7 +340,7 @@ public class UcEventBusIptv2ManagementUcEngine { ...@@ -327,7 +340,7 @@ public class UcEventBusIptv2ManagementUcEngine {
327 private Integer event; 340 private Integer event;
328 private Integer deviceType; 341 private Integer deviceType;
329 private String time; 342 private String time;
330 private MsgData msg; 343 private MsgData msgData;
331 344
332 @Data 345 @Data
333 static class MsgData { 346 static class MsgData {
......
1 spring: 1 spring:
2 # 数据源 2 # 数据源
3 datasource: 3 datasource:
4 # url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_iptv?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false 4 url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_iptv?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
5 # username: root
6 # password: root
7 url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs_iptv_sichuan?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
8 username: root 5 username: root
9 password: Tjlh@2021 6 password: root
7 # url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs_iptv_sichuan?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
8 # username: root
9 # password: Tjlh@2021
10 # 驱动程序 10 # 驱动程序
11 driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 11 driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
12 # Druid 12 # Druid
...@@ -78,7 +78,8 @@ mutil-mq: ...@@ -78,7 +78,8 @@ mutil-mq:
78 password: guest 78 password: guest
79 # password: Topdraw1qaz 79 # password: Topdraw1qaz
80 # 虚拟空间 80 # 虚拟空间
81 virtual-host: member_center_iptv_sichuan 81 # virtual-host: member_center_iptv_sichuan
82 virtual-host: member_center_iptv_chongshu
82 publisher-confirms: true #如果对异步消息需要回调必须设置为true 83 publisher-confirms: true #如果对异步消息需要回调必须设置为true
83 84
84 # 管理侧 85 # 管理侧
...@@ -87,6 +88,7 @@ mutil-mq: ...@@ -87,6 +88,7 @@ mutil-mq:
87 host: 122.112.214.149 # rabbitmq的连接地址 88 host: 122.112.214.149 # rabbitmq的连接地址
88 port: 5672 # rabbitmq的连接端口号 89 port: 5672 # rabbitmq的连接端口号
89 virtual-host: member_center_small_sichuan # rabbitmq的虚拟host 90 virtual-host: member_center_small_sichuan # rabbitmq的虚拟host
91 # virtual-host: member_center_small_chongshu # rabbitmq的虚拟host
90 username: guest # rabbitmq的用户名 92 username: guest # rabbitmq的用户名
91 password: guest # rabbitmq的密码 93 password: guest # rabbitmq的密码
92 # username: admin # rabbitmq的用户名 94 # username: admin # rabbitmq的用户名
......