户用光伏数据采集-同步更新mysql数据

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

@@ -45,7 +45,7 @@ public class GolangRequestUtil {
     /**
      * @return String 请求返回的response字符串
      */
-    public <T> String getResPonse(String apiurl,String requestMethod,String requestParmInfo,String ResultResolveRule,Class <T> tClass) {
+    public <T> List<T> getResPonse(String apiurl,String requestMethod,String requestParmInfo,String ResultResolveRule,Class <T> tClass) {
         String respone = "";
         String params = "";
         JSONArray jsonArray = null;
@@ -59,12 +59,7 @@ public class GolangRequestUtil {
         respone = sendRequest(requestMethod, url,requestParmInfo, headMap);
         jsonArray = handlerResponseByResultResolverule(ResultResolveRule, respone);
         List<T> result = JSONArray.parseArray(jsonArray.toJSONString(),tClass);
-        for (int i = 0; i < result.size(); i++) {
-          GolangStationList golangStationList =(GolangStationList) result.get(i);
-          golangStationList.setCreatedTime(new Date());
-          golangStationMapper.insert(golangStationList);
-        }
-        return respone;
+        return result;
     }
 
     /**

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

@@ -2,10 +2,33 @@ package com.yeejoin.amos.api.householdapi.constant;
 
 import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 
+import java.util.HashMap;
+
 public class GoLangConstant {
+    public static final HashMap<String, String> stationStaus = new HashMap<String, String>() {
+        {
+            put("1", "在线");
+            put("2", "离线");
+            put("3", "报警");
+        }
+    };
+    public static final HashMap<String, String> intoNetWorkStatus = new HashMap<String, String>() {
+        {
+            put("0", "普通并网");
+            put("1", "储能电站");
+            put("2", "AC无逆变器电站");
+            put("3", "EPM电站");
+            put("4", "内置电表");
+            put("5", "外置电表");
+        }
+    };
     public static String baseurl = "https://api.ginlong.com:13333";
     public static String tokenurl = "";
     public static String prodcerappid = "1300386381676732593";
-    public static String prodcerappsecret= "9659623b4ebe432fae5d26bdc8a10217";
+    public static String prodcerappsecret = "9659623b4ebe432fae5d26bdc8a10217";
     public static String stationListUrl = "/v1/api/userStationList";
+    public static String stationDetailUrl = "/v1/api/stationDetail";
+    public static String resovleRule_data_page_records = "data,page,records";
+    public static String resovleRule_data = "data";
+    public static String requestPost = "POST";
 }

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.api.householdapi.Utils.GolangRequestUtil;
 import com.yeejoin.amos.api.householdapi.Utils.HouseholdPvUtils;
 import com.yeejoin.amos.api.householdapi.constant.GoLangConstant;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
+import com.yeejoin.amos.api.householdapi.face.service.GoLangDataAcquisitionService;
 import fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,7 +32,7 @@ public class HouseholdTestController {
     @Autowired
     private HouseholdPvUtils householdPvUtils;
     @Autowired
-    GolangRequestUtil golangRequestUtil;
+   private GoLangDataAcquisitionService goLangDataAcquisitionService;
 
 
     /**
@@ -53,10 +54,8 @@ public class HouseholdTestController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/golangnew")
     @ApiOperation(httpMethod = "POST", value = "锦浪云", notes = "锦浪云")
-    public String golangnew() throws IOException {
-        HashMap<String,Object> requestInfo= new HashMap<>();
-        requestInfo.put("pageNo",1);
-        requestInfo.put("pageSize",100);
-        return  golangRequestUtil.getResPonse(GoLangConstant.stationListUrl,"POST",JSON.toJSONString(requestInfo),"data,page,records", GolangStationList.class);
+    public void golangnew() throws IOException {
+//        goLangDataAcquisitionService.stationList();
+        goLangDataAcquisitionService.stationDetail();
     }
 }

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

-package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 户用光伏监盘人员场站关系表
- *
- * @author system_generator
- * @date 2023-09-19
- */
-@Data
-@Accessors(chain = true)
-@TableName("hygf_jp_person_station")
-public class JpPersonStation implements Serializable  {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
-    protected Long sequenceNbr;
-
-    @TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
-    protected Date recDate;
-
-    @TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
-    protected String recUserId;
-
-    @TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
-    protected String recUserName;
-
-    /**
-     * 是否删除
-     */
-    @TableField(value = "is_delete")
-    public Boolean isDelete=false;
-
-    /**
-     * 人员id
-     */
-    @TableField("person_id")
-    private String personId;
-
-    /**
-     * 场站id
-     */
-    @TableField("station_id")
-    private Long stationId;
-
-    /**
-     * 场站名称
-     */
-    @TableField("station_name")
-    private String stationName;
-
-    /**
-     * 业主名称
-     */
-    @TableField("owner")
-    private String owner;
-
-}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpCollectorMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpCollector;
+
+public interface JpCollectorMapper extends BaseMapper<JpCollector> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpInverterElectricityMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverterElectricity;
+
+public interface JpInverterElectricityMapper extends BaseMapper<JpInverterElectricity> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpInverterMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpInverter;
+
+public interface JpInverterMapper extends BaseMapper<JpInverter> {
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/hygf/JpStationMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.hygf;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.hygf.JpStation;
+
+public interface JpStationMapper extends BaseMapper<JpStation> {
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/GolangStationMapper.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.GolangStationList;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 户用光伏-厂商API haders Mapper 接口
@@ -10,5 +13,6 @@ import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.Gola
  * @date 2023-06-07
  */
 public interface GolangStationMapper extends BaseMapper<GolangStationList> {
-
+    @Select("select id from golang_station_list group by id")
+    List<String> getStationIds();
 }

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

+package com.yeejoin.amos.api.householdapi.face.service;
+
+public interface GoLangDataAcquisitionService {
+    void stationList();
+    void stationDetail();
+}

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

@@ -32,6 +32,7 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
     private JpStationMapper jpStationMapper;
     @Autowired
     private GolangStationDetailMapper golangStationDetailMapper;
+    @Override
 
     public void stationList() {
         HashMap<String, Object> requestInfo = new HashMap<>();