户用光伏数据采集科士达相关代码提交

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/Utils/KSolarRequestUtil.java

@@ -21,17 +21,13 @@ import java.util.List;
 @Component
 
 public class KSolarRequestUtil {
-    @Autowired
-    private AESUtils aesUtils;
-
 
     /**
      * @return HashMap<String, Object>   发送请求前的准备 准备header信息
      * @deprecated 根据厂商编码获取厂商的hearer
      */
-    public HashMap<String, Object> getHeader() {
-        HashMap<String, Object> hashMap = new HashMap<>();
-        HashMap<String, Object> requsetParams = new HashMap<>();
+    public HashMap<String, String> getHeader() {
+        HashMap<String, String> hashMap = new HashMap<>();
         String requestParam="";
         HashMap<String, String> hashMaphead = new HashMap<>();
         try {
@@ -43,6 +39,10 @@ public class KSolarRequestUtil {
         hashMaphead.put("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
         hashMaphead.put("Authorization", "Basic " + Base64.getUrlEncoder().encodeToString((KSolarConstant.authUsername + ":" + KSolarConstant.authPassword).getBytes(StandardCharsets.UTF_8)));
         String ResPonse = HttpUtil.createPost(url).headerMap(hashMaphead, false).body(requestParam).execute().body();
+        JSONObject jsonObject = JSONObject.parseObject(ResPonse);
+        jsonObject = (JSONObject) jsonObject.get("token");
+        String token= (String) jsonObject.get("access_token");
+        hashMap.put("Authorization", "Bearer "+ token);
         return hashMap;
     }
 
@@ -62,13 +62,8 @@ public class KSolarRequestUtil {
         JSONArray jsonArray = null;
         List<T> result = new ArrayList<>();
         try {
-            HashMap<String, Object> producerInfo = getHeader();
-            String baseurl = (String) producerInfo.get("apiurl");
-            HashMap<String, String> headMap = (HashMap<String, String>) producerInfo.get("header");
-            String orginalAuthorization = headMap.get("Authorization") + ":";
-            String url = baseurl + apiurl;
-            String appsecret = (String) producerInfo.get("appsecret");
-            JLYHeaderMapHandler(params, headMap, orginalAuthorization, appsecret, apiurl);
+            HashMap<String, String> headMap = getHeader();
+            String url = KSolarConstant.baseurl + apiurl;
             respone = sendRequest(requestMethod, url, requestParmInfo, headMap);
             jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
             if (!ObjectUtils.isEmpty(jsonArray)) {

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/KSolarConstant.java

@@ -8,4 +8,9 @@ public class KSolarConstant {
     public static String authUsername ="kstar";
     public static String authPassword ="kstarSecret";
 
+    public static String requestPOST="POST";
+    public static String requestGET="GET";
+    public static String stationListUrl="/station/list/info";
+    public static String resovle_rows="rows";
+
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.api.householdapi.controller;
 import com.yeejoin.amos.api.householdapi.Utils.HouseholdPvUtils;
 import com.yeejoin.amos.api.householdapi.Utils.KSolarRequestUtil;
 import com.yeejoin.amos.api.householdapi.face.service.GoLangDataAcquisitionService;
+import com.yeejoin.amos.api.householdapi.face.service.KSolarDataAcquisitionService;
 import fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,7 +33,7 @@ public class HouseholdTestController {
     @Autowired
     private GoLangDataAcquisitionService goLangDataAcquisitionService;
     @Autowired
-    private KSolarRequestUtil kSolarRequestUtil;
+    private KSolarDataAcquisitionService kSolarDataAcquisitionService;
 
 
     /**
@@ -110,13 +111,13 @@ public class HouseholdTestController {
     @PostMapping(value = "/ksolarnew")
     @ApiOperation(httpMethod = "POST", value = "科士达", notes = "科士达")
     public void ksolarnew() throws IOException {
-//        goLangDataAcquisitionService.stationList();
+        kSolarDataAcquisitionService.stationList();
 //          goLangDataAcquisitionService.stationDetail();
 //        goLangDataAcquisitionService.collectorList();
 ////        goLangDataAcquisitionService.inverterList();
 //        goLangDataAcquisitionService.collectorDetail();
 //        goLangDataAcquisitionService.inverterDetail();
 //        goLangDataAcquisitionService.inverAlramInfo();
-        kSolarRequestUtil.getHeader();
+
     }
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/KSolarStationList.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+@Data
+public class KSolarStationList {
+    private String stationId;
+    private String stationName;
+    private Integer stationType;
+    private Integer status;
+    private Double totalGeneration;
+    private String userName;
+    private Double powerInter;
+    private Double installCapacity;
+    private Double dayGeneration;
+    private Integer collects;
+    private String  address;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/KSolarDataAcquisitionService.java

+package com.yeejoin.amos.api.householdapi.face.service;
+
+public interface KSolarDataAcquisitionService {
+    /**
+     * @descrption 场站列表数据入库
+     */
+    void stationList();
+    /**
+     * @descrption 场站详情数据入库
+     */
+    void stationDetail();
+    /**
+     * @descrption 采集器列表数据入库
+     */
+    void collectorList();
+    /**
+     * @descrption 采集器详情数据入库
+     */
+    void collectorDetail();
+    /**
+     * @descrption 逆变器列表数据入库
+     */
+    void inverterList();
+    /**
+     * @descrption 逆变器详情数据入库
+     */
+    void inverterDetail();
+    /**
+     * @descrption 采集器告警列表数据入库
+     */
+    void inverAlramInfo();
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KSolarDataAcquisitionServiceImpl.java

+package com.yeejoin.amos.api.householdapi.face.service.impl;
+
+import com.yeejoin.amos.api.householdapi.Utils.KSolarRequestUtil;
+import com.yeejoin.amos.api.householdapi.constant.KSolarConstant;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.KSolarStationList;
+import com.yeejoin.amos.api.householdapi.face.service.KSolarDataAcquisitionService;
+import fastjson.JSON;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Service
+public class KSolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionService {
+    @Autowired
+    KSolarRequestUtil kSolarRequestUtil;
+    @Override
+    public void stationList() {
+        HashMap<String, Object> requestInfo = new HashMap<>();
+        String requestParaminfo = JSON.toJSONString(requestInfo);
+        List<KSolarStationList> kSolarStationListList = kSolarRequestUtil.getResPonse(
+                KSolarConstant.stationListUrl,
+                KSolarConstant.requestGET,
+                requestParaminfo,
+                KSolarConstant.resovle_rows,
+                KSolarStationList.class);
+        for (int i = 0; i < kSolarStationListList.size(); i++) {
+            KSolarStationList kSolarStationList = kSolarStationListList.get(i);
+            kSolarStationList.getStationId();
+        }
+
+    }
+
+    @Override
+    public void stationDetail() {
+
+    }
+
+    @Override
+    public void collectorList() {
+
+    }
+
+    @Override
+    public void collectorDetail() {
+
+    }
+
+    @Override
+    public void inverterList() {
+
+    }
+
+    @Override
+    public void inverterDetail() {
+
+    }
+
+    @Override
+    public void inverAlramInfo() {
+
+    }
+}