From bf1b956564de4edfc441f74adcc6268b9b14e0dc Mon Sep 17 00:00:00 2001 From: eric <465889110@qq.com> Date: Mon, 29 Sep 2025 12:07:52 +0800 Subject: [PATCH] no message --- .../com/sczx/sync/Task/DataResendTask.java | 41 +++++++++++++++++++ .../sync/mapper/OrderBatteryInfoMapper.java | 2 + .../sync/service/impl/ReceiveServiceImpl.java | 8 +++- .../service/impl/SendDataServiceImpl.java | 4 ++ .../impl/ThirdPartyForwardServiceImpl.java | 2 + src/main/resources/bootstrap.yml | 2 +- .../mapper/OrderBatteryInfoMapper.xml | 6 ++- 7 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/sczx/sync/Task/DataResendTask.java diff --git a/src/main/java/com/sczx/sync/Task/DataResendTask.java b/src/main/java/com/sczx/sync/Task/DataResendTask.java new file mode 100644 index 0000000..fd46447 --- /dev/null +++ b/src/main/java/com/sczx/sync/Task/DataResendTask.java @@ -0,0 +1,41 @@ +package com.sczx.sync.Task; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.sczx.sync.mapper.DataReceiveRecordMapper; +import com.sczx.sync.mapper.OrderBatteryInfoMapper; +import com.sczx.sync.po.DataReceivePo; +import com.sczx.sync.service.impl.SendDataServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +// 定时任务类 +@Component +public class DataResendTask { + + @Autowired + private SendDataServiceImpl sendDataService; + + @Autowired + private DataReceiveRecordMapper dataReceiveRecordMapper; + + @Autowired + private OrderBatteryInfoMapper orderBatteryInfoMapper; + + @Scheduled(fixedRate = 10000) + public void resendFailedData() { + // 查询所有发送失败的记录 + List failedRecords = dataReceiveRecordMapper.selectList(new QueryWrapper().eq("status", 3)); + + for (DataReceivePo record : failedRecords) { + if (record.getDataType().equals("batteryorder")){ + String status = orderBatteryInfoMapper.selectOrderStatus(record.getCid()); + if (status.equals("RENT_ING")){ + sendDataService.retryForward(record.getId()); + } + } + } + } +} diff --git a/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java b/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java index 4244385..f87e995 100644 --- a/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java +++ b/src/main/java/com/sczx/sync/mapper/OrderBatteryInfoMapper.java @@ -19,4 +19,6 @@ public interface OrderBatteryInfoMapper extends BaseMapper { * @return 电池订单信息 */ OrderBatteryInfo selectOrderBatteryInfoById(@Param("id") Long id); + + String selectOrderStatus(@Param("suborderId") Long suborderId); } diff --git a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java index 03e1353..9c43860 100644 --- a/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/ReceiveServiceImpl.java @@ -12,6 +12,7 @@ import com.sczx.sync.service.ReceiveService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -24,6 +25,7 @@ import java.util.Map; @Slf4j @Service @Component +@RefreshScope public class ReceiveServiceImpl implements ReceiveService { @@ -302,7 +304,11 @@ public class ReceiveServiceImpl implements ReceiveService { if (companyInfoMapper.selectByOpId(companyInfo.getOperator_id()) != null) { companyInfoMapper.updateByOpId(companyInfo); - } else { + } else if (companyInfoMapper.selectByPhone(companyInfo.getPhone()) != null){ + map.put("msg", "平台已存在该联系电话运营商，请联系系统管理员处理"); + map.put("code", "500"); + return map; + }else { companyInfoMapper.insertCompanyInfo(companyInfo); } List userIds = noticeMapper.selectOpIds(); diff --git a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java index cb7ab88..b2ba4cd 100644 --- a/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/SendDataServiceImpl.java @@ -13,6 +13,7 @@ import com.sczx.sync.service.ThirdPartyForwardService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -24,6 +25,7 @@ import java.util.*; @Slf4j @Service @Component +@RefreshScope public class SendDataServiceImpl implements SendDataService { @Autowired @@ -333,6 +335,8 @@ public class SendDataServiceImpl implements SendDataService { // 保存接收记录 DataReceivePo record = new DataReceivePo(); record.setCid( id); + record.setAppId(appId); + record.setAccessToken(accessToken); record.setDataType(dataType); record.setRequestData(JSON.toJSONString(request.getData())); record.setRequestTime(LocalDateTime.now()); diff --git a/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java b/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java index f50213a..810c407 100644 --- a/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java +++ b/src/main/java/com/sczx/sync/service/impl/ThirdPartyForwardServiceImpl.java @@ -13,6 +13,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Service; import java.nio.charset.StandardCharsets; @@ -26,6 +27,7 @@ import java.util.Map; */ @Slf4j @Service +@RefreshScope public class ThirdPartyForwardServiceImpl implements ThirdPartyForwardService { @Value("${third-party.platform.api-url}") diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index bb46a8e..9cc899d 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ spring: name: sczx-sync # 应用名称，对应 Nacos 配置的 dataId cloud: nacos: - server-addr: 115.190.8.52:8848 # Nacos 服务器地址 + server-addr: 127.0.0.1:8848 # Nacos 服务器地址 config: group: DEFAULT_GROUP # 配置分组 file-extension: yaml # 配置文件格式 diff --git a/src/main/resources/mapper/OrderBatteryInfoMapper.xml b/src/main/resources/mapper/OrderBatteryInfoMapper.xml index 78c1378..b32b4c7 100644 --- a/src/main/resources/mapper/OrderBatteryInfoMapper.xml +++ b/src/main/resources/mapper/OrderBatteryInfoMapper.xml @@ -41,5 +41,9 @@ and zom.store_id = zcs.id and zos.suborder_id = #{id} - + + +