Merge remote-tracking branch 'origin/master'

xuhy

2025-01-07 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java

@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
import com.ruoyi.chargingPile.api.model.*;
@@ -117,11 +119,14 @@
   private SendMessageClient sendMessageClient;
   @Resource
   private TokenService tokenService;
   @Resource
   private TChargingPileNotificationService chargingPileNotificationService;

   @Resource
   private AppUserClient appUserClient;
   
   
	
	
	

   /**
    * 获取充电桩列表数据
    * @param page
@@ -265,8 +270,8 @@
            return AjaxResult.error("删除设备异常，请查看华为设备管理");
         }
      }
		
		


      //调用华为Iot创建设备
      AddDevice addDevice = new AddDevice();
      addDevice.setProductId("66da68d21837002b28b34ec0");
@@ -334,7 +339,7 @@
               }
               chargingPile.setIotdDeviceId("");
            }
				

         }
         this.removeById(chargingPile);
      }
@@ -703,6 +708,21 @@
               faultMessage.setDelFlag(false);
               faultMessage.setContent("设备离线");
               faultMessageService.save(faultMessage);

               // 发送故障短信
               Site site = siteService.getById(faultMessage.getSiteId());
               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()+"号桩设备离线，请及时查看处理！");

            }
         }
      }