定时任务优化接口提示

百城千团定时修改为异步执行

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mq/RabbitKxsOrderQueueListener.java

@@ -27,7 +27,6 @@ import java.io.IOException;
 @Slf4j
 @RequiredArgsConstructor
 public class RabbitKxsOrderQueueListener {
-	private final RemoteUserService remoteUserService;
 	private final RemoteSysService remoteSysService;
 
 	/**
@@ -46,7 +45,7 @@ public class RabbitKxsOrderQueueListener {
 				CampAddBcqtTeamDTO campAddBcqtTeamDTO = new CampAddBcqtTeamDTO();
 				campAddBcqtTeamDTO.setCaptainId(Long.valueOf(parse.getUserId()));
 				campAddBcqtTeamDTO.setTeamName(parse.getRemark());
-				remoteUserService.addBcqtTeam(campAddBcqtTeamDTO, SecurityConstants.FROM_IN);
+				remoteSysService.addBcqtTeam(campAddBcqtTeamDTO, SecurityConstants.FROM_IN);
 			}
 			//训练营订单处理
 			if(parse.getStatus() == 2 && (parse.getProductId() == 10 || parse.getProductId() == 11) ){

kxs-quartz/src/main/java/com/kxs/daemon/quartz/task/CampBcqtBeanTask.java

@@ -2,6 +2,7 @@ package com.kxs.daemon.quartz.task;
 
 import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.daemon.quartz.constants.SkyQuartzEnum;
+import com.kxs.system.api.feign.RemoteSysService;
 import com.kxs.system.api.feign.RemoteUserService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -17,7 +18,7 @@ import java.time.LocalDateTime;
 @Component("campBcqtBeanTask")
 @RequiredArgsConstructor
 public class CampBcqtBeanTask {
-    private final RemoteUserService remoteUserService;
+    private final RemoteSysService remoteSysService;
     /**
      *  关闭活动结束的team和用户状态
      */
@@ -25,7 +26,7 @@ public class CampBcqtBeanTask {
     public String setUserActiviteStatus(String para) {
         log.info("百城千团定时扫描关闭活动结束的team和用户状态:{}，输入参数{}", LocalDateTime.now(), para);
         try {
-            remoteUserService.setUserActiviteStatus(SecurityConstants.FROM_IN);
+            remoteSysService.setUserActiviteStatus(SecurityConstants.FROM_IN);
             return SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType();
 
         }catch (Exception e){
@@ -39,7 +40,7 @@ public class CampBcqtBeanTask {
     public String setUserActivityTimeStat(String para) {
         log.info("百城千团定时统计活动期间人员激活:{}，输入参数{}", LocalDateTime.now(), para);
         try {
-            remoteUserService.setUserActivityTimeStat(SecurityConstants.FROM_IN);
+            remoteSysService.setUserActivityTimeStat(SecurityConstants.FROM_IN);
             return SkyQuartzEnum.JOB_LOG_STATUS_SUCCESS.getType();
 
         }catch (Exception e){

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteSysService.java

@@ -1,6 +1,8 @@
 package com.kxs.system.api.feign;
 
 import com.kxs.common.core.constant.SecurityConstants;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.dto.kxsapp.camp.CampAddBcqtTeamDTO;
 import com.kxs.system.api.dto.kxsapp.camp.PrizePoolDTO;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -22,7 +24,7 @@ public interface RemoteSysService {
 	 *
 	 * @param from 从
 	 */
-	@GetExchange("/system-job/poweronQuantityStatistics")
+	@GetExchange("/camp/poweronQuantityStatistics")
 	void poweronQuantityStatistics(@RequestHeader(SecurityConstants.FROM) String from);
 
 	/**
@@ -34,4 +36,21 @@ public interface RemoteSysService {
 	@PostExchange("/camp/prizePoolIsRefreshed")
 	void prizePoolIsRefreshed(@RequestBody PrizePoolDTO param, @RequestHeader(SecurityConstants.FROM) String from);
 
+	/**
+	 * 创建百城千团
+	 */
+	@PostExchange("/camp/addBcqtTeam")
+	R addBcqtTeam(@RequestBody CampAddBcqtTeamDTO param, @RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * 百城千团 定时统计活动期间人员激活  定时任务
+	 */
+	@PostExchange("/camp/setUserActivityTimeStat")
+	void setUserActivityTimeStat(@RequestHeader(SecurityConstants.FROM) String from);
+
+	/**
+	 * 百城千团 定时任务,关闭活动结束的team和用户状态
+	 */
+	@PostExchange("/camp/setUserActiviteStatus")
+	void setUserActiviteStatus(@RequestHeader(SecurityConstants.FROM) String from);
 }

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteUserService.java

@@ -4,13 +4,9 @@ package com.kxs.system.api.feign;
 import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.util.R;
 import com.kxs.system.api.dto.admin.UserInfo;
-import com.kxs.system.api.dto.kxsapp.camp.CampAddBcqtTeamDTO;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.service.annotation.GetExchange;
-import org.springframework.web.service.annotation.PostExchange;
 
 /**
  * @author Lxq
@@ -27,21 +23,5 @@ public interface RemoteUserService {
 	@GetExchange("/user/info/query")
 	R<UserInfo> info(@RequestParam("username") String username, @RequestHeader(SecurityConstants.FROM) String from);
 
-	/**
-	 * 创建百城千团
-	 */
-	@PostExchange("/camp/addBcqtTeam")
-	R addBcqtTeam(@RequestBody CampAddBcqtTeamDTO param, @RequestHeader(SecurityConstants.FROM) String from);
 
-	/**
-	 * 定时统计活动期间人员激活  定时任务
-	 */
-	@PostExchange("/camp/setUserActivityTimeStat")
-	void setUserActivityTimeStat(@RequestHeader(SecurityConstants.FROM) String from);
-
-	/**
-	 * 定时任务,关闭活动结束的team和用户状态
-	 */
-	@PostExchange("/camp/setUserActiviteStatus")
-	void setUserActiviteStatus(@RequestHeader(SecurityConstants.FROM) String from);
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/kxsapp/CampController.java

@@ -87,6 +87,22 @@ public class CampController {
         return R.ok();
     }
 
+    /**
+     *
+     1.统计方式:个人及散下团队开通广电卡、来客吧、pos商户
+     2.广电卡统计:激活成功+1
+     3.pos商户统计:激活成功+1
+     4.来客吧商户统计: 商户任意通道待签约+1
+     * 异步执行
+     */
+    @Inner
+    @GetMapping("/poweronQuantityStatistics")
+    public void prizePoolIsRefreshed()  {
+
+        kxsCampService.poweronQuantityStatistics();
+
+    }
+
     /**
      * 百城千团-获取列表
      *
@@ -125,6 +141,7 @@ public class CampController {
 
         return  kxsBcqtTeamService.addBcqtTeam(param);
     }
+
     /**
      * 百城千团-创建团队校验
      *

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsBcqtTeamServiceImpl.java

@@ -37,6 +37,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.K;
 import org.jacoco.agent.rt.internal_43f5073.core.internal.flow.IFrame;
 import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -283,7 +284,8 @@ public class KxsBcqtTeamServiceImpl extends ServiceImpl<KxsBcqtTeamMapper, KxsBc
 
 
     @Override
-    @Transactional
+    @Async
+    @Transactional(rollbackFor = Exception.class)
     public void setUserActivityTimeStat() {
         //获取全部活动中团队
         List<KxsBcqtTeam> list = list(Wrappers.<KxsBcqtTeam>query().lambda().eq(KxsBcqtTeam::getStatus, 1));

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampServiceImpl.java

@@ -43,6 +43,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 
 import java.math.BigDecimal;
@@ -199,6 +200,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
 
     @Override
     @Async
+    @Transactional(rollbackFor = Exception.class)
     public void prizePoolIsRefreshed(PrizePoolDTO param) {
 
         //查询正在进行中的活动

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/task/KxsSystemTask.java

@@ -1,12 +1,8 @@
 package com.kxs.system.biz.task;
 
-import com.kxs.common.security.annotation.Inner;
-import com.kxs.system.biz.service.KxsCampService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -22,23 +18,5 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("system-job")
 public class KxsSystemTask {
 
-    private final KxsCampService kxsCampService;
-
-
-    /**
-     *
-         1.统计方式:个人及散下团队开通广电卡、来客吧、pos商户
-         2.广电卡统计:激活成功+1
-         3.pos商户统计:激活成功+1
-         4.来客吧商户统计: 商户任意通道待签约+1
-     * 异步执行
-     */
-    @Inner
-    @GetMapping("/poweronQuantityStatistics")
-    public void prizePoolIsRefreshed()  {
-
-        kxsCampService.poweronQuantityStatistics();
-
-    }
 
 }