From d6df4ca797ee1c6ce8fa78768f5425f187734bd9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 18 一月 2021 18:44:08 +0800
Subject: [PATCH] 外网部署参数修改

---
 service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityManager.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityManager.java b/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityManager.java
index 079fc46..e112c28 100644
--- a/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityManager.java
+++ b/service-lucky/src/main/java/com/ks/lucky/service/impl/LuckyActivityManager.java
@@ -8,11 +8,13 @@
 import com.ks.lucky.pojo.DTO.mq.ActivityStateChangeMsgDTO;
 import com.ks.lucky.service.LuckyActivityImageService;
 import com.ks.lucky.service.LuckyMQService;
+import com.ks.lucky.util.LoggerUtil;
 import com.ks.lucky.util.annotation.RedisCache;
 import com.ks.lucky.util.annotation.RedisCacheEvict;
 import com.ks.lucky.util.mq.CMQManager;
 import com.ks.lucky.util.mq.LuckyMQFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -147,7 +149,7 @@
         update.setId(activityId);
         update.setCurrentPersonCount(currentCount + count);
         update.setUpdateTime(new Date());
-        luckyActivityMapper.updateByPrimaryKeySelective(update);
+        updateSelectiveByPrimaryKey(update);
         if (update.getCurrentPersonCount().intValue() >= openInfo.getMinPersonCount() && currentCount < openInfo.getMinPersonCount()) {
             //杈惧埌鏈�浣庡紑濂栦汉鏁�
             CMQManager.getInstance().addActivityMsg(new ActivityMQMsg(activityId, ActivityMQMsg.TYPE_REACH_MIN_PERSON, new Date()));
@@ -165,6 +167,7 @@
      *
      * @param activityId
      */
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     @RedisCacheEvict(cate = "activity", key = "'activity-detail-'+#activityId")
     public void startUpActivity(Long activityId) throws LuckyActivityException, LuckyMQException {
         LuckyActivity luckyActivity = luckyActivityMapper.selectByPrimaryKeyForUpdate(activityId);
@@ -183,7 +186,7 @@
         update.setId(activityId);
         update.setActualStartTime(new Date());
         update.setUpdateTime(new Date());
-        luckyActivityMapper.updateByPrimaryKeySelective(update);
+        updateSelectiveByPrimaryKey(update);
 
         //鏈夐璁$粨鏉熸椂闂�
         if (luckyActivity.getPreFinishTime() != null) {
@@ -200,7 +203,7 @@
             e.printStackTrace();
         }
 
-
+        LoggerUtil.activityLogger.info("娲诲姩鍚姩鎴愬姛:activityId-{}", activityId);
     }
 
 
@@ -229,7 +232,7 @@
         update.setId(activityId);
         update.setActualFinishTime(new Date());
         update.setUpdateTime(new Date());
-        luckyActivityMapper.updateByPrimaryKeySelective(update);
+        updateSelectiveByPrimaryKey(update);
 
         activity.setActualFinishTime(update.getActualFinishTime());
         //寮哄埗缁撴潫鐨勪笉寮�濂�
@@ -251,7 +254,7 @@
             e.printStackTrace();
         }
 
-
+        LoggerUtil.activityLogger.info("娲诲姩鎴愬姛缁撴潫:activityId-{} force-{} remarks-{}", activityId, force, remarks);
     }
 
 
@@ -283,6 +286,7 @@
         activity.setUpdateTime(new Date());
         updateSelectiveByPrimaryKey(activity);
         CMQManager.getInstance().publishActivityStateChangeMsg(new ActivityStateChangeMsgDTO(activityId, state, stateRemarks, activity.getUpdateTime()));
+        LoggerUtil.activityLogger.info("娲诲姩鐘舵�佹洿鏀癸細activityId-{}  state-{} stateRemarks-{}", activityId, state, stateRemarks);
     }
 
     @RedisCacheEvict(cate = "activity", key = "'activity-detail-'+#activity.id")

--
Gitblit v1.8.0