恢复xxl
This commit is contained in:
+5
-5
@@ -80,11 +80,11 @@
|
|||||||
<artifactId>opencc4j</artifactId>
|
<artifactId>opencc4j</artifactId>
|
||||||
<version>1.8.1</version>
|
<version>1.8.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<!-- <dependency>-->
|
||||||
<groupId>com.xuxueli</groupId>
|
<!-- <groupId>com.xuxueli</groupId>-->
|
||||||
<artifactId>xxl-job-core</artifactId>
|
<!-- <artifactId>xxl-job-core</artifactId>-->
|
||||||
<version>2.4.0</version>
|
<!-- <version>2.4.0</version>-->
|
||||||
</dependency>
|
<!-- </dependency>-->
|
||||||
<!-- Mhd Common Log -->
|
<!-- Mhd Common Log -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.mhd</groupId>
|
<groupId>com.mhd</groupId>
|
||||||
|
|||||||
+6
-6
@@ -208,9 +208,9 @@ public class HandoverTaskOrderApplicationService {
|
|||||||
public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO){
|
public Boolean completeHandover(HandoverTaskOrderDO handoverTaskOrderDO){
|
||||||
Boolean result = handoverTaskOrderDomainService.completeHandover(handoverTaskOrderDO);
|
Boolean result = handoverTaskOrderDomainService.completeHandover(handoverTaskOrderDO);
|
||||||
List<MaterialInventoryParamDO> clearoutParamDOs = handoverTaskOrderDomainService.getLastClearoutParamDOs();
|
List<MaterialInventoryParamDO> clearoutParamDOs = handoverTaskOrderDomainService.getLastClearoutParamDOs();
|
||||||
for (MaterialInventoryParamDO paramDO : clearoutParamDOs) {
|
// for (MaterialInventoryParamDO paramDO : clearoutParamDOs) {
|
||||||
materialInventoryApplicationService.pushBillingRecordClearout(paramDO.getMaterialInventoryId(), paramDO.getQuantity());
|
// materialInventoryApplicationService.pushBillingRecordClearout(paramDO.getMaterialInventoryId(), paramDO.getQuantity());
|
||||||
}
|
// }
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -309,9 +309,9 @@ public class HandoverTaskOrderApplicationService {
|
|||||||
completeDO.setBillingJson(handoverTaskOrderDO.getBillingJson());
|
completeDO.setBillingJson(handoverTaskOrderDO.getBillingJson());
|
||||||
handoverTaskOrderDomainService.completeHandover(completeDO);
|
handoverTaskOrderDomainService.completeHandover(completeDO);
|
||||||
List<MaterialInventoryParamDO> clearoutParamDOs = handoverTaskOrderDomainService.getLastClearoutParamDOs();
|
List<MaterialInventoryParamDO> clearoutParamDOs = handoverTaskOrderDomainService.getLastClearoutParamDOs();
|
||||||
for (MaterialInventoryParamDO paramDO : clearoutParamDOs) {
|
// for (MaterialInventoryParamDO paramDO : clearoutParamDOs) {
|
||||||
materialInventoryApplicationService.pushBillingRecordClearout(paramDO.getMaterialInventoryId(), paramDO.getQuantity());
|
// materialInventoryApplicationService.pushBillingRecordClearout(paramDO.getMaterialInventoryId(), paramDO.getQuantity());
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,46 +9,46 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
/**
|
/**
|
||||||
* XXL-JOB 配置类
|
* XXL-JOB 配置类
|
||||||
*/
|
*/
|
||||||
@Configuration
|
//@Configuration
|
||||||
public class XxlJobConfig {
|
public class XxlJobConfig {
|
||||||
private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
|
// private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
|
||||||
|
//
|
||||||
@Value("${xxl.job.admin.addresses}")
|
// @Value("${xxl.job.admin.addresses}")
|
||||||
private String adminAddresses;
|
// private String adminAddresses;
|
||||||
|
//
|
||||||
@Value("${xxl.job.accessToken}")
|
// @Value("${xxl.job.accessToken}")
|
||||||
private String accessToken;
|
// private String accessToken;
|
||||||
|
//
|
||||||
@Value("${xxl.job.executor.appname}")
|
// @Value("${xxl.job.executor.appname}")
|
||||||
private String appname;
|
// private String appname;
|
||||||
|
//
|
||||||
@Value("${xxl.job.executor.address}")
|
// @Value("${xxl.job.executor.address}")
|
||||||
private String address;
|
// private String address;
|
||||||
|
//
|
||||||
@Value("${xxl.job.executor.ip}")
|
// @Value("${xxl.job.executor.ip}")
|
||||||
private String ip;
|
// private String ip;
|
||||||
|
//
|
||||||
@Value("${xxl.job.executor.port}")
|
// @Value("${xxl.job.executor.port}")
|
||||||
private int port;
|
// private int port;
|
||||||
|
//
|
||||||
@Value("${xxl.job.executor.logpath}")
|
// @Value("${xxl.job.executor.logpath}")
|
||||||
private String logPath;
|
// private String logPath;
|
||||||
|
//
|
||||||
@Value("${xxl.job.executor.logretentiondays}")
|
// @Value("${xxl.job.executor.logretentiondays}")
|
||||||
private int logRetentionDays;
|
// private int logRetentionDays;
|
||||||
|
//
|
||||||
@Bean
|
// @Bean
|
||||||
public XxlJobSpringExecutor xxlJobExecutor() {
|
// public XxlJobSpringExecutor xxlJobExecutor() {
|
||||||
logger.info(">>>>>>>>>>> xxl-job config init.");
|
// logger.info(">>>>>>>>>>> xxl-job config init.");
|
||||||
XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
|
// XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
|
||||||
xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
|
// xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
|
||||||
xxlJobSpringExecutor.setAppname(appname);
|
// xxlJobSpringExecutor.setAppname(appname);
|
||||||
xxlJobSpringExecutor.setAddress(address);
|
// xxlJobSpringExecutor.setAddress(address);
|
||||||
xxlJobSpringExecutor.setIp(ip);
|
// xxlJobSpringExecutor.setIp(ip);
|
||||||
xxlJobSpringExecutor.setPort(port);
|
// xxlJobSpringExecutor.setPort(port);
|
||||||
xxlJobSpringExecutor.setAccessToken(accessToken);
|
// xxlJobSpringExecutor.setAccessToken(accessToken);
|
||||||
xxlJobSpringExecutor.setLogPath(logPath);
|
// xxlJobSpringExecutor.setLogPath(logPath);
|
||||||
xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
|
// xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
|
||||||
return xxlJobSpringExecutor;
|
// return xxlJobSpringExecutor;
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user