修改首航采集

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

@@ -19,7 +19,7 @@ public interface SofarDataAcquisitionService {
     /**
      * @descrption 采集器列表数据入库
      */
-    void collectorList( List<SofarStationList> jsonObject);
+    void collectorList(SofarStationList jsonObject );
     /**
      * @descrption 采集器详情数据入库
      */

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

@@ -76,7 +76,8 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
     private JpCollectorMapper jpCollectorMapper;
     @Autowired
     TdJpStationMapper tdJpStationMapper;
-
+    @Autowired
+    private HYGFJPStationPowerHistoryMapper hygfjpStationPowerHistoryMapper;
     @Autowired
     private HYGFJPDayPowerMapper hygfjpDayPowerMapper;
 
@@ -274,7 +275,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 
 
 
-                    //获取月发电量
+                    //获取年发电量
                     Map<String, Object> requestInfoyn = new HashMap<>();
                     requestInfoyn.put("deviceSn", jsonObject2.get(0).getDeviceSn());
                     requestInfoyn.put("startTime",year+""  );
@@ -300,9 +301,9 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
                         if(!jsonObjectyfn.isEmpty()){
                             for (Sofarhistorical sofarhistorical : jsonObjectyfn) {
                                 if(sofarhistorical.getDataList().get(0).getKey().equals("generation")){
-                                    // 月发电量
+                                    // 年发电量
                                     jpStation.setYearGenerate(sofarhistorical.getDataList().get(0).getValue()!=null?Double.valueOf(sofarhistorical.getDataList().get(0).getValue()):null);
-                                    // 月收益
+                                    // 年月收益
                                     jpStation.setYearIncome(jpStation.getYearGenerate()!=null?jpStation.getYearGenerate()*0.45:null);
 
                                 }
@@ -343,6 +344,26 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
                         hygfjpDayPowerMapper.insert(hygfjpDayPower);
                     }
 
+
+
+
+                    HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
+                    hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
+                    hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());
+                    hygfjpStationPowerHistory.setPower(jpStation.getRealTimePower());
+                    hygfjpStationPowerHistory.setThirdCode(jpStation.getThirdCode());
+                    hygfjpStationPowerHistory.setTime(System.currentTimeMillis());
+
+
+                    //新加
+                    hygfjpStationPowerHistory.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+                    hygfjpStationPowerHistory.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+                    hygfjpStationPowerHistory.setStationName(jpStation.getName());
+                    hygfjpStationPowerHistory.setStationState(jpStation.getState());
+                    hygfjpStationPowerHistoryMapper.insert(hygfjpStationPowerHistory);
+
+
+
                     //增加td 电站区域公司，经销商绑定表
 //                    TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
 //                            eq("third_code",PVProducerInfoEnum.SH.getCode()).
@@ -494,15 +515,15 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
     }
 
     @Override
-    public void collectorList( List<SofarStationList> jsonObject) {
+    public void collectorList(SofarStationList jsonObject) {
+
 
-        for (SofarStationList sunlightDto : jsonObject) {
 
 
 
             //获取所电站下采集器
             Map<String, Object> requestInfo2 = new HashMap<>();
-            requestInfo2.put("stationId", sunlightDto.getId());
+            requestInfo2.put("stationId", jsonObject.getId());
             requestInfo2.put("deviceType", "COLLECTOR");
             String param2 = JSON.toJSONString(requestInfo2);
             List<SofarInverter> jsonObject2= requestUtil.getResPonse(
@@ -586,7 +607,7 @@ public class SofarDataAcquisitionServiceImpl implements SofarDataAcquisitionServ
 //                    hygfjpCollectorHistoryMapper.insert(hygfjpCollectorHistory);
 //                }
 
-        }
+
 
 
 

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

@@ -84,7 +84,8 @@ public class SunlightServiceImpl implements SunlightService {
     private HYGFJPInverterWarnMapper hygfjpInverterWarnMapper;
     @Autowired
     SunlightUtil SunlightUtil;
-
+    @Autowired
+    private HYGFJPStationPowerHistoryMapper hygfjpStationPowerHistoryMapper;
     @Autowired
     TdJpStationMapper tdJpStationMapper;
     @Autowired
@@ -142,9 +143,9 @@ public class SunlightServiceImpl implements SunlightService {
 
             for (int i = 0; i < list.size(); i++) {
                 SunlightDto sunlightDto=list.get(i);
-              if(i==160){
-                  System.out.println("22222");
-              }
+//              if(i==160){
+//                  System.out.println("22222");
+//              }
                // System.out.println(i+"====================================================");
                 JpStation jpStation=null;
 
@@ -332,6 +333,27 @@ public class SunlightServiceImpl implements SunlightService {
                     hygfjpDayPowerMapper.insert(hygfjpDayPower);
                 }
 
+
+                HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
+                hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
+                hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());
+                hygfjpStationPowerHistory.setPower(jpStation.getRealTimePower());
+                hygfjpStationPowerHistory.setThirdCode(jpStation.getThirdCode());
+                hygfjpStationPowerHistory.setTime(System.currentTimeMillis());
+
+
+                //新加
+                hygfjpStationPowerHistory.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+                hygfjpStationPowerHistory.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+                hygfjpStationPowerHistory.setStationName(jpStation.getName());
+                hygfjpStationPowerHistory.setStationState(jpStation.getState());
+
+
+                hygfjpStationPowerHistoryMapper.insert(hygfjpStationPowerHistory);
+
+
+
+
                 //增加td 电站区域公司，经销商绑定表
 //                TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
 //                        eq("third_code", PVProducerInfoEnum.YG.getCode()).
@@ -903,11 +925,6 @@ public class SunlightServiceImpl implements SunlightService {
 
                    }
 
-
-
-
-
-
                    try {
                        TimeUnit.MINUTES.sleep(1);
                        hygfjpInverterWarn.setCreatedTime(System.currentTimeMillis());

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/hwsms/HwSendSms.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.hwsms;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import springfox.bean.validators.plugins.schema.MinMaxAnnotationPlugin;
 
 import javax.net.ssl.*;
 import java.io.*;
@@ -151,6 +152,16 @@ public class HwSendSms {
         }
     }
 
+
+    public static void main(String[] args) {
+        String  appSecret="SnD8QvdkfDgNeLi8W2H6oDJnoNTZ";
+        String  appKey="n7F6k8BorRkog9q5n6pq315reGk8";
+        String wsseHeader = buildWsseHeader(appKey, appSecret);
+        System.out.println(wsseHeader);
+    }
+
+
+
     /**
      * 构造请求Body体
      * @param sender

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -679,7 +679,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             }
 
 
-
+            e.printStackTrace();
 
             throw new  BaseException("获取工作流节点失败！","400","获取工作流节点失败！");