碳银数据对接

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

@@ -21,6 +21,10 @@ import lombok.NoArgsConstructor;
 @TableName (value = "tanyin_alram_info", autoResultMap = true)
 public class TanYinAlramInfo {
 
+    @ApiModelProperty ("唯一序号")
+    @TableField ("id")
+    private String id;
+
     @ApiModelProperty ("项目编号")
     @TableField ("project_no")
     private String projectNo;

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

@@ -178,7 +178,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
     @Override
     public void customerInfoList() {
         try {
-            String startDate = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            String startDate = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             String endDate = LocalDate.now().plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             log.info("-------碳银同步项目信息开始: {} ------- ", sdf.format(new Date()));
             Map<String, Object> params = MapBuilder.<String, Object>create()
@@ -465,7 +465,7 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
         if (jpInverter == null || StringUtils.isEmpty(jpInverter.getSnCode())) {
             return;
         }
-        String startDate = LocalDate.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String startDate = LocalDate.now().minusWeeks(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         String endDate = LocalDate.now().plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         Map<String, Object> params = MapBuilder.<String, Object>create()
                                                .put("sn", jpInverter.getSnCode())
@@ -483,13 +483,19 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
             tanYinAlramInfo.setCreateTime(System.currentTimeMillis());
             tanYinAlramInfoMapper.insert(tanYinAlramInfo);
 
-            HYGFJPInverterWarn hygfjpInverterWarn = new HYGFJPInverterWarn();
+            HYGFJPInverterWarn hygfjpInverterWarn = hygfjpInverterWarnMapper
+                    .selectOne(new QueryWrapper<HYGFJPInverterWarn>().eq("sn_code", tanYinAlramInfo.getSn())
+                                                                     .eq("warn_id", tanYinAlramInfo.getId())
+                                                                     .eq("third_station_id", String.valueOf(tanYinAlramInfo.getProjectNo())));
+            if (com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(hygfjpInverterWarn)) {
+                hygfjpInverterWarn = new HYGFJPInverterWarn();
+            }
             // 做查询
             hygfjpInverterWarn.setTime(System.currentTimeMillis());
             hygfjpInverterWarn.setSnCode(tanYinAlramInfo.getSn());
             hygfjpInverterWarn.setThirdStationId(jpStation.getThirdStationId());
             hygfjpInverterWarn.setLevel(tanYinAlramInfo.getLevel());
-            hygfjpInverterWarn.setWarnId(tanYinAlramInfo.getCode());
+            hygfjpInverterWarn.setWarnId(tanYinAlramInfo.getId());
             hygfjpInverterWarn.setAmosCompanyCode(jpStation.getAmosCompanyCode());
             hygfjpInverterWarn.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
             hygfjpInverterWarn.setStationName(jpStation.getName());
@@ -827,7 +833,6 @@ public class TanYinDataAcquisitionServiceImpl implements TanYinDataAcquisitionSe
                 tdHYGFInverterTotalGenerateMapper.insert(tdHYGFInverterTotalGenerate);
             }
 
-            inverAlramInfo(jpInverter, jpStation);
         }
 
     }