修改区间曲线偏差1、2、3、4、5、6表写入事件

realtime/generationXK-service/src/main/java/com/gyee/generation/GenerationMain.java

@@ -1,15 +1,9 @@
 package com.gyee.generation;
 
-import com.gyee.common.util.DateUtils;
-import com.gyee.generation.service.PowerCurveFittingByTimeService;
-import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import java.util.Calendar;
-import java.util.Date;
-
 /**
  * @ClassName : GenerationMain
  * @Author : xieshengjie
@@ -55,52 +49,61 @@ public class GenerationMain {
 //            inputOrOutPutService.inputOrOutputSpeed(new Date());
 //        }
 
-        Date date =new Date();
-//        WindPowerInfo1Service windPowerInfo1Service= SpringUtils.getBean("windPowerInfo1Service");
-//
-//
-//
-//        windPowerInfo1Service.calLineInfoDay(date);
-//        windPowerInfo1Service.calProjectInfoDay(date);
-//        windPowerInfo1Service.calWindpowerInfoDay(date);
-//        windPowerInfo1Service.calCompanyInfoDay(date);
-//        windPowerInfo1Service.calRegionInfoDay(date);
-//
-//        WindPowerInfo2Service windPowerInfo2Service= SpringUtils.getBean("windPowerInfo2Service");
-//        windPowerInfo2Service.calLineInfoDay(date);
-//        windPowerInfo2Service.calProjectInfoDay(date);
-//        windPowerInfo2Service.calWindpowerInfoDay(date);
-//        windPowerInfo2Service.calCompanyInfoDay(date);
-//        windPowerInfo2Service.calRegionInfoDay(date);
-//
-//        WindPowerInfo3Service windPowerInfo3Service= SpringUtils.getBean("windPowerInfo3Service");
-//        windPowerInfo3Service.calLineInfoDay(date);
-//        windPowerInfo3Service.calProjectInfoDay(date);
-//        windPowerInfo3Service.calWindpowerInfoDay(date);
-//        windPowerInfo3Service.calCompanyInfoDay(date);
-//        windPowerInfo3Service.calRegionInfoDay(date);
-//
-//        WindPowerInfo4Service windPowerInfo4Service= SpringUtils.getBean("windPowerInfo4Service");
-//        windPowerInfo4Service.calLineInfoDay(date);
-//        windPowerInfo4Service.calProjectInfoDay(date);
-//        windPowerInfo4Service.calWindpowerInfoDay(date);
-//        windPowerInfo4Service.calCompanyInfoDay(date);
-//        windPowerInfo4Service.calRegionInfoDay(date);
-//
-//        WindPowerInfo5Service windPowerInfo5Service= SpringUtils.getBean("windPowerInfo5Service");
-//        windPowerInfo5Service.calLineInfoDay(date);
-//        windPowerInfo5Service.calProjectInfoDay(date);
-//        windPowerInfo5Service.calWindpowerInfoDay(date);
-//        windPowerInfo5Service.calCompanyInfoDay(date);
-//        windPowerInfo5Service.calRegionInfoDay(date);
-//
-//        WindPowerInfo6Service windPowerInfo6Service= SpringUtils.getBean("windPowerInfo6Service");
-//        windPowerInfo6Service.calLineInfoDay(date);
-//        windPowerInfo6Service.calProjectInfoDay(date);
-//        windPowerInfo6Service.calWindpowerInfoDay(date);
-//        windPowerInfo6Service.calCompanyInfoDay(date);
-//        windPowerInfo6Service.calRegionInfoDay(date);
+//        Date date =new Date();
+//
+//        Calendar c=Calendar.getInstance();
 //
+//        c.set(Calendar.DAY_OF_MONTH,20);
+//        Date date =c.getTime();
+//        for(int i=0;i<4;i++)
+//        {
+//            WindPowerInfo1Service windPowerInfo1Service= SpringUtils.getBean("windPowerInfo1Service");
+//
+//            windPowerInfo1Service.calLineInfoDay(date);
+//            windPowerInfo1Service.calProjectInfoDay(date);
+//            windPowerInfo1Service.calWindpowerInfoDay(date);
+//            windPowerInfo1Service.calCompanyInfoDay(date);
+//            windPowerInfo1Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo2Service windPowerInfo2Service= SpringUtils.getBean("windPowerInfo2Service");
+//            windPowerInfo2Service.calLineInfoDay(date);
+//            windPowerInfo2Service.calProjectInfoDay(date);
+//            windPowerInfo2Service.calWindpowerInfoDay(date);
+//            windPowerInfo2Service.calCompanyInfoDay(date);
+//            windPowerInfo2Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo3Service windPowerInfo3Service= SpringUtils.getBean("windPowerInfo3Service");
+//            windPowerInfo3Service.calLineInfoDay(date);
+//            windPowerInfo3Service.calProjectInfoDay(date);
+//            windPowerInfo3Service.calWindpowerInfoDay(date);
+//            windPowerInfo3Service.calCompanyInfoDay(date);
+//            windPowerInfo3Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo4Service windPowerInfo4Service= SpringUtils.getBean("windPowerInfo4Service");
+//            windPowerInfo4Service.calLineInfoDay(date);
+//            windPowerInfo4Service.calProjectInfoDay(date);
+//            windPowerInfo4Service.calWindpowerInfoDay(date);
+//            windPowerInfo4Service.calCompanyInfoDay(date);
+//            windPowerInfo4Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo5Service windPowerInfo5Service= SpringUtils.getBean("windPowerInfo5Service");
+//            windPowerInfo5Service.calLineInfoDay(date);
+//            windPowerInfo5Service.calProjectInfoDay(date);
+//            windPowerInfo5Service.calWindpowerInfoDay(date);
+//            windPowerInfo5Service.calCompanyInfoDay(date);
+//            windPowerInfo5Service.calRegionInfoDay(date);
+//
+//            WindPowerInfo6Service windPowerInfo6Service= SpringUtils.getBean("windPowerInfo6Service");
+//            windPowerInfo6Service.calLineInfoDay(date);
+//            windPowerInfo6Service.calProjectInfoDay(date);
+//            windPowerInfo6Service.calWindpowerInfoDay(date);
+//            windPowerInfo6Service.calCompanyInfoDay(date);
+//            windPowerInfo6Service.calRegionInfoDay(date);
+//
+//            c.add(Calendar.DAY_OF_MONTH,1);
+//            date =c.getTime();
+//        }
+
 //        EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
 //        equipmentInfo1Service.calEquipmentInfoDay(date);
 //        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
@@ -111,19 +114,18 @@ public class GenerationMain {
 //        equipmentInfo4Service.calEquipmentInfoDay(date);
 //        EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
 //        equipmentInfo5Service.calEquipmentInfoDay(date);
-
 //        EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
 //        equipmentInfoDayTopService.calEquipmentInfoDayTop(new Date());
-        Calendar c=Calendar.getInstance();
-        c.set(Calendar.MONTH,7);
-        c.set(Calendar.DAY_OF_MONTH,31);
-        PowerCurveFittingByTimeService powerCurveFittingByTimeService= SpringUtils.getBean("powerCurveFittingByTimeService");
-//        powerCurveFittingByTimeService.cureFittingDay(c.getTime());
-        powerCurveFittingByTimeService.cureFittingMonth(c.getTime(),"0");
-//        powerCurveFittingByTimeService.cureFittingYear(c.getTime());
-        Date end=new Date();
-        System.out.println("执行用时"+ DateUtils.secondsDiff(date,end) +"秒");
-        System.out.println("计算完成");
+//        Calendar c=Calendar.getInstance();
+//        c.set(Calendar.MONTH,7);
+//        c.set(Calendar.DAY_OF_MONTH,31);
+//        PowerCurveFittingByTimeService powerCurveFittingByTimeService= SpringUtils.getBean("powerCurveFittingByTimeService");
+////        powerCurveFittingByTimeService.cureFittingDay(c.getTime());
+//        powerCurveFittingByTimeService.cureFittingMonth(c.getTime(),"0");
+////        powerCurveFittingByTimeService.cureFittingYear(c.getTime());
+//        Date end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(date,end) +"秒");
+//        System.out.println("计算完成");
 //
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();

realtime/generationXK-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -29,7 +29,7 @@ public class CacheContext implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(CacheContext.class);
 
     @Resource
-    private IProBasicEquipmentService proBasicWindturbineService;
+    private IProBasicEquipmentService proBasicEquipmentService;
     @Resource
     private IProBasicLineService proBasicLineService;
     @Resource
@@ -251,7 +251,7 @@ public class CacheContext implements CommandLineRunner {
         }
 
 
-        wtls = proBasicWindturbineService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsable()==1).collect(Collectors.toList());
+        wtls = proBasicEquipmentService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsable()==1).collect(Collectors.toList());
         logger.info(wtls.size()+"");
         wtls.forEach(wt->{
             if(modelMap.containsKey(wt.getModelId()))

realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/AjaxResult.java

@@ -0,0 +1,104 @@
+package com.gyee.generation.model.vo;
+
+import java.util.HashMap;
+
+/**
+* @ClassName: AjaxResult
+* @Description: ajax操作消息提醒
+* @author gyee
+* @date 2018年8月18日
+*
+ */
+public class AjaxResult extends HashMap<String, Object>
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 初始化一个新创建的 Message 对象
+     */
+    public AjaxResult()
+    {
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @return 错误消息
+     */
+    public static AjaxResult error()
+    {
+        return error(1, "操作失败");
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param msg 内容
+     * @return 错误消息
+     */
+    public static AjaxResult error(String msg)
+    {
+        return error(500, msg);
+    }
+
+    /**
+     * 返回错误消息
+     * 
+     * @param code 错误码
+     * @param msg 内容
+     * @return 错误消息
+     */
+    public static AjaxResult error(int code, String msg)
+    {
+        AjaxResult json = new AjaxResult();
+        json.put("code", code);
+        json.put("msg", msg);
+        return json;
+    }
+
+    /**
+     * 返回成功消息
+     * 
+     * @param msg 内容
+     * @return 成功消息
+     */
+    public static AjaxResult success(String msg)
+    {
+        AjaxResult json = new AjaxResult();
+        json.put("msg", msg);
+        json.put("code", 200);
+        return json;
+    }
+    
+    /**
+     * 返回成功消息
+     * 
+     * @return 成功消息
+     */
+    public static AjaxResult success()
+    {
+        return AjaxResult.success("操作成功");
+    }
+    
+    public static AjaxResult successData(int code, Object value){
+    	 AjaxResult json = new AjaxResult();
+    	 json.put("code", code);
+         json.put("data", value);
+         return json;
+    }
+   
+    
+    /**
+     * 返回成功消息
+     * 
+     * @param key 键值
+     * @param value 内容
+     * @return 成功消息
+     */
+    @Override
+    public AjaxResult put(String key, Object value)
+    {
+        super.put(key, value);
+        return this;
+    }
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/Tablepar.java

@@ -0,0 +1,45 @@
+package com.gyee.generation.model.vo;
+
+/**
+ * boostrap table post 参数
+ * @author fc
+ *
+ */
+public class Tablepar {
+	private int pageNum;//页码
+	private int pageSize;//数量
+	private String orderByColumn;//排序字段
+	private String isAsc;//排序字符 asc desc 
+	private String searchText;//列表table里面的搜索
+	public int getPageNum() {
+		return pageNum;
+	}
+	public void setPageNum(int pageNum) {
+		this.pageNum = pageNum;
+	}
+	public int getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public String getOrderByColumn() {
+		return orderByColumn;
+	}
+	public void setOrderByColumn(String orderByColumn) {
+		this.orderByColumn = orderByColumn;
+	}
+	public String getIsAsc() {
+		return isAsc;
+	}
+	public void setIsAsc(String isAsc) {
+		this.isAsc = isAsc;
+	}
+	public String getSearchText() {
+		return searchText;
+	}
+	public void setSearchText(String searchText) {
+		this.searchText = searchText;
+	}
+	
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo1Service.java

@@ -55,6 +55,9 @@ public class EquipmentInfo1Service {
             proEconEquipmentInfoDay1Service.removeByIds(idls);
 
         }
+
+        List<ProEconEquipmentInfoDay1> dayls=new ArrayList<>();
+
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(CacheContext.wtpAimap.containsKey(wt.getId()))
@@ -83,13 +86,14 @@ public class EquipmentInfo1Service {
                 }
                 extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
 
-                proEconEquipmentInfoDay1Service.save(pewp);
+                dayls.add(pewp);
+                // proEconEquipmentInfoDay1Service.save(pewp);
 
             }
 
 
         }
-
+        proEconEquipmentInfoDay1Service.saveBatch(dayls);
     }
 
     private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicEquipmentPoint> pointmap, ProEconEquipmentInfoDay1 pewp,List<ProEconEquipmentInfoDay1> pepid1ls) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo2Service.java

@@ -54,6 +54,7 @@ public class EquipmentInfo2Service {
             proEconEquipmentInfoDay2Service.removeByIds(idls);
 
         }
+        List<ProEconEquipmentInfoDay2> dayls=new ArrayList<>();
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(CacheContext.wtpAimap.containsKey(wt.getId()))
@@ -84,13 +85,14 @@ public class EquipmentInfo2Service {
                 }
                 calDetiall( pewp, end, begin, wt,pepidls);
                 calSimple( pewp, end, begin, wt,pepidls);
-                proEconEquipmentInfoDay2Service.save(pewp);
+                dayls.add(pewp);
+                // proEconEquipmentInfoDay2Service.save(pewp);
 
             }
 
 
         }
-
+        proEconEquipmentInfoDay2Service.saveBatch(dayls);
     }
 
     private void calDetiall(ProEconEquipmentInfoDay2 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay2> pepidls) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo3Service.java

@@ -53,6 +53,7 @@ public class EquipmentInfo3Service {
             proEconEquipmentInfoDay3Service.removeByIds(idls);
 
         }
+        List<ProEconEquipmentInfoDay3> dayls=new ArrayList<>();
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(CacheContext.wtpAimap.containsKey(wt.getId()))
@@ -84,13 +85,15 @@ public class EquipmentInfo3Service {
                 }
                 calDetiall( pewp, end, begin,wt,pepidls);
                 calSimple( pewp, end, begin, wt,pepidls);
-                proEconEquipmentInfoDay3Service.save(pewp);
+                dayls.add(pewp);
+                // proEconEquipmentInfoDay3Service.save(pewp);
+
 
             }
 
 
         }
-
+        proEconEquipmentInfoDay3Service.saveBatch(dayls);
     }
 
     private void calDetiall(ProEconEquipmentInfoDay3 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay3> pepidls) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo4Service.java

@@ -113,7 +113,7 @@ public class EquipmentInfo4Service {
 //        Map<String, Map<String, Double>> glqxyizxMap = coefficientService.coefficient(begin);
 //        //拟合优度接口调用
 //        Map<String, Map<String, Double>> nhydMap = goodnessOfFitService.goodnessOfFit(begin);
-
+        List<ProEconEquipmentInfoDay4> dayls=new ArrayList<>();
         for (ProBasicEquipment wt : CacheContext.wtls) {
             if (CacheContext.wtpAimap.containsKey(wt.getId())) {
 
@@ -165,13 +165,14 @@ public class EquipmentInfo4Service {
 
                 calDetiall(peioomap, pewp, end, begin, wt, pepidls, pepid2, pepid3,  wgmap);
 
-                proEconEquipmentInfoDay4Service.save(pewp);
+                dayls.add(pewp);
+                // proEconEquipmentInfoDay1Service.save(pewp);
 
             }
 
 
         }
-
+        proEconEquipmentInfoDay4Service.saveBatch(dayls);
     }
 
     private void calDetiall(Map<String, ProEconInOrOutSpeedTotal> peioomap, ProEconEquipmentInfoDay4 pewp, Date end, Date begin,

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo5Service.java

@@ -142,7 +142,8 @@ public class EquipmentInfo5Service {
             }
 
             stateRate(currentDate,rates);
-
+        }
+        List<ProEconEquipmentInfoDay5> dayls=new ArrayList<>();
             List<String> dayInfoids = proEconEquipmentInfoDay5Service.list().stream().filter(i -> i.getRecordDate().compareTo(currentDate) == 0
             ).map(ProEconEquipmentInfoDay5::getId).collect(Collectors.toList());
 
@@ -157,12 +158,14 @@ public class EquipmentInfo5Service {
 
                 buildresetRate(dayInfo, day);
 
+                dayls.add(dayInfo);
+                //proEconEquipmentInfoDay5Service.save(dayInfo);
 
-                proEconEquipmentInfoDay5Service.save(dayInfo);
             }
 
 
-        }
+
+        proEconEquipmentInfoDay5Service.saveBatch(dayls);
     }
 
     public void buildresetRate(ProEconEquipmentInfoDay5 dayInfo, ProEconEquipmentInfoDay5 day) {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -52,11 +52,11 @@ public class WindPowerInfo1Service {
                     List<ProEconPowerstationInfoDay1> fdls = map.get("fd");
                     List<ProEconPowerstationInfoDay1> gfls = map.get("gf");
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("0")) {
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
                         qbls.add(wpinfo);
                     }
 
@@ -67,11 +67,11 @@ public class WindPowerInfo1Service {
                     List<ProEconPowerstationInfoDay1> gfls = new ArrayList<>();
                     List<ProEconPowerstationInfoDay1> fdls = new ArrayList<>();
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("0")) {
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
                         qbls.add(wpinfo);
                     }
 
@@ -112,19 +112,19 @@ public class WindPowerInfo1Service {
                     gf.setRegionId(cp.getId());
 
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.rg.getValue());
 
                     fd.setRegionId(cp.getId());
 
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.rg.getValue());
 
                     qb.setRegionId(cp.getId());
 
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.rg.getValue());
 
 
@@ -233,20 +233,20 @@ public class WindPowerInfo1Service {
                     gf.setRegionId(cp.getRegionId());
                     gf.setCompanyId(cp.getId());
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.cp.getValue());
 
 
                     fd.setRegionId(cp.getRegionId());
                     fd.setCompanyId(cp.getId());
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.cp.getValue());
 
                     qb.setRegionId(cp.getRegionId());
                     qb.setCompanyId(cp.getId());
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.cp.getValue());
 
                     Initial.initial(qb);
@@ -560,6 +560,7 @@ public class WindPowerInfo1Service {
             proEconPowerstationInfoDay1Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay1> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wppointmap.get(wp.getId());
@@ -569,7 +570,7 @@ public class WindPowerInfo1Service {
                 pewp.setRegionId(wp.getRegionId());
                 pewp.setCompanyId(wp.getCompanyId());
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(wp.getId());
                 pewp.setWindpowerstationId(wp.getId());
                 pewp.setLocation(Location.wp.getValue());
 
@@ -591,13 +592,15 @@ public class WindPowerInfo1Service {
                 extracted(recordDate, end, begin, pointmap, pewp, pepid1ls);
 //*******************************************年信息统计*********************************************************/
 
-                proEconPowerstationInfoDay1Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay1Service.save(pewp);
+
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay1Service.saveBatch(dayls);
     }
 
     /**
@@ -623,6 +626,7 @@ public class WindPowerInfo1Service {
             proEconPowerstationInfoDay1Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay1> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.propointmap.get(pj.getId());
@@ -634,7 +638,7 @@ public class WindPowerInfo1Service {
                     pewp.setRegionId(wp.getRegionId());
                     pewp.setCompanyId(wp.getCompanyId());
                 }
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(pj.getId());
 
                 pewp.setWindpowerstationId(pj.getWindpowerstationId());
                 pewp.setProjectId(pj.getId());
@@ -658,14 +662,14 @@ public class WindPowerInfo1Service {
                 }
                 extracted(recordDate, end, begin, pointmap, pewp, pepid1ls);
 
-
-                proEconPowerstationInfoDay1Service.save(pewp);
+                dayls.add(pewp);
+               // proEconPowerstationInfoDay1Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay1Service.saveBatch(dayls);
     }
 
     /**
@@ -691,6 +695,8 @@ public class WindPowerInfo1Service {
             proEconPowerstationInfoDay1Service.removeByIds(idls);
 
         }
+
+        List<ProEconPowerstationInfoDay1> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.linepointmap.get(ln.getId());
@@ -707,7 +713,7 @@ public class WindPowerInfo1Service {
 
                 }
                 Initial.initial(pewp);
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(ln.getId());
                 pewp.setLineId(ln.getId());
                 pewp.setLocation(Location.ln.getValue());
                 pewp.setProjectId(ln.getProjectId());
@@ -729,13 +735,14 @@ public class WindPowerInfo1Service {
                 }
                 extracted(recordDate, end, begin, pointmap, pewp, pepid1ls);
 
-                proEconPowerstationInfoDay1Service.save(pewp);
+                dayls.add(pewp);
+//                proEconPowerstationInfoDay1Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay1Service.saveBatch(dayls);
     }
 
     private void extracted(Date recordDate, Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay1 pewp, List<ProEconPowerstationInfoDay1> pepid1ls) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo2Service.java

@@ -52,12 +52,13 @@ public class WindPowerInfo2Service {
                     List<ProEconPowerstationInfoDay2> fdls = map.get("fd");
                     List<ProEconPowerstationInfoDay2> gfls = map.get("gf");
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
+                        qbls.add(wpinfo);
                     }
-                    qbls.add(wpinfo);
                 } else {
                     Map<String, List<ProEconPowerstationInfoDay2>> map = new HashMap<>();
 
@@ -65,11 +66,11 @@ public class WindPowerInfo2Service {
                     List<ProEconPowerstationInfoDay2> gfls = new ArrayList<>();
                     List<ProEconPowerstationInfoDay2> fdls = new ArrayList<>();
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("0")) {
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
                         qbls.add(wpinfo);
                     }
                     map.put("qb", qbls);
@@ -109,19 +110,19 @@ public class WindPowerInfo2Service {
                     gf.setRegionId(cp.getId());
 
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.rg.getValue());
 
                     fd.setRegionId(cp.getId());
 
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.rg.getValue());
 
                     qb.setRegionId(cp.getId());
 
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.rg.getValue());
 
                     Initial.initial(qb);
@@ -231,20 +232,20 @@ public class WindPowerInfo2Service {
                     gf.setRegionId(cp.getRegionId());
                     gf.setCompanyId(cp.getId());
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.cp.getValue());
 
 
                     fd.setRegionId(cp.getRegionId());
                     fd.setCompanyId(cp.getId());
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.cp.getValue());
 
                     qb.setRegionId(cp.getRegionId());
                     qb.setCompanyId(cp.getId());
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.cp.getValue());
 
                     Initial.initial(qb);
@@ -396,6 +397,8 @@ public class WindPowerInfo2Service {
             proEconPowerstationInfoDay2Service.removeByIds(idls);
 
         }
+
+        List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
 //                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(wp.getId());
@@ -405,7 +408,7 @@ public class WindPowerInfo2Service {
                 pewp.setRegionId(wp.getRegionId());
                 pewp.setCompanyId(wp.getCompanyId());
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(wp.getId());
                 pewp.setWindpowerstationId(wp.getId());
                 pewp.setLocation(Location.wp.getValue());
 
@@ -429,13 +432,14 @@ public class WindPowerInfo2Service {
                 calSimple(pewp, end, begin, CacheContext.wpwtmap.get(wp.getId()), pepidls);
 //*******************************************年信息统计*********************************************************/
 //                wpinfodayls.add(pewp);
-                proEconPowerstationInfoDay2Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay2Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay2Service.saveBatch(dayls);
     }
 
     /**
@@ -461,6 +465,8 @@ public class WindPowerInfo2Service {
             proEconPowerstationInfoDay2Service.removeByIds(idls);
 
         }
+
+        List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if(CacheContext.wppointmap.containsKey(pj.getId()))
 //            {
@@ -473,7 +479,7 @@ public class WindPowerInfo2Service {
                 pewp.setCompanyId(wp.getCompanyId());
             }
             Initial.initial(pewp);
-            pewp.setForeignKeyId("0");
+            pewp.setForeignKeyId(pj.getId());
             pewp.setWindpowerstationId(pj.getWindpowerstationId());
             pewp.setProjectId(pj.getId());
             pewp.setLocation(Location.pj.getValue());
@@ -497,13 +503,14 @@ public class WindPowerInfo2Service {
             calDetiall(pewp, end, begin, CacheContext.pjwtmap.get(pj.getId()), pepidls);
             calSimple(pewp, end, begin, CacheContext.pjwtmap.get(pj.getId()), pepidls);
 
-            proEconPowerstationInfoDay2Service.save(pewp);
+            dayls.add(pewp);
+            // proEconPowerstationInfoDay2Service.save(pewp);
 
 //            }
 
 
         }
-
+        proEconPowerstationInfoDay2Service.saveBatch(dayls);
     }
 
     /**
@@ -529,6 +536,8 @@ public class WindPowerInfo2Service {
             proEconPowerstationInfoDay2Service.removeByIds(idls);
 
         }
+
+        List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 //            if(CacheContext.wppointmap.containsKey(ln.getId()))
 //            {
@@ -547,7 +556,7 @@ public class WindPowerInfo2Service {
 
             }
             Initial.initial(pewp);
-            pewp.setForeignKeyId("0");
+            pewp.setForeignKeyId(ln.getId());
             pewp.setLineId(ln.getId());
             pewp.setLocation(Location.ln.getValue());
             pewp.setProjectId(ln.getProjectId());
@@ -569,13 +578,14 @@ public class WindPowerInfo2Service {
             }
             calDetiall(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
             calSimple(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
-            proEconPowerstationInfoDay2Service.save(pewp);
+            dayls.add(pewp);
+            // proEconPowerstationInfoDay2Service.save(pewp);
 
         }
 
 
 //        }
-
+        proEconPowerstationInfoDay2Service.saveBatch(dayls);
     }
 
     private void calDetiall(ProEconPowerstationInfoDay2 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay2> pepidls) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo3Service.java

@@ -50,12 +50,13 @@ public class WindPowerInfo3Service {
                     List<ProEconPowerstationInfoDay3> fdls = map.get("fd");
                     List<ProEconPowerstationInfoDay3> gfls = map.get("gf");
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
+                    }else if (wpinfo.getForeignKeyId().contains("0")) {
+                        qbls.add(wpinfo);
                     }
-                    qbls.add(wpinfo);
                 } else {
                     Map<String, List<ProEconPowerstationInfoDay3>> map = new HashMap<>();
 
@@ -63,11 +64,11 @@ public class WindPowerInfo3Service {
                     List<ProEconPowerstationInfoDay3> gfls = new ArrayList<>();
                     List<ProEconPowerstationInfoDay3> fdls = new ArrayList<>();
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("0")) {
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
                         qbls.add(wpinfo);
                     }
                     map.put("qb", qbls);
@@ -107,19 +108,19 @@ public class WindPowerInfo3Service {
                     gf.setRegionId(cp.getId());
 
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.rg.getValue());
 
                     fd.setRegionId(cp.getId());
 
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.rg.getValue());
 
                     qb.setRegionId(cp.getId());
 
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.rg.getValue());
 
                     Initial.initial(qb);
@@ -230,20 +231,20 @@ public class WindPowerInfo3Service {
                     gf.setRegionId(cp.getRegionId());
                     gf.setCompanyId(cp.getId());
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.cp.getValue());
 
 
                     fd.setRegionId(cp.getRegionId());
                     fd.setCompanyId(cp.getId());
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.cp.getValue());
 
                     qb.setRegionId(cp.getRegionId());
                     qb.setCompanyId(cp.getId());
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.cp.getValue());
 
                     Initial.initial(qb);
@@ -398,6 +399,7 @@ public class WindPowerInfo3Service {
             proEconPowerstationInfoDay3Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
 //                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(wp.getId());
@@ -407,7 +409,7 @@ public class WindPowerInfo3Service {
                 pewp.setRegionId(wp.getRegionId());
                 pewp.setCompanyId(wp.getCompanyId());
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(wp.getId());
                 pewp.setWindpowerstationId(wp.getId());
                 pewp.setLocation(Location.wp.getValue());
 
@@ -430,13 +432,14 @@ public class WindPowerInfo3Service {
                 calSimple(pewp, end, begin, CacheContext.wpwtmap.get(wp.getId()), pepidls);
 //*******************************************年信息统计*********************************************************/
 //                wpinfodayls.add(pewp);
-                proEconPowerstationInfoDay3Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay3Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay3Service.saveBatch(dayls);
     }
 
     /**
@@ -462,6 +465,7 @@ public class WindPowerInfo3Service {
             proEconPowerstationInfoDay3Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if(CacheContext.wppointmap.containsKey(pj.getId()))
 //            {
@@ -474,7 +478,7 @@ public class WindPowerInfo3Service {
                 pewp.setCompanyId(wp.getCompanyId());
             }
             Initial.initial(pewp);
-            pewp.setForeignKeyId("0");
+            pewp.setForeignKeyId(pj.getId());
             pewp.setWindpowerstationId(pj.getWindpowerstationId());
             pewp.setProjectId(pj.getId());
             pewp.setLocation(Location.pj.getValue());
@@ -498,13 +502,14 @@ public class WindPowerInfo3Service {
             calDetiall(pewp, end, begin, CacheContext.pjwtmap.get(pj.getId()), pepidls);
 
             calSimple(pewp, end, begin, CacheContext.pjwtmap.get(pj.getId()), pepidls);
-            proEconPowerstationInfoDay3Service.save(pewp);
+            dayls.add(pewp);
+            // proEconPowerstationInfoDay3Service.save(pewp);
 
 //            }
 
 
         }
-
+        proEconPowerstationInfoDay3Service.saveBatch(dayls);
     }
 
     /**
@@ -530,6 +535,7 @@ public class WindPowerInfo3Service {
             proEconPowerstationInfoDay3Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 //            if(CacheContext.linepointmap.containsKey(ln.getId()))
 //            {
@@ -547,7 +553,7 @@ public class WindPowerInfo3Service {
 
             }
             Initial.initial(pewp);
-            pewp.setForeignKeyId("0");
+            pewp.setForeignKeyId(ln.getId());
             pewp.setLineId(ln.getId());
             pewp.setLocation(Location.ln.getValue());
             pewp.setProjectId(ln.getProjectId());
@@ -570,13 +576,14 @@ public class WindPowerInfo3Service {
             }
             calDetiall(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
             calSimple(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
-            proEconPowerstationInfoDay3Service.save(pewp);
+            dayls.add(pewp);
+            // proEconPowerstationInfoDay3Service.save(pewp);
 
         }
 
 
         //      }
-
+        proEconPowerstationInfoDay3Service.saveBatch(dayls);
     }
 
     private void calDetiall(ProEconPowerstationInfoDay3 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay3> pepidls) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo4Service.java

@@ -58,11 +58,11 @@ public class WindPowerInfo4Service {
                     List<ProEconPowerstationInfoDay4> fdls = map.get("fd");
                     List<ProEconPowerstationInfoDay4> gfls = map.get("gf");
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("0")) {
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
                         qbls.add(wpinfo);
                     }
                 } else {
@@ -72,12 +72,13 @@ public class WindPowerInfo4Service {
                     List<ProEconPowerstationInfoDay4> gfls = new ArrayList<>();
                     List<ProEconPowerstationInfoDay4> fdls = new ArrayList<>();
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
+                    }else if (wpinfo.getForeignKeyId().contains("0")) {
+                        qbls.add(wpinfo);
                     }
-                    qbls.add(wpinfo);
                     map.put("qb", qbls);
                     map.put("fd", fdls);
                     map.put("gf", gfls);
@@ -115,19 +116,19 @@ public class WindPowerInfo4Service {
                     gf.setRegionId(cp.getId());
 
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.rg.getValue());
 
                     fd.setRegionId(cp.getId());
 
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.rg.getValue());
 
                     qb.setRegionId(cp.getId());
 
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.rg.getValue());
 
                     Initial.initial(qb);
@@ -239,20 +240,20 @@ public class WindPowerInfo4Service {
                     gf.setRegionId(cp.getRegionId());
                     gf.setCompanyId(cp.getId());
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.cp.getValue());
 
 
                     fd.setRegionId(cp.getRegionId());
                     fd.setCompanyId(cp.getId());
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.cp.getValue());
 
                     qb.setRegionId(cp.getRegionId());
                     qb.setCompanyId(cp.getId());
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.cp.getValue());
 
                     Initial.initial(qb);
@@ -422,6 +423,7 @@ public class WindPowerInfo4Service {
             proEconPowerstationInfoDay4Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay4> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
 //                Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wppointmap.get(wp.getId());
@@ -431,7 +433,7 @@ public class WindPowerInfo4Service {
                 pewp.setRegionId(wp.getRegionId());
                 pewp.setCompanyId(wp.getCompanyId());
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(wp.getId());
                 pewp.setWindpowerstationId(wp.getId());
                 pewp.setLocation(Location.wp.getValue());
 
@@ -485,13 +487,14 @@ public class WindPowerInfo4Service {
 
 //*******************************************年信息统计*********************************************************/
 //                wpinfodayls.add(pewp);
-                proEconPowerstationInfoDay4Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay4Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay4Service.saveBatch(dayls);
     }
 
     /**
@@ -517,6 +520,7 @@ public class WindPowerInfo4Service {
             proEconPowerstationInfoDay4Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay4> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if (CacheContext.wppointmap.containsKey(pj.getId())) {
 //                Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wppointmap.get(pj.getId());
@@ -528,7 +532,7 @@ public class WindPowerInfo4Service {
                 pewp.setCompanyId(wp.getCompanyId());
             }
             Initial.initial(pewp);
-            pewp.setForeignKeyId("0");
+            pewp.setForeignKeyId(pj.getId());
             pewp.setWindpowerstationId(pj.getWindpowerstationId());
             pewp.setProjectId(pj.getId());
             pewp.setLocation(Location.pj.getValue());
@@ -583,13 +587,14 @@ public class WindPowerInfo4Service {
             calDetiall(pewp, end, begin, CacheContext.pjwtmap.get(pj.getId()), pepidls, pepid2, pepid3, "1");
 
 
-            proEconPowerstationInfoDay4Service.save(pewp);
+            dayls.add(pewp);
+            // proEconPowerstationInfoDay4Service.save(pewp);
 
 //            }
 
 
         }
-
+        proEconPowerstationInfoDay4Service.saveBatch(dayls);
     }
 
     /**
@@ -615,6 +620,7 @@ public class WindPowerInfo4Service {
             proEconPowerstationInfoDay4Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay4> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 //            if (CacheContext.linepointmap.containsKey(ln.getId())) {
 //                Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wppointmap.get(ln.getId());
@@ -631,7 +637,7 @@ public class WindPowerInfo4Service {
 
             }
             Initial.initial(pewp);
-            pewp.setForeignKeyId("0");
+            pewp.setForeignKeyId(ln.getId());
             pewp.setLineId(ln.getId());
             pewp.setLocation(Location.ln.getValue());
             pewp.setProjectId(ln.getProjectId());
@@ -683,13 +689,14 @@ public class WindPowerInfo4Service {
 
             calDetiall(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls, pepid2, pepid3, "2");
 
-            proEconPowerstationInfoDay4Service.save(pewp);
+            dayls.add(pewp);
+            // proEconPowerstationInfoDay4Service.save(pewp);
 
             //          }
 
 
         }
-
+        proEconPowerstationInfoDay4Service.saveBatch(dayls);
     }
 
     private void calDetiall(ProEconPowerstationInfoDay4 pewp, Date end, Date begin, List<ProBasicEquipment> wtls,

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo5Service.java

@@ -50,11 +50,11 @@ public class WindPowerInfo5Service {
                     List<ProEconPowerstationInfoDay5> fdls = map.get("fd");
                     List<ProEconPowerstationInfoDay5> gfls = map.get("gf");
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("0")) {
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
                         qbls.add(wpinfo);
                     }
 
@@ -65,12 +65,13 @@ public class WindPowerInfo5Service {
                     List<ProEconPowerstationInfoDay5> fdls = new ArrayList<>();
                     List<ProEconPowerstationInfoDay5> gfls =  new ArrayList<>();
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
+                    }else if (wpinfo.getForeignKeyId().contains("0")) {
+                        qbls.add(wpinfo);
                     }
-                    qbls.add(wpinfo);
                     map.put("qb", qbls);
                     map.put("fd", fdls);
                     map.put("gf", gfls);
@@ -108,19 +109,19 @@ public class WindPowerInfo5Service {
                     gf.setRegionId(cp.getId());
 
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.rg.getValue());
 
                     fd.setRegionId(cp.getId());
 
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.rg.getValue());
 
                     qb.setRegionId(cp.getId());
 
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.rg.getValue());
 
                     Initial.initial(qb);
@@ -230,20 +231,20 @@ public class WindPowerInfo5Service {
                     gf.setRegionId(cp.getRegionId());
                     gf.setCompanyId(cp.getId());
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.cp.getValue());
 
 
                     fd.setRegionId(cp.getRegionId());
                     fd.setCompanyId(cp.getId());
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.cp.getValue());
 
                     qb.setRegionId(cp.getRegionId());
                     qb.setCompanyId(cp.getId());
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.cp.getValue());
 
                     Initial.initial(qb);
@@ -352,6 +353,7 @@ public class WindPowerInfo5Service {
             proEconPowerstationInfoDay5Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wppointmap.get(wp.getId());
@@ -361,7 +363,7 @@ public class WindPowerInfo5Service {
                 pewp.setRegionId(wp.getRegionId());
                 pewp.setCompanyId(wp.getCompanyId());
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(wp.getId());
                 pewp.setWindpowerstationId(wp.getId());
                 pewp.setLocation(Location.wp.getValue());
 
@@ -381,13 +383,15 @@ public class WindPowerInfo5Service {
                 extracted(recordDate, pointmap, pewp);
 //*******************************************年信息统计*********************************************************/
 //                wpinfodayls.add(pewp);
-                proEconPowerstationInfoDay5Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay5Service.save(pewp);
+
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay5Service.saveBatch(dayls);
     }
 
     /**
@@ -413,6 +417,7 @@ public class WindPowerInfo5Service {
             proEconPowerstationInfoDay5Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.propointmap.get(pj.getId());
@@ -424,7 +429,7 @@ public class WindPowerInfo5Service {
                     pewp.setCompanyId(wp.getCompanyId());
                 }
                 Initial.initial(pewp);
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(pj.getId());
                 pewp.setWindpowerstationId(pj.getWindpowerstationId());
                 pewp.setProjectId(pj.getId());
                 pewp.setLocation(Location.pj.getValue());
@@ -446,13 +451,15 @@ public class WindPowerInfo5Service {
                 extracted(recordDate, pointmap, pewp);
 
 
-                proEconPowerstationInfoDay5Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay5Service.save(pewp);
+
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay5Service.saveBatch(dayls);
     }
 
     /**
@@ -478,6 +485,7 @@ public class WindPowerInfo5Service {
             proEconPowerstationInfoDay5Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.linepointmap.get(ln.getId());
@@ -494,7 +502,7 @@ public class WindPowerInfo5Service {
 
                 }
                 Initial.initial(pewp);
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(ln.getId());
                 pewp.setLineId(ln.getId());
                 pewp.setLocation(Location.ln.getValue());
                 pewp.setProjectId(ln.getProjectId());
@@ -515,13 +523,15 @@ public class WindPowerInfo5Service {
 //                }
                 extracted(recordDate, pointmap, pewp);
 
-                proEconPowerstationInfoDay5Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay5Service.save(pewp);
+
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay5Service.saveBatch(dayls);
     }
 
     private void extracted(Date recordDate, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay5 pewp) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo6Service.java

@@ -56,11 +56,11 @@ public class WindPowerInfo6Service {
                     List<ProEconPowerstationInfoDay6> fdls = map.get("fd");
                     List<ProEconPowerstationInfoDay6> gfls = map.get("gf");
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("0")) {
+                    } else if (wpinfo.getForeignKeyId().contains("0")) {
                         qbls.add(wpinfo);
                     }
 
@@ -71,12 +71,13 @@ public class WindPowerInfo6Service {
                     List<ProEconPowerstationInfoDay6> gfls = new ArrayList<>();
                     List<ProEconPowerstationInfoDay6> fdls = new ArrayList<>();
 
-                    if (wpinfo.getForeignKeyId().equals("-1")) {
+                    if (wpinfo.getForeignKeyId().contains("-1")) {
                         fdls.add(wpinfo);
-                    } else if (wpinfo.getForeignKeyId().equals("-2")) {
+                    } else if (wpinfo.getForeignKeyId().contains("-2")) {
                         gfls.add(wpinfo);
+                    }else if (wpinfo.getForeignKeyId().contains("0")) {
+                        qbls.add(wpinfo);
                     }
-                    qbls.add(wpinfo);
                     map.put("qb", qbls);
                     map.put("fd", fdls);
                     map.put("gf", gfls);
@@ -114,19 +115,19 @@ public class WindPowerInfo6Service {
                     gf.setRegionId(cp.getId());
 
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.rg.getValue());
 
                     fd.setRegionId(cp.getId());
 
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.rg.getValue());
 
                     qb.setRegionId(cp.getId());
 
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.rg.getValue());
 
                     Initial.initial(qb);
@@ -236,20 +237,20 @@ public class WindPowerInfo6Service {
                     gf.setRegionId(cp.getRegionId());
                     gf.setCompanyId(cp.getId());
                     gf.setRecordDate(DateUtils.truncate(recordDate));
-                    gf.setForeignKeyId("-2");
+                    gf.setForeignKeyId(cp.getId()+"-2");
                     gf.setLocation(Location.cp.getValue());
 
 
                     fd.setRegionId(cp.getRegionId());
                     fd.setCompanyId(cp.getId());
                     fd.setRecordDate(DateUtils.truncate(recordDate));
-                    fd.setForeignKeyId("-1");
+                    fd.setForeignKeyId(cp.getId()+"-1");
                     fd.setLocation(Location.cp.getValue());
 
                     qb.setRegionId(cp.getRegionId());
                     qb.setCompanyId(cp.getId());
                     qb.setRecordDate(DateUtils.truncate(recordDate));
-                    qb.setForeignKeyId("0");
+                    qb.setForeignKeyId(cp.getId()+"0");
                     qb.setLocation(Location.cp.getValue());
 
                     Initial.initial(qb);
@@ -390,6 +391,7 @@ public class WindPowerInfo6Service {
             proEconPowerstationInfoDay6Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wppointmap.get(wp.getId());
@@ -399,7 +401,7 @@ public class WindPowerInfo6Service {
                 pewp.setRegionId(wp.getRegionId());
                 pewp.setCompanyId(wp.getCompanyId());
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(wp.getId());
                 pewp.setWindpowerstationId(wp.getId());
                 pewp.setLocation(Location.wp.getValue());
 
@@ -418,13 +420,14 @@ public class WindPowerInfo6Service {
                 extracted(end, begin, pointmap, pewp, pepid1ls);
 //*******************************************年信息统计*********************************************************/
 //                wpinfodayls.add(pewp);
-                proEconPowerstationInfoDay6Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay6Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay6Service.saveBatch(dayls);
     }
 
     /**
@@ -450,6 +453,7 @@ public class WindPowerInfo6Service {
             proEconPowerstationInfoDay6Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.propointmap.get(pj.getId());
@@ -461,7 +465,7 @@ public class WindPowerInfo6Service {
                     pewp.setCompanyId(wp.getCompanyId());
                 }
                 Initial.initial(pewp);
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(pj.getId());
                 pewp.setWindpowerstationId(pj.getWindpowerstationId());
                 pewp.setProjectId(pj.getId());
                 pewp.setLocation(Location.pj.getValue());
@@ -483,13 +487,14 @@ public class WindPowerInfo6Service {
                 extracted(end, begin, pointmap, pewp, pepid1ls);
 
 
-                proEconPowerstationInfoDay6Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay6Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay6Service.saveBatch(dayls);
     }
 
     /**
@@ -515,6 +520,7 @@ public class WindPowerInfo6Service {
             proEconPowerstationInfoDay6Service.removeByIds(idls);
 
         }
+        List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.linepointmap.get(ln.getId());
@@ -531,7 +537,7 @@ public class WindPowerInfo6Service {
 
                 }
                 Initial.initial(pewp);
-                pewp.setForeignKeyId("0");
+                pewp.setForeignKeyId(ln.getId());
                 pewp.setLineId(ln.getId());
                 pewp.setLocation(Location.ln.getValue());
                 pewp.setProjectId(ln.getProjectId());
@@ -551,13 +557,14 @@ public class WindPowerInfo6Service {
                 }
                 extracted(end, begin, pointmap, pewp, pepid1ls);
 
-                proEconPowerstationInfoDay6Service.save(pewp);
+                dayls.add(pewp);
+                // proEconPowerstationInfoDay6Service.save(pewp);
 
             }
 
 
         }
-
+        proEconPowerstationInfoDay6Service.saveBatch(dayls);
     }
 
     private void extracted(Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay6 pewp, List<ProEconPowerstationInfoDay6> pepid1ls) throws Exception {

realtime/generationXK-service/src/main/java/com/gyee/generation/task/SaticSchedulePgTask.java

@@ -56,6 +56,10 @@ public class SaticSchedulePgTask {
     private EquipmentInfo5Service equipmentInfo5Service;
     @Resource
     private EquipmentInfoDayTopService equipmentInfoDayTopService;
+
+    @Resource
+    private WindturbineGoodnessService windturbineGoodnessService;
+
     //3.添加定时任务
     /**
      * 切入切出统计
@@ -310,5 +314,21 @@ public class SaticSchedulePgTask {
         XxlJobHelper.log("等级评估统计调度任务处理完成!........");
     }
 
+    /**
+     * 功率一致性系数和拟合优度
+     * 每天执行一次
+     */
+
+    @XxlJob("indturbineGoodness_PG")
+    public void indturbineGoodness_PG()  {
 
+
+        XxlJobHelper.log("功率一致性系数和拟合优度统计调度程序执行开始!........");
+        try {
+            windturbineGoodnessService.calWindturbineGoodness(new Date());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        XxlJobHelper.log("功率一致性系数和拟合优度统计调度任务处理完成!........");
+    }
 }

realtime/generationXK-service/src/main/resources/application-xk.yml

@@ -9,8 +9,8 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-    host: 127.0.0.1
-    #host: 192.168.11.250
+    #host: 127.0.0.1
+    host: 192.168.11.250
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -34,7 +34,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_TEST?rewriteBatchedStatements=true
+    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD?rewriteBatchedStatements=true
     username: postgres
     password: postgres
 #    url: jdbc:postgresql://120.46.148.180:5432/postgres
@@ -87,8 +87,8 @@ logging:
     com.example: debug
 #db url
 db:
-  url: http://127.0.0.1:8011/ts
-#  url: http://192.168.11.250:8011/ts
+  #url: http://127.0.0.1:8011/ts
+  url: http://192.168.11.250:8011/ts
 #参与计算的场站
 #runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_BH1_FDC_STA,SD_GDDL_BH2_FDC_STA,SD_GDDL_CG_FDC_STA,SD_GDDL_FJ_FDC_STA,SD_GDDL_YS_FDC_STA,SD_GDDL_FXFC_FDC_STA,SD_GDDL_JNSS_FDC_STA,SD_GDDL_WFBH_FDC_STA,SD_GDDL_PLHS_FDC_STA,SD_GDDL_JNCQ_FDC_STA,SD_GDDL_LXLN_FDC_STA,SD_GDDL_LQJS_FDC_STA,SD_GDDL_ZYXD_FDC_STA,SD_GDDL_ZYFS_FDC_STA
 runWindpowerstation: SD_GDDL_RZLX_FDC_STA