浏览代码

fix(app):
- 添加日志记录功能
- 更新 RedissonDelayQueue版本并解注相关代码- 优化订单服务中的任务发布逻辑

wzq 2 周之前
父节点
当前提交
ca349113da

+ 4 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -38,6 +38,7 @@ import org.jeecg.modules.app.vo.PageOrdersVO;
 import org.jeecg.modules.app.vo.QueryOrderVerifyRecordsVO;
 import org.jeecg.modules.pay.config.WechatConstants;
 import org.jeecg.modules.pay.config.WechatUrlConstants;
+import org.jeecg.modules.redission.RedissonDelayQueue;
 import org.jeecg.modules.system.app.dto.receiptPaymentDetails.ReceiptPaymentDetailsInfoVo;
 import org.jeecg.modules.system.app.entity.*;
 import org.jeecg.modules.system.app.mapper.*;
@@ -114,8 +115,8 @@ public class OrderServiceImpl implements IOrderService {
     private AppCoursesVerificationRecordMapper appCoursesVerificationRecordMapper;
     @Resource
     private AppContractSignMapper appContractSignMapper;
-//    @Resource
-//    private RedissonDelayQueue redissonDelayQueue;
+    @Resource
+    private RedissonDelayQueue redissonDelayQueue;
     @Resource
     private AppDeviceMapper appDeviceMapper;
     @Resource
@@ -1177,7 +1178,7 @@ public class OrderServiceImpl implements IOrderService {
 
             //发布任务到redission延迟队列
             String task = CommonConstant.ORDER_TIME_OUT_TASK_PREFIX + appOrder.getId();
-//            redissonDelayQueue.offerTask(task, 60 * 15);
+            redissonDelayQueue.offerTask(task, 60 * 15);
         }
         return payForm;
     }

+ 2 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/redission/RedissonDelayQueue.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.system.app.service.IAppOrderService;
 import org.redisson.api.RBlockingQueue;
 import org.redisson.api.RDelayedQueue;
 import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -26,7 +27,7 @@ import java.util.stream.Collectors;
  * @Date 2025/8/15
  * @Desc 延迟队列实现订单超时取消
  */
-//@Component
+@Component
 @Slf4j
 public class RedissonDelayQueue {
 

+ 31 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSitePlaceServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -30,6 +31,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 import static org.jeecg.common.constant.CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
@@ -40,6 +43,7 @@ import static org.jeecg.common.constant.CommonConstant.SC_INTERNAL_SERVER_ERROR_
  * @Date: 2025-07-09
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, AppSitePlace> implements IAppSitePlaceService {
     @Resource
@@ -119,7 +123,7 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
         AppSitePlace dbPlace = baseMapper.selectById(appSitePlaceCuDTO.getSiteId());
         if (null == dbPlace) throw new JeecgBootException("数据不存在", SC_INTERNAL_SERVER_ERROR_500);
         //部门校验
-//        checkPermission(dbPlace, sysUser);
+        //        checkPermission(dbPlace, sysUser);
         AppSitePlace appSitePlace = new AppSitePlace();
         BeanUtils.copyProperties(appSitePlaceCuDTO, appSitePlace);
         //不许更改项赋值
@@ -179,6 +183,32 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
         return Boolean.TRUE;
     }
 
+    public void remoteEditSchool(final AppSitePlaceSchoolDTO placeDTO){
+        //创建一个可重用固定线程数的线程池
+        ExecutorService cachedThreadPool = Executors.newFixedThreadPool(20); //固定大小的线程池
+
+        cachedThreadPool.execute(new Runnable() {
+            @Override
+            public void run(){
+                log.info("======>修改学校场地信息  线程<======");
+                log.info("======>当前线程 NAME  ="+Thread.currentThread().getName());
+                log.info("======>当前线程 ID    ="+Thread.currentThread().getId());
+                log.info("======>当前线程 Count ="+Thread.activeCount());
+
+                try {
+                    Thread.sleep(1500);//线程延迟1.5秒
+
+
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        //关闭线程池
+        cachedThreadPool.shutdown();
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -620,7 +650,6 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
                         appSitePriceRulesMapper.insertList(appSitePriceRulesList);
                     }
                 }
-
             }
             // 数据库场地数量    大于   表单场地数量  -----删除多余场地数量
             if (sitePlaceNum > count) {

+ 1 - 1
pom.xml

@@ -75,7 +75,7 @@
 
 		<httpclient.version>4.5.13</httpclient.version>
 		<gson.version>2.10</gson.version>
-		<redission.version>3.17.6</redission.version>
+		<redission.version>3.38.1</redission.version>
 		<wechatpay.version>0.4.7</wechatpay.version>
 	</properties>
 	<modules>