From cbe903c4c4493715ad8d307107fb95975acfc975 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 16:14:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
index d0f4049..1aad224 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
@@ -15,9 +15,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
-import com.smartor.common.LSHospTokenUtil;
-import com.smartor.domain.ServiceSubtask;
-import com.smartor.mapper.ServiceSubtaskMapper;
+import com.ruoyi.common.core.service.ISubtaskSmsService;
+import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -41,9 +40,6 @@
@Autowired
private ISysConfigService iSysConfigService;
-
- @Autowired
- private ServiceSubtaskMapper serviceSubtaskMapper;
@Autowired
private ISysConfigService configService;
@@ -109,10 +105,10 @@
List<SmsRecords> selectSmsRecordsList = smsRecordsMapper.selectSmsRecordsList(smsRecords);
for (SmsRecords record : selectSmsRecordsList) {
Boolean aBoolean = sendSMS(record.getOrgid(), record.getPhone(), record.getMsg());
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- serviceSubtask.setId(record.getSubId());
- if (aBoolean) serviceSubtask.setVisitNotice(1);
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ if (aBoolean) {
+ ISubtaskSmsService subtaskSmsService = SpringUtils.getBean(ISubtaskSmsService.class);
+ subtaskSmsService.updateSubtaskVisitNotice(record.getSubId(), 1);
+ }
}
return true;
@@ -137,7 +133,8 @@
}
log.info("-----------map鐨勫�间负锛歿}", msgInfo);
- String token = LSHospTokenUtil.getToken(orgid,msgInfo.get("tokenUrl"));
+ ISubtaskSmsService subtaskSmsService = SpringUtils.getBean(ISubtaskSmsService.class);
+ String token = subtaskSmsService.getLSHospToken(orgid, msgInfo.get("tokenUrl"));
log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫侊紝鍦板潃锛歿}锛屽弬鏁帮細{}锛屾満鏋処D锛歿}", msgInfo.get("address"), orgid);
String dxCode = getDXCode(msgInfo.get("address"), phone, content, msgInfo.get("sendPersonId"), msgInfo.get("sendPersonName"), MsgLSEnum.getHeaderByCode(msgInfo), token);
log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫佺粨鏋滐細{}", dxCode);
--
Gitblit v1.9.3