碳银 - 逆变器告警接口对接

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

@@ -279,4 +279,11 @@ public class HouseholdTestController {
     public void tanyinCustomer() {
         tanYinDataAcquisitionService.customerInfoList();
     }
+
+    @TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+    @PostMapping(value = "/tanyin/inverAlram")
+    @ApiOperation(httpMethod = "POST", value = "电站逆变器故障接口", notes = "电站逆变器故障接口")
+    public void tanyinInverAlram() {
+        tanYinDataAcquisitionService.inverAlramInfo();
+    }
 }

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

@@ -64,6 +64,7 @@ import org.springframework.util.ObjectUtils;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
@@ -474,11 +475,16 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
                                                .put("endDate", endDate).build();
         PageInfo<TanYinAlramInfo> tanYinInveterInfo = tanYinApiUtils.postPage("电站逆变器故障信息", apiUrl + TanYinConstant.inverterAlramUrl, JSON.toJSONString(params), null, TanYinAlramInfo.class);
         List<TanYinAlramInfo> tanYinAlramInfos = tanYinInveterInfo.getList();
+        if (CollectionUtils.isEmpty(tanYinAlramInfos)) {
+            log.warn("-------碳银同步电站逆变器故障信息结束: 未获取到逆变器故障信息 ------- ");
+            return;
+        }
         for (TanYinAlramInfo tanYinAlramInfo : tanYinAlramInfos) {
             tanYinAlramInfo.setCreateTime(System.currentTimeMillis());
             tanYinAlramInfoMapper.insert(tanYinAlramInfo);
 
             HYGFJPInverterWarn hygfjpInverterWarn = new HYGFJPInverterWarn();
+            // 做查询
             hygfjpInverterWarn.setTime(System.currentTimeMillis());
             hygfjpInverterWarn.setSnCode(tanYinAlramInfo.getSn());
             hygfjpInverterWarn.setThirdStationId(jpStation.getThirdStationId());
@@ -494,14 +500,16 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             hygfjpInverterWarn.setTreatment(tanYinAlramInfo.getSolution());
             hygfjpInverterWarn.setState(tanYinAlramInfo.getStatus());
             if (!ObjectUtils.isEmpty(tanYinAlramInfo.getFaultEndTime())) {
-                hygfjpInverterWarn.setRecoverTime(Long.valueOf(tanYinAlramInfo.getFaultEndTime()));
+                Date faultEndTimeDt = Date.from(LocalDate.parse(tanYinAlramInfo.getFaultEndTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay(ZoneId.systemDefault()).toInstant());
+                hygfjpInverterWarn.setRecoverTime(faultEndTimeDt.getTime());
             }
             if (!ObjectUtils.isEmpty(tanYinAlramInfo.getFaultOccurTime())) {
-                hygfjpInverterWarn.setStartTime(Long.valueOf(tanYinAlramInfo.getFaultOccurTime()));
+                Date faultOccurTimeDt = Date.from(LocalDate.parse(tanYinAlramInfo.getFaultOccurTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay(ZoneId.systemDefault()).toInstant());
+                hygfjpInverterWarn.setStartTime(faultOccurTimeDt.getTime());
             }
             hygfjpInverterWarn.setTimeLong(null);
             if ((!ObjectUtils.isEmpty(tanYinAlramInfo.getFaultOccurTime())) && (!ObjectUtils.isEmpty(tanYinAlramInfo.getFaultEndTime()))) {
-                hygfjpInverterWarn.setTimeLong(this.convertDate(hygfjpInverterWarn.getRecoverTime()) - this.convertDate(hygfjpInverterWarn.getStartTime()));
+                 hygfjpInverterWarn.setTimeLong(this.convertDate(hygfjpInverterWarn.getRecoverTime()) - this.convertDate(hygfjpInverterWarn.getStartTime()));
             }
             if (ObjectUtils.isEmpty(hygfjpInverterWarn.getCreatedTime())) {
                 hygfjpInverterWarn.setCreatedTime(System.currentTimeMillis());