From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
index a85a941..b47e05b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TFaultMessageController.java
@@ -2,9 +2,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.chargingPile.api.dto.TChargingGunDTO;
-import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.account.api.dto.SendMessageDTO;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.chargingPile.api.model.Site;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.model.TFaultMessage;
+import com.ruoyi.chargingPile.service.ISiteService;
+import com.ruoyi.chargingPile.service.TChargingPileNotificationService;
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.chargingPile.service.TFaultMessageService;
import com.ruoyi.common.core.domain.R;
@@ -14,11 +18,14 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -34,10 +41,17 @@
public class TFaultMessageController {
private final TFaultMessageService faultMessageService;
-
+ private final ISiteService siteService;
+ private final TChargingPileService chargingPileService;
+ private final TChargingPileNotificationService chargingPileNotificationService;
+ @Resource
+ private AppUserClient appUserClient;
@Autowired
- public TFaultMessageController(TFaultMessageService faultMessageService) {
+ public TFaultMessageController(TFaultMessageService faultMessageService, ISiteService siteService, TChargingPileService chargingPileService, TChargingPileNotificationService chargingPileNotificationService) {
this.faultMessageService = faultMessageService;
+ this.siteService = siteService;
+ this.chargingPileService = chargingPileService;
+ this.chargingPileNotificationService = chargingPileNotificationService;
}
/**
@@ -50,14 +64,14 @@
faultMessageService.add(dto);
return AjaxResult.success();
}
-
-
+
/**
* 获取故障信息列表
* @param siteId
* @param basePage
* @return
*/
+ @RequiresPermissions(value = {"/faultInformationList"}, logical = Logical.OR)
@ResponseBody
@GetMapping("/getFaultMessageList")
@ApiOperation(value = "获取故障信息列表数据", tags = {"管理后台-设备监控"})
@@ -69,6 +83,7 @@
}
+ @RequiresPermissions(value = {"/faultInformationList/add"}, logical = Logical.OR)
@ResponseBody
@PostMapping("/addFaultMessage")
@ApiOperation(value = "添加故障信息", tags = {"管理后台-设备监控"})
@@ -79,6 +94,7 @@
}
+ @RequiresPermissions(value = {"/faultInformationList/del"}, logical = Logical.OR)
@ResponseBody
@DeleteMapping("/delFaultMessage/{id}")
@ApiOperation(value = "删除故障信息", tags = {"管理后台-设备监控"})
@@ -96,6 +112,20 @@
@PostMapping("/createFaultMessage")
public R<String> createFaultMessage(@RequestBody TFaultMessage faultMessage){
faultMessageService.save(faultMessage);
+
+ Site site = siteService.getById(faultMessage.getSiteId());
+ TChargingPile chargingPile = chargingPileService.getById(faultMessage.getChargingPileId());
+ String siteName = site.getName();
+ SendMessageDTO sendMessageDTO = new SendMessageDTO();
+ sendMessageDTO.setPhone(site.getPhone());
+ sendMessageDTO.setSite(site.getName());
+ sendMessageDTO.setChargeGun(chargingPile.getNumber() + "");
+ sendMessageDTO.setType(3);
+ String result = appUserClient.sendMessage(sendMessageDTO).getData();
+ if(siteName.length()>10){
+ siteName = siteName.substring(0,10);
+ }
+ chargingPileNotificationService.saveData(4,faultMessage.getSiteId(),faultMessage.getChargingPileId(),site.getPhone(),"检测到"+siteName+"..."+chargingPile.getNumber()+"号桩设备离线，请及时查看处理！");
return R.ok();
}
/**
--
Gitblit v1.7.1