1.update

@@ -17,9 +17,9 @@ public interface TaskTemplateRepository extends JpaRepository<TaskTemplate, Long
 
     Optional<TaskTemplate> findFirstByCode(String code);
 
-    TaskTemplate findByEvent(String event);
+    Optional<TaskTemplate> findByEvent(String event);
 
-    TaskTemplate findByType(Integer event);
+    Optional<TaskTemplate> findByType(Integer event);
 
     @Modifying
     @Transactional

@@ -72,11 +72,13 @@ public class TaskTemplateServiceImpl implements TaskTemplateService {
 
     @Override
     public TaskTemplateDTO findByEvent(String event) {
-        return StringUtils.isNotEmpty(event) ? this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByEvent(event)) : null;
+        return StringUtils.isNotEmpty(event) ?
+                this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByEvent(event).orElseGet(TaskTemplate::new)) : null;
     }
 
     @Override
     public TaskTemplateDTO findByType(Integer event) {
-        return Objects.nonNull(event) ? this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByType(event)) : null;
+        return Objects.nonNull(event) ?
+                this.taskTemplateMapper.toDto(this.taskTemplateRepository.findByType(event).orElseGet(TaskTemplate::new)) : null;
     }
 }

@@ -36,6 +36,16 @@ public class MemberOperationServiceImpl implements MemberOperationService {
     @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
+    public void asyncUpdateMemberVip(MemberDTO memberDTO) {
+        String code = memberDTO.getCode();
+        MemberDTO memberDTO1 = this.findByCode(code);
+        memberDTO1.setVip(memberDTO.getVip());
+        memberDTO1.setVipExpireTime(memberDTO.getVipExpireTime());
+        Member member = new Member();
+        BeanUtils.copyProperties(memberDTO1, member);
+        this.update(member);
+    }
+
     //    @Cacheable(key = "#memberId")
     @Override
     public MemberDTO findById(Long memberId) {
@@ -76,6 +86,7 @@ public class MemberOperationServiceImpl implements MemberOperationService {
 
     @Override
     public MemberDTO doUpdateMemberExp(Member member) {
+
         return this.update(member);
     }
 

@@ -19,6 +19,7 @@ import com.topdraw.resttemplate.RestTemplateClient;
 import com.topdraw.util.DateUtil;
 import com.topdraw.util.FileUtil;
 import com.topdraw.util.JSONUtil;
+import com.topdraw.util.TimestampUtil;
 import com.topdraw.utils.RedisUtils;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -117,7 +118,7 @@ public class UcEventBusIptv2ManagementUcEngine {
             case "PLAY":
                 PlayContent playContent = JSONUtil.parseMsg2Object(content, PlayContent.class);
 
-                PlayContent.MsgData msgData = playContent.getMsg();
+                PlayContent.MsgData msgData = playContent.getMsgData();
                 if (Objects.nonNull(msgData)) {
                     String time = playContent.getTime();
                     String formatDate = DateUtil.formatDate(time);
@@ -168,13 +169,14 @@ public class UcEventBusIptv2ManagementUcEngine {
                             Integer totalKey = this.getRedisTotalKey(hmget);
                             Integer maxSize = totalKey + 1;
 
-                            this.checkTask(playDurationValueTotal, time, deviceType,
-                            mediaCode, mediaId, mediaName, dataSyncMsg, msg, userTvDTO);
-
                             Map<String, Object> map = new HashMap<>();
                             map.put(String.valueOf(maxSize), playDuration);
                             map.put("total", playDurationValueTotal);
                             this.redisUtils.hmset(key, map);
+
+                            this.checkTask(playDurationValueTotal, time, deviceType,
+                            mediaCode, mediaId, mediaName, dataSyncMsg, msg, userTvDTO);
+
                         }
 
                     }
@@ -192,16 +194,28 @@ public class UcEventBusIptv2ManagementUcEngine {
                                   Long mediaId, String mediaName, DataSyncMsg dataSyncMsg,
                                   DataSyncMsg.MsgData msgData, UserTvDTO userTvDTO) {
 
+        // 检查播放记录任务
         List<TaskAttrDTO> taskAttrDTOList = new ArrayList<>();
         TaskTemplateDTO taskTemplateDTO = this.taskTemplateService.findByType(8);
         if (Objects.nonNull(taskTemplateDTO.getId())) {
             List<Task> taskList = this.taskService.findByTemplateId(taskTemplateDTO.getId());
             if (CollectionUtils.isNotEmpty(taskList)) {
+
                 for (Task task : taskList) {
                     TaskAttrDTO taskAttrDTO = this.taskAttrService.findByTaskId(task.getId());
                     taskAttrDTOList.add(taskAttrDTO);
                 }
+
+            } else {
+
+                return null;
+
             }
+
+        } else {
+
+            return null;
+
         }
 
         List<List<Integer>> attrList = new ArrayList<>();
@@ -219,6 +233,10 @@ public class UcEventBusIptv2ManagementUcEngine {
 
             }
 
+        } else {
+
+            return null;
+
         }
 
         int size = attrList.size();
@@ -232,12 +250,12 @@ public class UcEventBusIptv2ManagementUcEngine {
                 Integer integer = attrList.get(i).get(0);
 
                 if (playDurationValueTotal >= integer) {
-                    dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, integer, dataSyncMsg,
+                    dataSyncMsg1 = getDataSyncMsg(time, mediaCode, mediaId, mediaName, integer, dataSyncMsg,
                             msgData, userTvDTO);
                     dataSyncMsg1.setEvt("PLAY");
                     dataSyncMsg1.setEvent(8);
                     dataSyncMsg1.setTime(LocalDateTime.now());
-                    dataSyncMsg1.setDeviceType(1);
+                    dataSyncMsg1.setDeviceType(deviceType);
                     this.taskDeal(dataSyncMsg1);
                 }
 
@@ -276,10 +294,9 @@ public class UcEventBusIptv2ManagementUcEngine {
 
     }
 
-    private DataSyncMsg getDataSyncMsg(String time, Integer deviceType, String mediaCode, Long mediaId, String mediaName,
+    private DataSyncMsg getDataSyncMsg(String time, String mediaCode, Long mediaId, String mediaName,
                                        Integer playDuration, DataSyncMsg dataSyncMsg, DataSyncMsg.MsgData msgData1, UserTvDTO userTvDTO) {
         String priorityMemberCode = userTvDTO.getPriorityMemberCode();
-        log.info("priorityMemberCode ==>> {}", priorityMemberCode);
         String memberCode = "";
         if (StringUtils.isNotBlank(priorityMemberCode)) {
             memberCode = priorityMemberCode;
@@ -287,14 +304,11 @@ public class UcEventBusIptv2ManagementUcEngine {
             memberCode = this.memberService.findById(userTvDTO.getMemberId()).getCode();
         }
 
-        log.info("memberCode ==>> {}", priorityMemberCode);
         if (StringUtils.isBlank(memberCode))
             throw new EntityNotFoundException(MemberDTO.class, "memberCode", "memberCode is null");
 
         msgData1.setMemberCode(memberCode);
 
-//        msgData1.setEvent(8);
-//        msgData1.setDeviceType(deviceType);
         msgData1.setMediaId(mediaId);
 
         JSONObject param = new JSONObject();
@@ -309,7 +323,6 @@ public class UcEventBusIptv2ManagementUcEngine {
         description.put("time", time);
         msgData1.setDescription(JSON.toJSONString(description));
         dataSyncMsg.setMsg(msgData1);
-        log.info("dataSyncMsg ==>> {}", dataSyncMsg);
         return dataSyncMsg;
     }
 
@@ -327,7 +340,7 @@ public class UcEventBusIptv2ManagementUcEngine {
         private Integer event;
         private Integer deviceType;
         private String time;
-        private MsgData msg;
+        private MsgData msgData;
 
         @Data
         static class MsgData {

 spring:
   # 数据源
   datasource:
-#    url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_iptv?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-#    username: root
-#    password: root
-    url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs_iptv_sichuan?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+    url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user_iptv?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
     username: root
-    password: Tjlh@2021
+    password: root
+#    url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs_iptv_sichuan?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+#    username: root
+#    password: Tjlh@2021
     # 驱动程序
     driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
     # Druid
@@ -78,7 +78,8 @@ mutil-mq:
     password: guest
 #    password: Topdraw1qaz
     # 虚拟空间
-    virtual-host: member_center_iptv_sichuan
+#    virtual-host: member_center_iptv_sichuan
+    virtual-host: member_center_iptv_chongshu
     publisher-confirms: true #如果对异步消息需要回调必须设置为true
 
   # 管理侧
@@ -87,6 +88,7 @@ mutil-mq:
     host: 122.112.214.149 # rabbitmq的连接地址
     port: 5672 # rabbitmq的连接端口号
     virtual-host: member_center_small_sichuan # rabbitmq的虚拟host
+#    virtual-host: member_center_small_chongshu # rabbitmq的虚拟host
     username: guest # rabbitmq的用户名
     password: guest # rabbitmq的密码
 #    username: admin # rabbitmq的用户名