国网上送提交代码

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/PqTypicalSourceCreateDTO.java

@@ -97,4 +97,28 @@ public class PqTypicalSourceCreateDTO {
     /*平均超标天数	当统计类型是月数据、年数据时必填是否必填：*/
     private	BigDecimal	averageOvDays;
 
+
+
+    private Integer isUploadHead;
+    /*当年累计月数*/
+    private Integer monthsCount;
+    /*累计闪变超标数*/
+    private Integer flickerOvCount;
+    /*累计谐波电流超标数*/
+    private Integer harmiOvCount;
+    /*累计负序电流超标数*/
+    private Integer inseqOvCount;
+    /*累计三相不平衡超标数*/
+    private Integer unbanOvCount;
+    /*累计谐波电压超标数*/
+    private Integer harmvOvCount;
+    /*累计实现监测数量*/
+    private Integer monitorCount;
+    /*电压等级*/
+    private String voltageLevel;
+    /*累计超标总数*/
+    private Integer ovCount;
+    /*累计干扰源总数*/
+    private Integer interferenceSourceCount;
+
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java

@@ -126,4 +126,27 @@ public class PqTypicalSourceCreatePO {
      */
     @TableField(value = "is_upload_head")
     private Integer isUploadHead;
+    @TableField("monthsCount")
+    private Integer monthsCount;
+    @TableField("flickerOvCount")
+    private Integer flickerOvCount;
+    @TableField("harmiOvCount")
+    private Integer harmiOvCount;
+    @TableField("inseqOvCount")
+    private Integer inseqOvCount;
+    @TableField("unbanOvCount")
+    private Integer unbanOvCount;
+    @TableField("harmvOvCount")
+    private Integer harmvOvCount;
+    @TableField("monitorCount")
+    private Integer monitorCount;
+    @TableField("voltageLevel")
+    private String voltageLevel;
+    @TableField("ovCount")
+    private Integer ovCount;
+    @TableField("interferenceSourceCount")
+    private Integer interferenceSourceCount;
+
+
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java

@@ -124,6 +124,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
         pendingIds.forEach(temp->{
             SendParam sendParam = new SendParam();
             sendParam.setStats(temp);
+            sendParam.setStatisticalDate(temp.get(0).getStatisticalDate());
             String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT);
             log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！");
             Map<String, String> send = GwSendUtil.send(sendParam, GWSendEnum.TYPICAL_SOURCE);