1
This commit is contained in:
@@ -7,12 +7,13 @@ import com.ruoyi.jarvis.service.ITencentDocDelayedPushService;
|
|||||||
import com.ruoyi.jarvis.service.ITencentDocTokenService;
|
import com.ruoyi.jarvis.service.ITencentDocTokenService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.http.*;
|
import org.springframework.context.ApplicationContext;
|
||||||
|
import org.springframework.context.ApplicationContextAware;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
import org.springframework.web.client.RestTemplate;
|
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
import javax.annotation.PostConstruct;
|
||||||
import javax.annotation.PreDestroy;
|
import javax.annotation.PreDestroy;
|
||||||
@@ -33,7 +34,7 @@ import java.util.concurrent.TimeUnit;
|
|||||||
* @author system
|
* @author system
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class TencentDocDelayedPushServiceImpl implements ITencentDocDelayedPushService {
|
public class TencentDocDelayedPushServiceImpl implements ITencentDocDelayedPushService, ApplicationContextAware {
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(TencentDocDelayedPushServiceImpl.class);
|
private static final Logger log = LoggerFactory.getLogger(TencentDocDelayedPushServiceImpl.class);
|
||||||
|
|
||||||
@@ -49,7 +50,7 @@ public class TencentDocDelayedPushServiceImpl implements ITencentDocDelayedPushS
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ITencentDocTokenService tokenService;
|
private ITencentDocTokenService tokenService;
|
||||||
|
|
||||||
private final RestTemplate restTemplate = new RestTemplate();
|
private ApplicationContext applicationContext;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 延迟时间(分钟),可通过配置文件修改
|
* 延迟时间(分钟),可通过配置文件修改
|
||||||
@@ -77,6 +78,11 @@ public class TencentDocDelayedPushServiceImpl implements ITencentDocDelayedPushS
|
|||||||
*/
|
*/
|
||||||
private ScheduledExecutorService scheduler;
|
private ScheduledExecutorService scheduler;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
|
||||||
|
this.applicationContext = applicationContext;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化定时任务
|
* 初始化定时任务
|
||||||
*/
|
*/
|
||||||
@@ -290,26 +296,30 @@ public class TencentDocDelayedPushServiceImpl implements ITencentDocDelayedPushS
|
|||||||
);
|
);
|
||||||
log.info("✓ 创建批量推送记录,批次ID: {}", batchId);
|
log.info("✓ 创建批量推送记录,批次ID: {}", batchId);
|
||||||
|
|
||||||
// 使用RestTemplate调用本地Controller(内部调用,无需认证)
|
// 直接通过 ApplicationContext 获取 Controller Bean 并调用方法
|
||||||
String url = "http://localhost:30313/jarvis-api/jarvis/tendoc/fillLogisticsByOrderNo?batchId=" + batchId;
|
// 这样避免了 HTTP 调用,是后端内部方法调用
|
||||||
|
|
||||||
HttpHeaders headers = new HttpHeaders();
|
|
||||||
headers.setContentType(MediaType.APPLICATION_JSON);
|
|
||||||
|
|
||||||
// 构造请求体
|
|
||||||
String requestBody = "{}";
|
|
||||||
|
|
||||||
HttpEntity<String> request = new HttpEntity<>(requestBody, headers);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
log.info("调用批量同步API: {}", url);
|
log.info("开始调用批量同步方法(后端内部调用)...");
|
||||||
ResponseEntity<String> response = restTemplate.postForEntity(url, request, String.class);
|
|
||||||
|
|
||||||
log.info("批量同步调用完成,HTTP状态码: {}", response.getStatusCodeValue());
|
// 获取 TencentDocController Bean
|
||||||
log.info("批量同步结果: {}", response.getBody());
|
Object controller = applicationContext.getBean("tencentDocController");
|
||||||
|
|
||||||
// 注意:由于是内部调用,401错误说明需要添加@Anonymous注解
|
// 通过反射调用 fillLogisticsByOrderNo 方法
|
||||||
// 暂时记录日志,后续需要修改Controller添加@Anonymous注解
|
java.lang.reflect.Method method = controller.getClass().getMethod(
|
||||||
|
"fillLogisticsByOrderNo",
|
||||||
|
java.util.Map.class
|
||||||
|
);
|
||||||
|
|
||||||
|
// 构造参数
|
||||||
|
java.util.Map<String, Object> params = new java.util.HashMap<>();
|
||||||
|
params.put("batchId", batchId);
|
||||||
|
params.put("fileId", fileId);
|
||||||
|
params.put("sheetId", sheetId);
|
||||||
|
|
||||||
|
// 调用方法
|
||||||
|
Object result = method.invoke(controller, params);
|
||||||
|
|
||||||
|
log.info("✓ 批量同步执行完成,结果: {}", result);
|
||||||
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
log.error("批量同步调用失败", ex);
|
log.error("批量同步调用失败", ex);
|
||||||
|
|||||||
Reference in New Issue
Block a user