|
|
@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.zhiqiyun.open.core.enmus.Gender;
|
|
|
import com.zhiqiyun.open.core.enmus.PassengerType;
|
|
|
import com.zhiqiyun.open.core.models.DictCity;
|
|
|
+import com.zhiqiyun.open.core.models.app.ApiRequestLog;
|
|
|
import com.zhiqiyun.open.core.models.equipment.EquipmentPassenger;
|
|
|
import com.zhiqiyun.open.core.models.equipment.EquipmentPassengerPeople;
|
|
|
-import com.zhiqiyun.open.core.service.DictCityService;
|
|
|
-import com.zhiqiyun.open.core.service.EquipmentPassengerPeopleService;
|
|
|
-import com.zhiqiyun.open.core.service.EquipmentPassengerService;
|
|
|
-import com.zhiqiyun.open.core.service.SequenceService;
|
|
|
+import com.zhiqiyun.open.core.service.*;
|
|
|
import com.zhiqiyun.open.utils.DateUtil;
|
|
|
import com.zhiqiyun.open.utils.RandomUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -27,7 +25,7 @@ import java.util.List;
|
|
|
|
|
|
@Slf4j
|
|
|
@Component
|
|
|
-public class AutoEquipmentPassengerPeople {
|
|
|
+public class AutoSchedule {
|
|
|
@Autowired
|
|
|
private EquipmentPassengerService equipmentPassengerService;
|
|
|
|
|
|
@@ -43,11 +41,14 @@ public class AutoEquipmentPassengerPeople {
|
|
|
@Autowired
|
|
|
private StringRedisTemplate stringRedisTemplate;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ApiRequestLogService apiRequestLogService;
|
|
|
+
|
|
|
@Value("${spring.profiles.active}")
|
|
|
private String active;
|
|
|
|
|
|
@Scheduled(cron = "0/20 * * * * ?")
|
|
|
- public void createPeople() {
|
|
|
+ public void createEquipmentPassengerPeople() {
|
|
|
if ("dev".equals(active)) {
|
|
|
return;
|
|
|
}
|
|
|
@@ -89,33 +90,47 @@ public class AutoEquipmentPassengerPeople {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @Scheduled(cron = "0/10 * * * * ?")
|
|
|
- public void deletePeople() {
|
|
|
+ @Scheduled(cron = "0 0 0 * * ?")
|
|
|
+ public void deleteExpireEquipmentPassengerPeople() {
|
|
|
QueryWrapper<EquipmentPassengerPeople> wrapper = new QueryWrapper<>();
|
|
|
wrapper.lt("created_time", DateUtils.addDays(DateUtil.current(), -15));
|
|
|
|
|
|
- int current = 1;
|
|
|
- boolean hasNext = true;
|
|
|
- while (hasNext) {
|
|
|
- Page<EquipmentPassengerPeople> page = this.equipmentPassengerPeopleService.page(new Page<>(current, 100), wrapper);
|
|
|
- log.info("deletePeople size>>>>{}", page.getTotal());
|
|
|
+ List<EquipmentPassengerPeople> list = this.equipmentPassengerPeopleService.list(wrapper);
|
|
|
+ log.info("deleteExpireEquipmentPassengerPeople size>>>>{}", list.size());
|
|
|
|
|
|
- for (EquipmentPassengerPeople people : page.getRecords()) {
|
|
|
- this.equipmentPassengerPeopleService.removeById(people.getId());
|
|
|
- }
|
|
|
- hasNext = page.hasNext();
|
|
|
+ for (EquipmentPassengerPeople people : list) {
|
|
|
+ this.equipmentPassengerPeopleService.removeById(people.getId());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @Scheduled(cron = "0/10 * * * * ?")
|
|
|
- public void deletePeopleByFaceId() {
|
|
|
+ @Scheduled(cron = "0/30 * * * * ?")
|
|
|
+ public void deleteOneFaceId() {
|
|
|
QueryWrapper<EquipmentPassengerPeople> wrapper = new QueryWrapper<>();
|
|
|
wrapper.inSql("face_id", "select face_id from equipment_passenger_people GROUP BY face_id HAVING count(face_id) = 1");
|
|
|
wrapper.eq("passenger_type", PassengerType.OUT);
|
|
|
List<EquipmentPassengerPeople> list = this.equipmentPassengerPeopleService.list(wrapper);
|
|
|
- log.info("deletePeopleByFaceId size>>>>{}", list.size());
|
|
|
+ log.info("deleteOneFaceId size>>>>{}", list.size());
|
|
|
for (EquipmentPassengerPeople people : list) {
|
|
|
this.equipmentPassengerPeopleService.removeById(people.getId());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ @Scheduled(cron = "0 0 0 * * ?")
|
|
|
+ public void deleteExpireApiRequestLogs() {
|
|
|
+ QueryWrapper<ApiRequestLog> wrapper = new QueryWrapper<>();
|
|
|
+ wrapper.lt("service_begin_time", DateUtils.addDays(DateUtil.current(), -30));
|
|
|
+
|
|
|
+ int current = 1;
|
|
|
+ boolean hasNext = true;
|
|
|
+ while (hasNext) {
|
|
|
+ Page<ApiRequestLog> page = this.apiRequestLogService.page(new Page<>(current, 100), wrapper);
|
|
|
+ log.info("deleteExpireApiRequestLogs size>>>>{}", page.getTotal());
|
|
|
+
|
|
|
+ for (ApiRequestLog log : page.getRecords()) {
|
|
|
+ this.apiRequestLogService.removeById(log.getId());
|
|
|
+ }
|
|
|
+ hasNext = page.hasNext();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|