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-21 15:14:02 +08:00
parent 90b03048e2
commit 9bc9d6a070
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1364,7 +1364,7 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
@Override @Override
@Transactional(rollbackFor = Exception.class) @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);
//判断是否存在派工， 只有存在派工才走订单申请 //判断是否存在派工， 只有存在派工才走订单申请
Map<String, String> islcpzb = servicePlanMapper.getIslcpzb(servicePlan.getSyZhid()); Map<String, String> islcpzb = servicePlanMapper.getIslcpzb(servicePlan.getSyZhid());
if (islcpzb != null) { if (islcpzb != null) {
@ -1408,13 +1408,13 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
QueryWrapper<NxDeviceEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<NxDeviceEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("NX_JCXX_SBLB_ID", servicePlan.getDeviceId()); queryWrapper.eq("NX_JCXX_SBLB_ID", servicePlan.getDeviceId());
NxDeviceEntity nxDeviceEntity = nxDeviceMapper.selectOne(queryWrapper); NxDeviceEntity nxDeviceEntity = nxDeviceMapper.selectOne(queryWrapper);
log.info("{}订单创建日志-服务计划{}触发派单获取设备信息-->{}", new Date(), servicePlan.getServicePlanId(), nxDeviceEntity); log.info("{}订单创建日志-服务计划[{}]触发派单获取设备信息-->{}", new Date(), servicePlan.getServicePlanId(), nxDeviceEntity);
if (nxDeviceEntity == null) { if (nxDeviceEntity == null) {
log.info("{}订单创建日志-{}触发1404行return", new Date(), servicePlan.getServicePlanId()); log.info("{}订单创建日志-{}触发1404行return", new Date(), servicePlan.getServicePlanId());
return; return;
} }
//新增订单 //新增订单
log.info("{}订单创建日志-{}新增订单开始---->", new Date(), servicePlan.getServicePlanId()); log.info("{}订单创建日志-[{}]新增订单开始---->", new Date(), servicePlan.getServicePlanId());
NxOrderEntity order = new NxOrderEntity(); NxOrderEntity order = new NxOrderEntity();
String orderId = JEUuidUtil.uuid(); String orderId = JEUuidUtil.uuid();
order.setNxOrderId(orderId); order.setNxOrderId(orderId);
@ -1448,7 +1448,7 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
order.setOrderCustomerId(nxDeviceEntity.getSblbKhid()); order.setOrderCustomerId(nxDeviceEntity.getSblbKhid());
//根据customerId 查询 NX_KHGL //根据customerId 查询 NX_KHGL
String wdId = servicePlanMapper.selectOutletsIdByCustomerId(nxDeviceEntity.getSblbKhid(), servicePlan.getSyZhid()); String wdId = servicePlanMapper.selectOutletsIdByCustomerId(nxDeviceEntity.getSblbKhid(), servicePlan.getSyZhid());
log.info("订单创建日志-服务计划{}触发派单获取服务网点ID-->{}", servicePlan.getServicePlanId(), wdId); log.info("订单创建日志-服务计划[{}]触发派单获取服务网点ID-->{}", servicePlan.getServicePlanId(), wdId);
if (StringUtils.isNotBlank(wdId)) { if (StringUtils.isNotBlank(wdId)) {
order.setOrderFwwdid(wdId); order.setOrderFwwdid(wdId);
} }
@ -1487,7 +1487,7 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
order.setSyZhid(servicePlan.getSyZhid());//设置租户ID 20221020号 order.setSyZhid(servicePlan.getSyZhid());//设置租户ID 20221020号
log.info("订单创建日志-order：{}", order); log.info("订单创建日志-order：{}", order);
nxOrderMapper.insert(order); nxOrderMapper.insert(order);
log.info("订单创建日志-服务计划{}生成订单成功", servicePlan.getServicePlanId()); log.info("订单创建日志-服务计划[{}]生成订单成功", servicePlan.getServicePlanId());
//生成待办库 //生成待办库
NxTodoLibrary library = new NxTodoLibrary(); NxTodoLibrary library = new NxTodoLibrary();
library.setTitle(ResourceUtil.getI18nMessage("60014")); library.setTitle(ResourceUtil.getI18nMessage("60014"));
@ -1509,7 +1509,7 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
library.setNxTodoLibraryId(libraryId); library.setNxTodoLibraryId(libraryId);
library.setNxOrderId(order.getNxOrderId()); library.setNxOrderId(order.getNxOrderId());
nxTodoLibraryService.save(library); nxTodoLibraryService.save(library);
log.info("订单创建日志-服务计划{}生成代办库成功-->{}", servicePlan.getServicePlanId(), library); log.info("订单创建日志-服务计划[{}]生成代办库成功", servicePlan.getServicePlanId());
//保养内容需要增加 //保养内容需要增加
List<Map> selectListXMBY = servicePlanMapper.selectListXMBY(servicePlan.getMaintainContent(), servicePlan.getSyZhid()); List<Map> selectListXMBY = servicePlanMapper.selectListXMBY(servicePlan.getMaintainContent(), servicePlan.getSyZhid());
if (selectListXMBY.size() > 0) { if (selectListXMBY.size() > 0) {
@ -1521,12 +1521,12 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
} }
//流程引擎 //流程引擎
if (StringUtils.isNotBlank(order.getOrderFwwdid())) { if (StringUtils.isNotBlank(order.getOrderFwwdid())) {
log.info("订单创建日志-{}进入派工流程引擎", servicePlan.getServicePlanId()); log.info("订单创建日志-[{}]进入派工流程引擎", servicePlan.getServicePlanId());
//调用登录接口 //调用登录接口
String loginName = servicePlanMapper.queryStringByCode("loginName") == null ? "app_master_admin" : servicePlanMapper.queryStringByCode("loginName"); String loginName = servicePlanMapper.queryStringByCode("loginName") == null ? "app_master_admin" : servicePlanMapper.queryStringByCode("loginName");
String loginPassword = servicePlanMapper.queryStringByCode("loginPassword") == null ? "Liu@123456" : servicePlanMapper.queryStringByCode("loginPassword"); String loginPassword = servicePlanMapper.queryStringByCode("loginPassword") == null ? "Liu@123456" : servicePlanMapper.queryStringByCode("loginPassword");
OAuthResult login = rootCloudAuthService.login(loginName, loginPassword, null); OAuthResult login = rootCloudAuthService.login(loginName, loginPassword, null);
Log.info(servicePlan.getServicePlanId() + "订单创建日志-登录接口:" + login + "loginName:" + loginName + " loginPassword:" + loginPassword); //Log.info(servicePlan.getServicePlanId() + "订单创建日志-登录接口:" + login + "loginName:" + loginName + " loginPassword:" + loginPassword);
OutletsVO outletsVO = servicePlanMapper.returnUserNames(order.getOrderFwwdid()); OutletsVO outletsVO = servicePlanMapper.returnUserNames(order.getOrderFwwdid());
String sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/sponsorProcess"; String sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/sponsorProcess";
Map<String, String> map = new HashMap(); Map<String, String> map = new HashMap();
@ -1541,15 +1541,17 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
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", login.getAccess_token());
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");
try { try {
Map<String, String> querys = new HashMap<>(); Map<String, String> querys = new HashMap<>();
log.info("订单创建日志:准备开始派工引擎请求");
org.apache.http.HttpResponse post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map); org.apache.http.HttpResponse post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
log.info("订单创建日志:派工引擎请求结束");
int statusCode = post.getStatusLine().getStatusCode(); int statusCode = post.getStatusLine().getStatusCode();
String responseContent = EntityUtils.toString(post.getEntity(), "UTF-8"); String responseContent = EntityUtils.toString(post.getEntity(), "UTF-8");
log.info("订单创建日志-服务计划{},派工订单待派工状态码:{},返回值:{}", servicePlan.getServicePlanId(), statusCode, responseContent); log.info("订单创建日志-服务计划[{}],派工订单待派工状态码:{},返回值:{}", servicePlan.getServicePlanId(), statusCode, responseContent);
sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/completeTask"; sponsorProcess = wfProperties.getWfHost() + "/je/jbpm/taskInfo/completeTask";
map.clear(); map.clear();
JSONObject res = JSONObject.parseObject(responseContent); JSONObject res = JSONObject.parseObject(responseContent);
@ -1569,7 +1571,7 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
querys.clear(); querys.clear();
post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map); post = HttpUtils.doPost(sponsorProcess, "", "post", headers, querys, map);
statusCode = post.getStatusLine().getStatusCode(); statusCode = post.getStatusLine().getStatusCode();
log.info("订单创建日志-服务计划派同意派工状态码:{}", statusCode); log.info("订单创建日志-服务计划[{}]派同意派工状态码:{}", servicePlan.getServicePlanId(),statusCode);
} else { } else {
log.error("订单创建日志-服务计划{}派同意派工taskId获取不到", servicePlan.getServicePlanId()); log.error("订单创建日志-服务计划{}派同意派工taskId获取不到", servicePlan.getServicePlanId());
throw new Exception(); throw new Exception();

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

@ -26,7 +26,7 @@ public class ServicePlanTimer {
/** /**
* 定时处理设置了触发条件为系统时间的 * 定时处理设置了触发条件为系统时间的
*/ */
@Scheduled(cron = "0 * 5,6,7,8,9,10,11,12,14 * * ?") @Scheduled(cron = "0 0 5,6,7,8,9,10,11,12,14 * * ?")
public void scheduledProcessing(){ public void scheduledProcessing(){
log.info("服务计划自动触发定时任务开始...."); log.info("服务计划自动触发定时任务开始....");
planService.scheduledProcessing(); planService.scheduledProcessing();