From 26f6f43785afd992496d7fc79775124e557ff16d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 17:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 152 +++++++++++++++++++++++---------------------------
1 files changed, 69 insertions(+), 83 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
index 2fc75ee..8959f2b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
@@ -1,83 +1,69 @@
-//package com.ruoyi.web.controller.task;
-//
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.ruoyi.common.utils.SmsUtil;
-//import com.ruoyi.system.mapper.TBillMapper;
-//import com.ruoyi.system.model.TBill;
-//import com.ruoyi.system.model.TContract;
-//import com.ruoyi.system.model.TContractRentType;
-//import com.ruoyi.system.service.TBillService;
-//import com.ruoyi.system.service.TContractRentTypeService;
-//import com.ruoyi.system.service.TContractService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Component;
-//
-//import javax.annotation.Resource;
-//import java.math.BigDecimal;
-//import java.time.LocalDate;
-//import java.time.LocalDateTime;
-//import java.time.LocalTime;
-//import java.time.ZoneId;
-//import java.time.temporal.ChronoUnit;
-//import java.time.temporal.TemporalAdjusters;
-//import java.util.ArrayList;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Random;
-//import java.util.stream.Collectors;
-//
-///**
-// * @author zhibing.pu
-// * @date 2023/7/11 8:39
-// */
-//@Component
-//public class TaskUtil {
-// @Autowired
-// private TContractService contractService;
-// @Autowired
-// private TBillMapper billMapper;
-// // 用于更新违约金账单
-// // 每分钟执行一次的定时任务
-//
-// @Scheduled(cron = "0 * * * * ?")
-// public void dayOfProportionBill() {
-// try {
-// // 查询所有未缴费账单
-// List<TBill> list = billMapper.selectList(new LambdaQueryWrapper<TBill>().eq(TBill::getPayFeesStatus, 1)
-// .le(TBill::getPayableFeesTime,LocalDate.now()));
-// for (TBill tBill : list) {
-// tBill.setPayFeesStatus("4");
-// TContract contract = contractService.getById(tBill.getContractId());
-// LocalDate payableFeesTime = tBill.getPayableFeesTime();
-// // 将LocalDate转化为LocalDateTime
-// LocalDateTime payableFeesTime1 = LocalDateTime.of(payableFeesTime, LocalTime.of(0, 0, 0));
-// LocalDateTime now = LocalDateTime.now();
-// // 计算两个时间相差多少个小时
-// long hours = ChronoUnit.HOURS.between(payableFeesTime1, now);
-// long l = hours / 24;
-// if (l>=3){
-// // 违约金比例
-// BigDecimal proportion = contract.getProportion();
-// // 按每天 待缴费金额 * XX% 增加违约金费用
-// if (tBill.getOutstandingMoney().compareTo(new BigDecimal("0"))==0){
-// tBill.setPayFeesStatus("3");
-// billMapper.updateById(tBill);
-// continue;
-// }
-// BigDecimal money = tBill.getOutstandingMoney().multiply(new BigDecimal(100).add(proportion)).divide(new BigDecimal(100),2, BigDecimal.ROUND_DOWN);
-// tBill.setOverDays((int) l);
-// tBill.setPayableFeesPenalty((tBill.getPayableFeesPenalty()!=null?tBill.getPayableFeesPenalty():BigDecimal.ZERO).add(money));
-// tBill.setOutstandingMoney(money);
-// billMapper.updateById(tBill);
-//
-// }
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-//
-//
-//}
+package com.ruoyi.web.controller.task;
+
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.TAppUserPositioning;
+import com.ruoyi.system.service.TAppUserPositioningService;
+import com.ruoyi.system.service.TAppUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author xiaochen
+ * @date 2025/10/11 8:39
+ */
+@Component
+public class TaskUtil {
+
+ @Autowired
+ private RedisCache redisCache;
+ @Autowired
+ private TAppUserService appUserService;
+ @Autowired
+ private TAppUserPositioningService appUserPositioningService;
+
+ //每天0点30分执行
+ @Scheduled(cron = "0 30 0 * * ?")
+ public void dayOfSavePositioning() {
+ try {
+ // 获取前一天时间
+ LocalDate localDate = LocalDate.now().minusDays(1);
+ // 查询所有的用户
+ List<TAppUser> appUserList = appUserService.list(Wrappers.lambdaQuery(TAppUser.class)
+ .eq(TAppUser::getState, 1)
+ .eq(TAppUser::getState, 1));
+
+ List<TAppUserPositioning> appUserPositioningList = new ArrayList<>();
+
+ for (TAppUser appUser : appUserList) {
+ TAppUserPositioning appUserPositioning = new TAppUserPositioning();
+ // 获取定位
+ String location = redisCache.getCacheObject(Constants.LOCATION + appUser.getId() + ":" + localDate);
+ if(StringUtils.hasLength(location)){
+ appUserPositioning.setAppUserId(appUser.getId());
+ appUserPositioning.setUserLocation(location);
+ appUserPositioning.setCreateTime(localDate.atStartOfDay());
+ appUserPositioningList.add(appUserPositioning);
+ }
+ }
+ if(!CollectionUtils.isEmpty(appUserPositioningList)){
+ appUserPositioningService.saveBatch(appUserPositioningList);
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+}
--
Gitblit v1.7.1