From ae84ae528290f44c66ef14c92f4a68bd3c1ce617 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 十一月 2024 08:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
index 6ddc88c..c219fc5 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.dto.SendMessageDTO;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingPile;
@@ -63,6 +65,8 @@
@Resource
private SysUserRoleClient sysUserRoleClient;
+ @Resource
+ private AppUserClient appUserClient;
@Override
public void add(TFaultMessage dto) {
@@ -70,8 +74,14 @@
Site site = siteService.getById(dto.getSiteId());
TChargingPile chargingPile = chargingPileService.getById(dto.getChargingPileId());
String siteName = site.getName();
- String reqStr = MsgUtil.faultMsg(site.getPhone(), site.getName(), chargingPile.getNumber() + "");
- String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+// String reqStr = MsgUtil.faultMsg(site.getPhone(), site.getName(), chargingPile.getNumber() + "");
+// String result = HttpUtils.post(MsgConstants.SEND_URL, reqStr);
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(site.getPhone());
+ sendMessageDTO.setCode(site.getName());
+ sendMessageDTO.setChargeGun(chargingPile.getNumber() + "");
+ sendMessageDTO.setType(3);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
log.info("故障短信提醒：{}",result);
if(siteName.length()>10){
siteName = siteName.substring(0,10);
--
Gitblit v1.7.1