1.优化

@@ -21,6 +21,8 @@ public enum EventType {
     CONSUME_POINT,
     // 观影
     VIEWING,
+    // 播放记录
+    PLAY,
     // 登录
     LOGIN,
     // 订购产品包

@@ -68,7 +68,7 @@ public class MemberAddressServiceImpl implements MemberAddressService {
         log.info("MemberAddressServiceImpl ==>> update ==>> param ==>> [{}]",resources);
         Assert.notNull(resources.getId(),"id can't be null");
         try {
-            this.redisUtils.doLock("MemberAddress::id" + resources.getId());
+            this.redisUtils.doLock("memberAddress::memberId::" + resources.getMemberId());
 
             MemberAddress _memberAddress = this.memberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new);
             ValidationUtil.isNull( _memberAddress.getId(),"MemberAddress","id",resources.getId());
@@ -87,7 +87,7 @@ public class MemberAddressServiceImpl implements MemberAddressService {
             e.printStackTrace();
             throw e;
         } finally {
-            this.redisUtils.doUnLock("MemberAddress::update::code" + resources.getId());
+            this.redisUtils.doUnLock("memberAddress::memberId::" + resources.getMemberId());
         }
     }
 

@@ -12,6 +12,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 /**
@@ -123,12 +124,12 @@ public class Member implements Serializable {
     /** 创建时间 */
     @CreatedDate
     @Column(name = "create_time")
-    private LocalDateTime createTime;
+    private Timestamp createTime;
 
     /** 更新时间 */
     @LastModifiedDate
     @Column(name = "update_time")
-    private LocalDateTime updateTime;
+    private Timestamp updateTime;
 
     /** 是否在黑名单 1：是；0否 */
     @Column(name = "black_status")

@@ -110,7 +110,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
     public MemberProfileDTO update(MemberProfile resources) {
 
         log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
-        this.redisUtils.doLock("memberProfile::update::memberId" + resources.getMemberId());
+        this.redisUtils.doLock("memberProfile::memberId::" + resources.getMemberId());
         try {
 
             MemberProfileDTO _memberProfileDTO1 = this.findById(resources.getId());
@@ -141,7 +141,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
             e.printStackTrace();
             throw e;
         } finally {
-            this.redisUtils.doUnLock("memberProfile::update::id" + resources.getId());
+            this.redisUtils.doUnLock("memberProfile::memberId::" + resources.getId());
         }
 
     }

@@ -3,6 +3,7 @@ package com.topdraw.business.module.member.service.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 
@@ -85,10 +86,10 @@ public class BasicMemberDTO implements Serializable {
     private LocalDateTime bindIptvTime;
 
     /** 创建时间 */
-    private LocalDateTime createTime;
+    private Timestamp createTime;
 
     /** 更新时间 */
-    private LocalDateTime updateTime;
+    private Timestamp updateTime;
 
     /** 是否在黑名单   1：是；0否 */
     private Long blackStatus;

@@ -86,10 +86,10 @@ public class MemberDTO implements Serializable {
     private LocalDateTime bindIptvTime;
 
     /** 创建时间 */
-    private LocalDateTime createTime;
+    private Timestamp createTime;
 
     /** 更新时间 */
-    private LocalDateTime updateTime;
+    private Timestamp updateTime;
 
     /** 是否在黑名单   1：是；0否 */
     private Long blackStatus;

@@ -148,7 +148,7 @@ public class MemberServiceImpl implements MemberService {
     public MemberDTO update(Member resources) {
 
         log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources);
-        this.redisUtils.doLock("member::update::code" + resources.getCode());
+        this.redisUtils.doLock("member::code" + resources.getCode());
         try {
             MemberDTO memberDTO = this.checkMember(resources);
 
@@ -164,7 +164,7 @@ public class MemberServiceImpl implements MemberService {
             e.printStackTrace();
             throw e;
         } finally {
-            this.redisUtils.doUnLock("member::update::code" + resources.getCode());
+            this.redisUtils.doUnLock("member::code" + resources.getCode());
         }
 
     }

@@ -11,6 +11,7 @@ import com.topdraw.business.process.service.CouponOperationService;
 import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.business.process.domian.TempCoupon;
 import com.topdraw.business.process.service.RightsOperationService;
+import com.topdraw.util.TimestampUtil;
 import com.topdraw.utils.RedisUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -129,7 +130,7 @@ public class CouponOperationServiceImpl implements CouponOperationService {
 
         member.setCouponAmount(currentCoupon);
         member.setDueCouponAmount(expireSoonCouponCount);
-        member.setUpdateTime(LocalDateTime.now());
+        member.setUpdateTime(TimestampUtil.now());
         this.memberOperationService.doUpdateMember(member);
     }
 

@@ -12,6 +12,7 @@ import com.topdraw.business.process.service.ExpOperationService;
 import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.business.process.domian.TempExp;
 import com.topdraw.util.IdWorker;
+import com.topdraw.util.TimestampUtil;
 import com.topdraw.utils.RedisUtils;
 import com.topdraw.utils.StringUtils;
 import org.slf4j.Logger;
@@ -149,7 +150,7 @@ public class ExpOperationServiceImpl implements ExpOperationService {
 
         member.setExp(totalExp);
         member.setLevel(level);
-        member.setUpdateTime(LocalDateTime.now());
+        member.setUpdateTime(TimestampUtil.now());
         this.memberOperationService.doUpdateMember(member);
     }
 

@@ -488,7 +488,7 @@ public class PointsOperationServiceImpl implements PointsOperationService {
 
         member.setPoints(Objects.nonNull(currentPoints)?currentPoints:0);
         member.setDuePoints(duePoints);
-        member.setUpdateTime(LocalDateTime.now());
+        member.setUpdateTime(TimestampUtil.now());
         try {
             this.memberOperationService.doUpdateMemberPoints(member);
         } catch (Exception e){

 package com.topdraw.business.process.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.topdraw.business.module.coupon.service.CouponService;
@@ -31,9 +32,11 @@ import com.topdraw.business.module.task.template.domain.TaskTemplate;
 import com.topdraw.business.module.task.template.service.TaskTemplateService;
 import com.topdraw.business.process.domian.*;
 import com.topdraw.business.process.service.UserOperationService;
+import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.exception.BadRequestException;
 import com.topdraw.module.mq.DataSyncMsg;
+import com.topdraw.module.mq.EventType;
 import com.topdraw.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -92,6 +95,36 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     private static final Integer POINTS_TYPE_RANDOM = 1;
     private static final Integer POINTS_MIN = 1;
 
+
+    public static void main(String[] args) {
+        /*String s = "{\\\"eventType\\\":\\\"PLAY\\\",\\\"msg\\\":{\\\"description\\\":\\\"{\\\\\\\"playDuration\\\\\\\":60,\\\\\\\"time\\\\\\\":\\\\\\\"2022-04-01 00:10:09\\\\\\\",\\\\\\\"mediaId\\\\\\\":3433,\\\\\\\"mediaCode\\\\\\\":\\\\\\\"media_123\\\\\\\",\\\\\\\"mediaName\\\\\\\":\\\\\\\"白宫陷落\\\\\\\"}\\\",\\\"deviceType\\\":1,\\\"event\\\":8,\\\"memberCode\\\":\\\"1511275342935937024\\\",\\\"param\\\":\\\"{\\\\\\\"playDuration\\\\\\\":60}\\\"}}";
+        TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria();
+        pointsQueryCriteria.setContent(s);
+        String s1 = JSON.toJSONString(pointsQueryCriteria);
+        DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(s1, DataSyncMsg.class);
+        System.out.println(dataSyncMsg);*/
+
+        DataSyncMsg dataSyncMsg = new DataSyncMsg();
+        dataSyncMsg.setEventType(EventType.PLAY.name());
+        DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
+        msgData.setEvent(8); // 类型 1-登录  2-观影  3-参加活动  4-订购  5-优享会员  6-签到
+        msgData.setMemberCode("1511275342935937024");
+        // 1：大屏；2：小屏（微信）3.小屏（xx）
+        msgData.setDeviceType(1);
+        String param = "{\"playDuration\":60}";
+        msgData.setParam(param);
+        String des = "{\"playDuration\":60,\"time\":\"2022-04-01 00:10:09\",\"mediaId\":3433,\"mediaCode\":\"media_123\",\"mediaName\":\"白宫陷落\"}";
+        msgData.setDescription(des);
+        dataSyncMsg.setMsg(msgData);
+        String a = JSON.toJSONString(dataSyncMsg);
+        TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria();
+        pointsQueryCriteria.setContent(a);
+        String s1 = JSON.toJSONString(pointsQueryCriteria);
+        System.out.println(s1);
+        DataSyncMsg dataSyncMsg1 = JSONUtil.parseMsg2Object(s1, DataSyncMsg.class);
+        System.out.println(dataSyncMsg1);
+    }
+
     @Override
     public ResultInfo dealTask(String content) {
 

@@ -1010,7 +1010,7 @@ public class UserOperationServiceImpl implements UserOperationService {
     private MemberDTO doUpdateMemberByMemberDTO(MemberDTO memberDTO){
         Member member = new Member();
         BeanUtils.copyProperties(memberDTO,member);
-        member.setUpdateTime(LocalDateTime.now());
+        member.setUpdateTime(TimestampUtil.now());
         log.info("doUpdateMemberByMemberDTO=====?>>member ==>> [{}]",member);
         return this.doUpdateMember(member);
     }

@@ -77,7 +77,6 @@ public class MemberControllerTest extends BaseTest {
         member.setDueCouponAmount(0L);
         member.setUserIptvId(1L);
         member.setBindIptvPlatformType(0);
-        member.setUpdateTime(LocalDateTime.now());
         String s = JSON.toJSONString(member);
         ResultInfo byId = null;//this.memberController.create(member);
         LOG.info("===>>>"+byId);

@@ -20,7 +20,7 @@ public class TaskOperationControllerTest extends BaseTest {
     @Test
     public void dealTask() {
         try {
-            DataSyncMsg dataSyncMsg = new DataSyncMsg();
+           /* DataSyncMsg dataSyncMsg = new DataSyncMsg();
             dataSyncMsg.setEventType(EventType.VIEWING.name());
             DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
             msgData.setEvent(2); // 类型 1-登录  2-观影  3-参加活动  4-订购  5-优享会员  6-签到
@@ -34,7 +34,21 @@ public class TaskOperationControllerTest extends BaseTest {
             TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria();
             pointsQueryCriteria.setContent(s);
             String s1 = JSON.toJSONString(pointsQueryCriteria);
-            System.out.println(s1);
+            System.out.println(s1);*/
+             String s = "{\n" +
+                     "  \"eventType\": \"play\",\n" +
+                     "  \"msg\": {\n" +
+                     "    \"description\": \"{\\\"playDuration\\\":60,\\\"time\\\":\\\"2022-04-01 00:10:09\\\",\\\"mediaId\\\":3433,\\\"mediaCode\\\":\\\"media_123\\\",\\\"mediaName\\\":\\\"白宫陷落\\\"}\",\n" +
+                     "    \"deviceType\": 1,\n" +
+                     "    \"event\": 8,\n" +
+                     "    \"mediaId\": 3433,\n" +
+                     "    \"memberCode\": \"1511275342935937024\",\n" +
+                     "    \"param\":\\\"{\\\"playDuration\\\":60}\\\"\n" +
+                     "  }\n" +
+                     "}";
+            TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria();
+            pointsQueryCriteria.setContent(s);
+            String s1 = JSON.toJSONString(pointsQueryCriteria);
             this.taskOperationController.dealTask(pointsQueryCriteria);
         } catch (Exception e) {
             e.printStackTrace();

@@ -5,6 +5,7 @@ import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.BaseTest;
 import com.topdraw.util.IdWorker;
+import com.topdraw.util.TimestampUtil;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -44,7 +45,7 @@ public class MemberOperationServiceTest extends BaseTest {
         member.setDueCouponAmount(0L);
         member.setUserIptvId(1L);
         member.setBindIptvPlatformType(0);
-        member.setUpdateTime(LocalDateTime.now());
+        member.setUpdateTime(TimestampUtil.now());
         String s = JSONObject.toJSONString(member);
 
         this.memberOperationService.doUpdateMember(member);
@@ -73,8 +74,6 @@ public class MemberOperationServiceTest extends BaseTest {
         member.setUserIptvId(1L);
         member.setBindIptvPlatformType(0);
         member.setBindIptvTime(LocalDateTime.now());
-        member.setCreateTime(LocalDateTime.now());
-        member.setUpdateTime(LocalDateTime.now());
 //        member.setUpdateTime(Timestamp.valueOf(LocalDateTime.now()));
         this.memberOperationService.doInsertMember(member);
     }