From 26cd0115150771d66a6cfca9c03820a734b69c9f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 十二月 2024 19:19:38 +0800
Subject: [PATCH] 合作商权限
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index fd33db0..cc000f4 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -1,16 +1,15 @@
package com.ruoyi.chargingPile.controller;
-import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.io.FileUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
import com.ruoyi.chargingPile.api.dto.TChargingGunDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.chargingPile.api.model.TFaultMessage;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
+import com.ruoyi.chargingPile.api.vo.GetChargingGunByCode;
import com.ruoyi.chargingPile.api.vo.GunStatusStatisticsVO;
import com.ruoyi.chargingPile.api.vo.SiteNameVO;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
@@ -21,14 +20,12 @@
import com.ruoyi.chargingPile.util.QRCodeUtils;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.domain.BaseDelete;
import com.ruoyi.common.core.web.page.PageInfo;
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.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.integration.api.feignClient.IntegrationClient;
-import com.ruoyi.integration.api.model.EndCharge;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -38,13 +35,11 @@
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -174,21 +169,30 @@
out.close();
inputStream.close();
- //清楚服务器上的文件
-// Process process = null;
-// try {
-// process = Runtime.getRuntime().exec("sudo rm -rf " + filePath);
-// } catch (IOException e) {
-// throw new RuntimeException(e);
-// }
-// if (process != null) {
-// process.destroy();
-// }
+ //清除服务器上的文件
+ try {
+ // 使用Runtime执行命令
+ Process process = Runtime.getRuntime().exec("sudo rm -rf " + filePath);
+ // 读取命令的输出
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ System.out.println(line);
+ }
+ // 等待命令执行完成
+ process.waitFor();
+ // 关闭流
+ reader.close();
+ } catch (IOException | InterruptedException e) {
+ e.printStackTrace();
+ }
+
}catch (Exception e){
e.printStackTrace();
}
}
-
+ @Resource
+ private TokenService tokenService;
/**
* 设备状态统计
*/
@@ -196,7 +200,7 @@
@PutMapping(value = "/gunStatusStatistics")
public R<GunStatusStatisticsVO> gunStatusStatistics() {
List<Integer> siteIds = new ArrayList<>();
- Long userId = SecurityUtils.getUserId();
+ Long userId = tokenService.getLoginUser().getUserid();
//获取当前登录的siteIds
PageInfo<GetSiteListDTO> siteList1 = siteService.getSiteList1(userId);
for (GetSiteListDTO datum : siteList1.getRecords()) {
@@ -242,10 +246,10 @@
TChargingGun chargingGun = chargingGunService.getById(id);
siteNameVO.setGunName(chargingGun.getName());
siteNameVO.setGunNumber(chargingGun.getCode());
- TChargingPile chargingPile = chargingPileService.getById(id);
+ TChargingPile chargingPile = chargingPileService.getById(chargingGun.getChargingPileId());
siteNameVO.setPileName(chargingPile.getName());
siteNameVO.setPileNumber(chargingPile.getNumber());
- Site site = siteService.getById(id);
+ Site site = siteService.getById(chargingGun.getSiteId());
siteNameVO.setSiteName(site.getName());
return R.ok(siteNameVO);
}
@@ -254,11 +258,15 @@
* @param code
* @return
*/
- @PostMapping("/getChargingGunByCode/{code}")
- public R<TChargingGun> getChargingGunByCode(@PathVariable("code") String code){
+ @PostMapping("/getChargingGunByCode")
+ public R<TChargingGun> getChargingGunByCode(@RequestBody GetChargingGunByCode code){
+ TChargingPile chargingPile = chargingPileService.getOne(new LambdaQueryWrapper<TChargingPile>()
+ .eq(TChargingPile::getCode, code.getCharging_pile_code()).eq(TChargingPile::getDelFlag, 0));
return R.ok(chargingGunService.getOne(Wrappers.lambdaQuery(TChargingGun.class)
- .eq(TChargingGun::getCode, code)
- .last("LIMIT 1")));
+ .eq(TChargingGun::getChargingPileId, chargingPile.getId())
+ .eq(TChargingGun::getCode, code.getCharging_gun_code())
+ .eq(TChargingGun::getDelFlag, 0)
+ .last("LIMIT 1")));
}
/**
* 根据枪编号获取充电枪
--
Gitblit v1.7.1