xufangming/ifsm-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加定时任务线程池，增加定时任务执行时间节点

Browse Source
This commit is contained in:
xufangming 2025-04-22 15:05:15 +08:00
parent 485c739587
commit db44f761ec
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/gkjk/impl/NxJeDeviceServiceImpl.java
View File

@ -940,6 +940,7 @@ public class NxJeDeviceServiceImpl extends ServiceImpl<NxJeDeviceDao, NxJeDevice
BeanUtils.copyProperties(v, model); BeanUtils.copyProperties(v, model);
return model; return model;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
Map<String, List<WorkStatusMonitorModel>> collect = models.stream().collect(Collectors.groupingBy(WorkStatusMonitorModel::getPropertyTag)); Map<String, List<WorkStatusMonitorModel>> collect = models.stream().collect(Collectors.groupingBy(WorkStatusMonitorModel::getPropertyTag));
List<String> titles = modelPropertyMapper.getWorkingTitle(req); List<String> titles = modelPropertyMapper.getWorkingTitle(req);
@ -950,6 +951,7 @@ public class NxJeDeviceServiceImpl extends ServiceImpl<NxJeDeviceDao, NxJeDevice
linkedHashMap.put(item,collect.get(item)); linkedHashMap.put(item,collect.get(item));
} }
}); });
log.debug("entities元素数量:"+entities.size()+"models元素数量:"+models.size());
return linkedHashMap; return linkedHashMap;
} }

3
nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java
View File

@ -1362,7 +1362,6 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
@Resource @Resource
private OrderNumberUtils orderNumberUtils; private OrderNumberUtils orderNumberUtils;
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void generateOrder(ServicePlanEntity servicePlan, int triggerType, String thatDay, boolean tempTime) throws Exception { public void generateOrder(ServicePlanEntity servicePlan, int triggerType, String thatDay, boolean tempTime) throws Exception {
log.info("{}订单创建日志-服务计划[{}]触发订单创建方法，是否临时触发订单{}，触发类型:{}", new Date(), servicePlan.getServicePlanId(),tempTime,triggerType); log.info("{}订单创建日志-服务计划[{}]触发订单创建方法，是否临时触发订单{}，触发类型:{}", new Date(), servicePlan.getServicePlanId(),tempTime,triggerType);
//判断是否存在派工， 只有存在派工才走订单申请 //判断是否存在派工， 只有存在派工才走订单申请
@ -1540,7 +1539,7 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
map.put("assigeeId", outletsVO.getUserIds()); map.put("assigeeId", outletsVO.getUserIds());
map.put("submitType", "to_submit"); map.put("submitType", "to_submit");
Map<String, String> headers = new HashMap<>(); Map<String, String> headers = new HashMap<>();
headers.put("authorization", login.getAccess_token()); headers.put("authorization", "iTshDNZhNO6BkTjZIba");
log.info("订单创建日志-authorization[{}]",login.getAccess_token()); log.info("订单创建日志-authorization[{}]",login.getAccess_token());
// headers.put("authorization", "Hpq9v3R1hoCTVTaVD0p"); // headers.put("authorization", "Hpq9v3R1hoCTVTaVD0p");
headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8"); headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");

9
nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java
View File

@ -26,13 +26,20 @@ public class ServicePlanTimer {
/** /**
* 定时处理设置了触发条件为系统时间的 * 定时处理设置了触发条件为系统时间的
*/ */
@Scheduled(cron = "0 0 5,6,7,8,9,10,11,12,14,16,18 * * ?") @Scheduled(cron = "0 0 5,6,7,8,9,10,11,12 * * ?")
public void scheduledProcessing(){ public void scheduledProcessing(){
log.info("服务计划自动触发定时任务开始...."); log.info("服务计划自动触发定时任务开始....");
planService.scheduledProcessing(); planService.scheduledProcessing();
log.info("服务计划自动触发定时任务结束...."); log.info("服务计划自动触发定时任务结束....");
} }
@Scheduled(cron = "0 0 13,14,15,16,17 * * ?")
public void scheduledProcessingADD(){
log.info("服务计划自动触发定时任务补充开始....");
planService.scheduledProcessing();
log.info("服务计划自动触发定时任务补充结束....");
}
/** /**
* 定时修改服务状态 * 定时修改服务状态
*/ */