From b0973e131a3bb52aa3b6f0965f42ad4dc93093e3 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Sat, 27 May 2023 16:31:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=81=94=E8=81=94=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/lianlian/LianLianController.java  |  6 ++++--
 .../lianlian/service/LianLianService.java     |  2 +-
 .../service/impl/LianLianServiceImpl.java     | 20 +++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java
index 30d0b406c..cbf2f12bd 100644
--- a/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/lianlian/LianLianController.java
@@ -16,6 +16,7 @@ import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
 import com.jsowell.thirdparty.lianlian.util.Cryptos;
 import com.jsowell.thirdparty.lianlian.util.Encodes;
+import com.jsowell.thirdparty.lianlian.util.SignUtils;
 import com.jsowell.thirdparty.lianlian.vo.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -360,8 +361,9 @@ public class LianLianController extends BaseController {
             String dataStr = new String(plainText, "UTF-8");
             // 转换成相应对象
             QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
-            LianLianPageResponse response = lianLianService.query_stations_info(queryStationInfoDTO);
-            return CommonResult.success(response);
+            Map<String, String> map = lianLianService.query_stations_info(dto.getOperatorID(), queryStationInfoDTO);
+
+            return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig"));
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java
index 0b16c2bf6..d0411cd74 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java
@@ -28,7 +28,7 @@ public interface LianLianService {
 	 * @param dto
 	 * @return
 	 */
-	LianLianPageResponse query_stations_info(QueryStationInfoDTO dto);
+	Map<String, String> query_stations_info(String operatorId, QueryStationInfoDTO dto);
 
 	/**
 	 * 设备接口状态查询
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
index 8ecb606bd..56f96fba0 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java
@@ -211,7 +211,7 @@ public class LianLianServiceImpl implements LianLianService {
      * @return
      */
     @Override
-    public LianLianPageResponse query_stations_info(QueryStationInfoDTO dto) {
+    public Map<String, String> query_stations_info(String operatorId, QueryStationInfoDTO dto) {
         List<StationInfo> resultList = new ArrayList<>();
         int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo();
         int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
@@ -222,6 +222,10 @@ public class LianLianServiceImpl implements LianLianService {
             // 未查到数据
             return null;
         }
+        DockingPlatformConfig configInfo = dockingPlatformConfigService.getInfoByOperatorId(operatorId);
+        if (configInfo == null) {
+            return null;
+        }
         PageInfo<PileStationInfo> pageInfo = new PageInfo<>(stationInfos);
         for (PileStationInfo pileStationInfo : pageInfo.getList()) {
             StationInfo stationInfo = new StationInfo();
@@ -272,7 +276,19 @@ public class LianLianServiceImpl implements LianLianService {
                 .ItemSize(resultList.size())
                 .list(resultList)
                 .build();
-        return pageResponse;
+        // 加密
+        Map<String, String> resultMap = Maps.newLinkedHashMap();
+        // 加密数据
+        byte[] encryptText = Cryptos.aesEncrypt(JSONObject.toJSONString(pageResponse).getBytes(),
+                configInfo.getOperatorSecret().getBytes(), configInfo.getDataSecretIv().getBytes());
+        String encryptData = Encodes.encodeBase64(encryptText);
+
+        resultMap.put("Data", encryptData);
+        // 生成sig
+        String resultSign = GBSignUtils.sign(resultMap, configInfo.getOperatorSecret());
+        resultMap.put("Sig", resultSign);
+
+        return resultMap;
     }
 
     /**