|
@@ -4,27 +4,34 @@ import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
|
|
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
|
|
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
|
|
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
|
|
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
|
|
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
|
|
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
|
|
|
|
+import cn.iocoder.yudao.module.pms.constant.PmsConstants;
|
|
import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
|
|
import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
|
|
import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillOrderDO;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillMapper;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillMapper;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillOrderMapper;
|
|
import cn.iocoder.yudao.module.pms.dal.mysql.iotopeationfill.IotOpeationFillOrderMapper;
|
|
|
|
+import cn.iocoder.yudao.module.pms.message.PmsMessage;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.boot.SpringApplication;
|
|
import org.springframework.boot.SpringApplication;
|
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
import org.springframework.scheduling.annotation.EnableScheduling;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
import org.springframework.scheduling.annotation.Scheduled;
|
|
|
|
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import javax.annotation.security.PermitAll;
|
|
import javax.annotation.security.PermitAll;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.concurrent.CompletableFuture;
|
|
import java.util.function.Predicate;
|
|
import java.util.function.Predicate;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
+import static cn.iocoder.yudao.module.pms.framework.config.MultiThreadConfiguration.PMS_THREAD_POOL_TASK_EXECUTOR;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* @author yc
|
|
* @author yc
|
|
* @version 1.0
|
|
* @version 1.0
|
|
@@ -41,6 +48,11 @@ public class IotOperationFillJob implements JobHandler {
|
|
private IotOpeationFillMapper iotOpeationFillMapper;
|
|
private IotOpeationFillMapper iotOpeationFillMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private IotOpeationFillOrderMapper iotOpeationFillOrderMapper;
|
|
private IotOpeationFillOrderMapper iotOpeationFillOrderMapper;
|
|
|
|
+ @Resource
|
|
|
|
+ private PmsMessage pmsMessage;
|
|
|
|
+ @Resource(name = PMS_THREAD_POOL_TASK_EXECUTOR)
|
|
|
|
+ private ThreadPoolTaskExecutor pmsThreadPoolTaskExecutor;
|
|
|
|
+
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@TenantIgnore
|
|
@TenantIgnore
|
|
@@ -66,6 +78,7 @@ public class IotOperationFillJob implements JobHandler {
|
|
fillDO.setCreateTime(LocalDateTime.now());
|
|
fillDO.setCreateTime(LocalDateTime.now());
|
|
fillDO.setUserName(pd.getUserName());
|
|
fillDO.setUserName(pd.getUserName());
|
|
fillDO.setUserId(pd.getUserId());
|
|
fillDO.setUserId(pd.getUserId());
|
|
|
|
+ fillDO.setMobile(pd.getMobile());
|
|
orderList.add(fillDO);
|
|
orderList.add(fillDO);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -79,6 +92,7 @@ public class IotOperationFillJob implements JobHandler {
|
|
fillDO.setCreateTime(LocalDateTime.now());
|
|
fillDO.setCreateTime(LocalDateTime.now());
|
|
fillDO.setUserName(pd.getUserName());
|
|
fillDO.setUserName(pd.getUserName());
|
|
fillDO.setUserId(pd.getUserId());
|
|
fillDO.setUserId(pd.getUserId());
|
|
|
|
+ fillDO.setMobile(pd.getMobile());
|
|
orderList.add(fillDO);
|
|
orderList.add(fillDO);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -92,6 +106,7 @@ public class IotOperationFillJob implements JobHandler {
|
|
fillDO.setCreateTime(LocalDateTime.now());
|
|
fillDO.setCreateTime(LocalDateTime.now());
|
|
fillDO.setUserName(pd.getUserName());
|
|
fillDO.setUserName(pd.getUserName());
|
|
fillDO.setUserId(pd.getUserId());
|
|
fillDO.setUserId(pd.getUserId());
|
|
|
|
+ fillDO.setMobile(pd.getMobile());
|
|
orderList.add(fillDO);
|
|
orderList.add(fillDO);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -109,6 +124,17 @@ public class IotOperationFillJob implements JobHandler {
|
|
|
|
|
|
iotOpeationFillOrderMapper.insertBatch(orderList1);
|
|
iotOpeationFillOrderMapper.insertBatch(orderList1);
|
|
|
|
|
|
|
|
+ pmsThreadPoolTaskExecutor.execute(()->{
|
|
|
|
+ try{
|
|
|
|
+ for (IotOpeationFillOrderDO order:orderList1) {
|
|
|
|
+ pmsMessage.sendMessage(order.getId(), order.getOrderName(), PmsConstants.GENERATE_OPERATION, (long)order.getUserId(), order.getMobile());
|
|
|
|
+ }
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
for (IotOpeationFillDO device:deviceList) {
|
|
for (IotOpeationFillDO device:deviceList) {
|
|
System.out.println("deviceUser"+device.getUserId());
|
|
System.out.println("deviceUser"+device.getUserId());
|