Commit a7c610b6 authored by 罗林杰's avatar 罗林杰

修改访问量定时任务

parent b5ade725
...@@ -33,6 +33,7 @@ import java.time.LocalDate; ...@@ -33,6 +33,7 @@ import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
...@@ -67,12 +68,16 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT ...@@ -67,12 +68,16 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT
@Override @Override
public CyPersistModel persist(MemTraffic memTraffic){ public CyPersistModel persist(MemTraffic memTraffic){
// 获取当前日期
LocalDate today = LocalDate.now();
// 定义日期时间格式
DateTimeFormatter formatterNow = DateTimeFormatter.ofPattern("MMdd");
String date = today.format(formatterNow);
BigInteger memberId = memTraffic.getMemberId(); BigInteger memberId = memTraffic.getMemberId();
Object isFirst = cyRedisServiceImpl.get(MemTrafficRedisBean.USER_MEMTRAFFIC + memberId); Object isFirst = cyRedisServiceImpl.get(MemTrafficRedisBean.USER_MEMTRAFFIC + date +':'+ memberId);
if (isFirst == null){ if (isFirst == null){
// 获取当前日期
LocalDate today = LocalDate.now();
// 定义日期时间格式 // 定义日期时间格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 最大时间 和 最小时间 // 最大时间 和 最小时间
...@@ -83,10 +88,10 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT ...@@ -83,10 +88,10 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT
baseMapper.insertMemTraffic(memTraffic); baseMapper.insertMemTraffic(memTraffic);
cyRedisServiceImpl.set(MemTrafficRedisBean.USER_MEMTRAFFIC + memberId,1L, Long.valueOf(48 * 60 * 60)); cyRedisServiceImpl.set(MemTrafficRedisBean.USER_MEMTRAFFIC + date +':'+ memberId,1L, Long.valueOf(48 * 60 * 60));
} else { } else {
this.redisTemplate.opsForValue().increment(MemTrafficRedisBean.USER_MEMTRAFFIC + memberId, 1L); this.redisTemplate.opsForValue().increment(MemTrafficRedisBean.USER_MEMTRAFFIC + date +':'+ memberId, 1L);
} }
return new CyPersistModel(1); return new CyPersistModel(1);
} }
...@@ -140,7 +145,8 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT ...@@ -140,7 +145,8 @@ public class MemTrafficServiceImpl extends ServiceImpl<MemTrafficRepository,MemT
SysScheduledTaskLog sysScheduledTaskLog = new SysScheduledTaskLog(); SysScheduledTaskLog sysScheduledTaskLog = new SysScheduledTaskLog();
sysScheduledTaskLog.setTaskName("用户访问数据定时任务"); sysScheduledTaskLog.setTaskName("用户访问数据定时任务");
sysScheduledTaskLog.setTaskState("成功"); sysScheduledTaskLog.setTaskState("成功");
sysScheduledTaskLog.setRemarks("每20分钟执行一次"); sysScheduledTaskLog.setTaskTime("每20分钟执行一次");
sysScheduledTaskLog.setCreateDate(new Date());
sysScheduledTaskLogServiceImpl.persist(sysScheduledTaskLog); sysScheduledTaskLogServiceImpl.persist(sysScheduledTaskLog);
log.info("用户访问数据定时任务结束---"); log.info("用户访问数据定时任务结束---");
} }
......
...@@ -35,12 +35,7 @@ public class SysScheduledTaskLog extends CyIdNotDataEntity<SysScheduledTaskLog> ...@@ -35,12 +35,7 @@ public class SysScheduledTaskLog extends CyIdNotDataEntity<SysScheduledTaskLog>
* @column task_time * @column task_time
* @default * @default
*/ */
@JsonFormat( private String taskTime;
pattern = "yyyy-MM-dd"
)
@Excel(name = "任务执行时间", orderNum = "1", width = 20, format = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date taskTime;
/** /**
* @desc 创建时间 * @desc 创建时间
...@@ -48,10 +43,10 @@ public class SysScheduledTaskLog extends CyIdNotDataEntity<SysScheduledTaskLog> ...@@ -48,10 +43,10 @@ public class SysScheduledTaskLog extends CyIdNotDataEntity<SysScheduledTaskLog>
* @default * @default
*/ */
@JsonFormat( @JsonFormat(
pattern = "yyyy-MM-dd" pattern = "yyyy-MM-dd HH-mm-ss"
) )
@Excel(name = "创建时间", orderNum = "2", width = 20, format = "yyyy-MM-dd") @Excel(name = "创建时间", orderNum = "2", width = 20, format = "yyyy-MM-dd HH-mm-ss")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss")
private Date createDate; private Date createDate;
/** /**
......
...@@ -107,7 +107,7 @@ public class ScheduleTasks { ...@@ -107,7 +107,7 @@ public class ScheduleTasks {
/** /**
* 定时更新访问量表 * 定时更新访问量表
*/ */
@Scheduled(cron = "0 0/20 * * * ?") @Scheduled(cron = "0 * * * * ?")
public void memTrafficSchedule() { public void memTrafficSchedule() {
memTrafficService.memTrafficSchedule(); memTrafficService.memTrafficSchedule();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment