From 9ce27f53094be15ee2e69c0dce31e3f324bfda99 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
index 2689841..693a746 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.ruoyi.chargingPile.api.feignClient.*;
import com.ruoyi.chargingPile.api.model.*;
-import com.ruoyi.chargingPile.api.vo.GetParkingRecord;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.StringUtils;
@@ -21,11 +20,16 @@
import com.ruoyi.other.api.domain.Operator;
import com.ruoyi.other.api.feignClient.OperatorClient;
import com.ruoyi.system.api.model.LoginUser;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
@@ -41,6 +45,7 @@
* @author zhibing.pu
* @Date 2025/1/21 17:52
*/
+@Slf4j
@RestController
@RequestMapping("/evcs/v1.0")
public class TCECController {
@@ -101,7 +106,10 @@
baseResult.setTimeStamp(mapKey);
baseResult.setSeq(String.format("%04d", integer));
//清空小于当前时间的map中的无效数据
- for (Long k : map.keySet()) {
+ Set<Long> set = map.keySet();
+ Iterator<Long> iterator = set.iterator();
+ while (iterator.hasNext()){
+ Long k = iterator.next();
if(k <= (mapKey - 10)){
map.remove(k);
}
@@ -136,6 +144,7 @@
}
Operator operator = r.getData();
+ baseResult.setOperator(operator);
baseRequest.setOperator(operator);
//校验签名
String sign = TCECUtil.buildSign(baseRequest);
@@ -144,7 +153,6 @@
baseResult.setMsg("签名校验失败");
return baseResult;
}
- baseResult.setOperator(operator);
return baseResult;
}
--
Gitblit v1.7.1