历史计算服务修改

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittMonthMainMapper.java

@@ -15,6 +15,9 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ProEconCurveFittMonthMainMapper extends BaseMapper<ProEconCurveFittMonthMain> {
 
-    @Delete(" delete from pro_econ_curve_fitt_month_main where year=#{year} and month=#{month}")
-    public int deleteProEconCurveFittMonthSubByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
+    @Delete(" delete from pro_econ_curve_fitt_month_main where year=#{year} and month=#{month}  AND  windturbineId like '%_F_%' ")
+    public int deleteProEconCurveFittMonthSubFByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
+
+    @Delete(" delete from pro_econ_curve_fitt_month_main where year=#{year} and month=#{month}  AND  windturbineId like '%_G_%' ")
+    public int deleteProEconCurveFittMonthSubGByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittMonthSubMapper.java

@@ -15,6 +15,9 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ProEconCurveFittMonthSubMapper extends BaseMapper<ProEconCurveFittMonthSub> {
 
-    @Delete(" delete from pro_econ_curve_fitt_month_sub where year=#{year} and month=#{month}")
-    public int deleteProEconCurveFittMonthSubByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
+    @Delete(" delete from pro_econ_curve_fitt_month_sub where year=#{year} and month=#{month}  AND  windturbineId like '%_F_%' ")
+    public int deleteProEconCurveFittMonthSubFByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
+
+    @Delete(" delete from pro_econ_curve_fitt_month_sub where year=#{year} and month=#{month}  AND  windturbineId like '%_G_%' ")
+    public int deleteProEconCurveFittMonthSubGByMonth(@Param(value = "year") String year, @Param(value = "month") String month);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittYearMainMapper.java

@@ -14,6 +14,9 @@ import org.apache.ibatis.annotations.Param;
  * @since 2022-11-07
  */
 public interface ProEconCurveFittYearMainMapper extends BaseMapper<ProEconCurveFittYearMain> {
-    @Delete(" delete from pro_econ_curve_fitt_year_main where year=#{year}")
-    public int deleteProEconCurveFittYearMainByYear(@Param(value = "year") String year);
+    @Delete(" delete from pro_econ_curve_fitt_year_main where year=#{year}  AND  windturbineId like '%_F_%' ")
+    public int deleteProEconCurveFittYearMainFByYear(@Param(value = "year") String year);
+
+    @Delete(" delete from pro_econ_curve_fitt_year_main where year=#{year}  AND  windturbineId like '%_G_%' ")
+    public int deleteProEconCurveFittYearMainGByYear(@Param(value = "year") String year);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittYearSubMapper.java

@@ -14,6 +14,9 @@ import org.apache.ibatis.annotations.Param;
  * @since 2022-11-07
  */
 public interface ProEconCurveFittYearSubMapper extends BaseMapper<ProEconCurveFittYearSub> {
-    @Delete(" delete from pro_econ_curve_fitt_year_sub where year=#{year}")
-    public int deleteProEconCurveFittYearSubByYear(@Param(value = "year") String year);
+    @Delete(" delete from pro_econ_curve_fitt_year_sub where year=#{year}  AND  windturbineId like '%_F_%' ")
+    public int deleteProEconCurveFittYearSubFByYear(@Param(value = "year") String year);
+
+    @Delete(" delete from pro_econ_curve_fitt_year_sub where year=#{year}  AND  windturbineId like '%_G_%' ")
+    public int deleteProEconCurveFittYearSubGByYear(@Param(value = "year") String year);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittingMainMapper.java

@@ -17,6 +17,8 @@ import java.util.Date;
  */
 public interface ProEconCurveFittingMainMapper extends BaseMapper<ProEconCurveFittingMain> {
 
-    @Delete(" delete from pro_econ_curve_fitting_main where record_date=#{recordDate} ")
-    public int deleteProEconCurveFittingMainByDay(@Param(value = "recordDate") Date recordDate);
+    @Delete(" delete from pro_econ_curve_fitting_main where record_date=#{recordDate}  AND  windturbineId like '%_F_%'  ")
+    public int deleteProEconCurveFittingMainFByDay(@Param(value = "recordDate") Date recordDate);
+    @Delete(" delete from pro_econ_curve_fitting_main where record_date=#{recordDate}  AND  windturbineId like '%_G_%' ")
+    public int deleteProEconCurveFittingMainGByDay(@Param(value = "recordDate") Date recordDate);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconCurveFittingSubMapper.java

@@ -18,6 +18,9 @@ import java.util.Date;
 public interface ProEconCurveFittingSubMapper extends BaseMapper<ProEconCurveFittingSub> {
 
 
-    @Delete(" delete from pro_econ_curve_fitting_sub where record_date=#{recordDate} ")
-    public int deleteProEconCurveFittingSubByDay(@Param(value = "recordDate") Date recordDate);
+    @Delete(" delete from pro_econ_curve_fitting_sub where record_date=#{recordDate}  AND  windturbineId like '%_F_%' ")
+    public int deleteProEconCurveFittingSubFByDay(@Param(value = "recordDate") Date recordDate);
+
+    @Delete(" delete from pro_econ_curve_fitting_sub where record_date=#{recordDate}  AND  windturbineId like '%_G_%' ")
+    public int deleteProEconCurveFittingSubGByDay(@Param(value = "recordDate") Date recordDate);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtCurveFittingMapper.java

@@ -17,7 +17,10 @@ import java.util.Date;
  */
 public interface ProEconWtCurveFittingMapper extends BaseMapper<ProEconWtCurveFitting> {
 
-    @Delete(" delete from pro_econ_wt_curve_fitting where record_date=#{recordDate} ")
-    public int deleteProEconWtCurveFittingByDay(@Param(value = "recordDate") Date recordDate);
+    @Delete(" delete from pro_econ_wt_curve_fitting where record_date=#{recordDate} AND  windturbineId like '%_F_%' ")
+    public int deleteProEconWtCurveFittingFByDay(@Param(value = "recordDate") Date recordDate);
+
+    @Delete(" delete from pro_econ_wt_curve_fitting where record_date=#{recordDate} AND  windturbineId like '%_G_%' ")
+    public int deleteProEconWtCurveFittingGByDay(@Param(value = "recordDate") Date recordDate);
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtCurveFittingMonthMapper.java

@@ -15,6 +15,9 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ProEconWtCurveFittingMonthMapper extends BaseMapper<ProEconWtCurveFittingMonth> {
 
-    @Delete(" delete from pro_econ_wt_curve_fitting_month where year=#{year} and month=#{month}")
-    public int deleteProEconWtCurveFittingByMonth(@Param(value = "year") String year,@Param(value = "month") String month);
+    @Delete(" delete from pro_econ_wt_curve_fitting_month where year=#{year} and month=#{month} AND  windturbineId like '%_F_%' " )
+    public int deleteProEconWtCurveFittingFByMonth(@Param(value = "year") String year,@Param(value = "month") String month);
+
+    @Delete(" delete from pro_econ_wt_curve_fitting_month where year=#{year} and month=#{month} AND  windturbineId like '%_G_%' ")
+    public int deleteProEconWtCurveFittingGByMonth(@Param(value = "year") String year,@Param(value = "month") String month);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconWtCurveFittingYearMapper.java

@@ -15,6 +15,8 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ProEconWtCurveFittingYearMapper extends BaseMapper<ProEconWtCurveFittingYear> {
 
-    @Delete(" delete from pro_econ_wt_curve_fitting_year where year=#{year}")
-    public int deleteProEconWtCurveFittingByYear(@Param(value = "year") String year);
+    @Delete(" delete from pro_econ_wt_curve_fitting_year where year=#{year} AND  windturbineId like '%_F_%' ")
+    public int deleteProEconWtCurveFittingFByYear(@Param(value = "year") String year);
+    @Delete(" delete from pro_econ_wt_curve_fitting_year where year=#{year} AND  windturbineId like '%_G_%' ")
+    public int deleteProEconWtCurveFittingGByYear(@Param(value = "year") String year);
 }

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

@@ -74,9 +74,9 @@ public class PowerCurveFittingByTimeGfService {
 
         Date begin = DateUtils.addDays(end, -6);
 
-        proEconWtCurveFittingService.deleteProEconWtCurveFittingByDay(DateUtils.truncate(recordDate));
-        proEconCurveFittingMainService.deleteProEconCurveFittingMainByDay(DateUtils.truncate(recordDate));
-        proEconCurveFittingSubService.deleteProEconCurveFittingSubByDay(DateUtils.truncate(recordDate));
+        proEconWtCurveFittingService.deleteProEconWtCurveFittingGByDay(DateUtils.truncate(recordDate));
+        proEconCurveFittingMainService.deleteProEconCurveFittingMainGByDay(DateUtils.truncate(recordDate));
+        proEconCurveFittingSubService.deleteProEconCurveFittingSubGByDay(DateUtils.truncate(recordDate));
         Map<String, CureFittingVo> windMap = new HashMap<>();
 
         //初始化风机装机容量
@@ -306,9 +306,9 @@ public class PowerCurveFittingByTimeGfService {
         int day_month = c.get(Calendar.MONTH) + 1;
 
 
-        proEconWtCurveFittingMonthService.deleteProEconWtCurveFittingByMonth(String.valueOf(day_year),String.valueOf(day_month));
-        proEconCurveFittMonthMainService.deleteProEconCurveFittMonthMainByMonth(String.valueOf(day_year),String.valueOf(day_month));
-        proEconCurveFittMonthSubService.deleteProEconCurveFittMonthSubByMonth(String.valueOf(day_year),String.valueOf(day_month));
+        proEconWtCurveFittingMonthService.deleteProEconWtCurveFittingGByMonth(String.valueOf(day_year),String.valueOf(day_month));
+        proEconCurveFittMonthMainService.deleteProEconCurveFittMonthMainGByMonth(String.valueOf(day_year),String.valueOf(day_month));
+        proEconCurveFittMonthSubService.deleteProEconCurveFittMonthSubGByMonth(String.valueOf(day_year),String.valueOf(day_month));
         c.set(Calendar.DAY_OF_MONTH, 1);
         Date begin = c.getTime();
 
@@ -555,9 +555,9 @@ public class PowerCurveFittingByTimeGfService {
         int day_year = c.get(Calendar.YEAR);
 
 
-        proEconWtCurveFittingYearService.deleteProEconWtCurveFittingByYear(String.valueOf(day_year));
-        proEconCurveFittYearMainService.deleteProEconCurveFittYearMainByYear(String.valueOf(day_year));
-        proEconCurveFittYearSubService.deleteProEconCurveFittYearSubByYear(String.valueOf(day_year));
+        proEconWtCurveFittingYearService.deleteProEconWtCurveFittingGByYear(String.valueOf(day_year));
+        proEconCurveFittYearMainService.deleteProEconCurveFittYearMainGByYear(String.valueOf(day_year));
+        proEconCurveFittYearSubService.deleteProEconCurveFittYearSubGByYear(String.valueOf(day_year));
         c.set(Calendar.DAY_OF_MONTH, 1);
         c.set(Calendar.MONTH, 0);
         Date begin = c.getTime();

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

@@ -74,9 +74,9 @@ public class PowerCurveFittingByTimeService {
 
         Date begin = DateUtils.addDays(end, -6);
 
-        proEconWtCurveFittingService.deleteProEconWtCurveFittingByDay(DateUtils.truncate(recordDate));
-        proEconCurveFittingMainService.deleteProEconCurveFittingMainByDay(DateUtils.truncate(recordDate));
-        proEconCurveFittingSubService.deleteProEconCurveFittingSubByDay(DateUtils.truncate(recordDate));
+        proEconWtCurveFittingService.deleteProEconWtCurveFittingFByDay(DateUtils.truncate(recordDate));
+        proEconCurveFittingMainService.deleteProEconCurveFittingMainFByDay(DateUtils.truncate(recordDate));
+        proEconCurveFittingSubService.deleteProEconCurveFittingSubFByDay(DateUtils.truncate(recordDate));
         Map<String, CureFittingVo> windMap = new HashMap<>();
 
         //初始化风机装机容量
@@ -308,9 +308,9 @@ public class PowerCurveFittingByTimeService {
         int day_month = c.get(Calendar.MONTH) + 1;
 
 
-        proEconWtCurveFittingMonthService.deleteProEconWtCurveFittingByMonth(String.valueOf(day_year),String.valueOf(day_month));
-        proEconCurveFittMonthMainService.deleteProEconCurveFittMonthMainByMonth(String.valueOf(day_year),String.valueOf(day_month));
-        proEconCurveFittMonthSubService.deleteProEconCurveFittMonthSubByMonth(String.valueOf(day_year),String.valueOf(day_month));
+        proEconWtCurveFittingMonthService.deleteProEconWtCurveFittingFByMonth(String.valueOf(day_year),String.valueOf(day_month));
+        proEconCurveFittMonthMainService.deleteProEconCurveFittMonthMainFByMonth(String.valueOf(day_year),String.valueOf(day_month));
+        proEconCurveFittMonthSubService.deleteProEconCurveFittMonthSubFByMonth(String.valueOf(day_year),String.valueOf(day_month));
         c.set(Calendar.DAY_OF_MONTH, 1);
         Date begin = c.getTime();
 
@@ -568,9 +568,9 @@ public class PowerCurveFittingByTimeService {
         int day_year = c.get(Calendar.YEAR);
 
 
-        proEconWtCurveFittingYearService.deleteProEconWtCurveFittingByYear(String.valueOf(day_year));
-        proEconCurveFittYearMainService.deleteProEconCurveFittYearMainByYear(String.valueOf(day_year));
-        proEconCurveFittYearSubService.deleteProEconCurveFittYearSubByYear(String.valueOf(day_year));
+        proEconWtCurveFittingYearService.deleteProEconWtCurveFittingFByYear(String.valueOf(day_year));
+        proEconCurveFittYearMainService.deleteProEconCurveFittYearMainFByYear(String.valueOf(day_year));
+        proEconCurveFittYearSubService.deleteProEconCurveFittYearSubFByYear(String.valueOf(day_year));
         c.set(Calendar.DAY_OF_MONTH, 1);
         c.set(Calendar.MONTH, 0);
         Date begin = c.getTime();

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

@@ -8,6 +8,7 @@ import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.CureFittingVo;
 import com.gyee.generation.model.vo.PointVo;
 import com.gyee.generation.model.vo.PointfVo;
+import com.gyee.generation.model.vo.WpType;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.math.LineUtil;
@@ -117,7 +118,10 @@ public class PowerCurveFittingService {
         for (ProBasicEquipment wt : wtls) {
             String windturbineId = wt.getId();
 
-
+            if(wt.getWindpowerstationId().contains(WpType.GDC.id))
+            {
+                continue;
+            }
             Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
             //设备有功功率
             String pointIdGL = windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getNemCode();

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

@@ -13,5 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconCurveFittMonthMainService extends IService<ProEconCurveFittMonthMain> {
 
-    public int deleteProEconCurveFittMonthMainByMonth(String year, String month);
+    public int deleteProEconCurveFittMonthMainFByMonth(String year, String month);
+    public int deleteProEconCurveFittMonthMainGByMonth(String year, String month);
 }

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

@@ -13,5 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconCurveFittMonthSubService extends IService<ProEconCurveFittMonthSub> {
 
-    public int deleteProEconCurveFittMonthSubByMonth(String year, String month);
+    public int deleteProEconCurveFittMonthSubFByMonth(String year, String month);
+    public int deleteProEconCurveFittMonthSubGByMonth(String year, String month);
 }

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

@@ -13,5 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconCurveFittYearMainService extends IService<ProEconCurveFittYearMain> {
 
-    public int deleteProEconCurveFittYearMainByYear(String year);
+    public int deleteProEconCurveFittYearMainFByYear(String year);
+    public int deleteProEconCurveFittYearMainGByYear(String year);
 }

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

@@ -13,5 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconCurveFittYearSubService extends IService<ProEconCurveFittYearSub> {
 
-    public int deleteProEconCurveFittYearSubByYear(String year);
+    public int deleteProEconCurveFittYearSubFByYear(String year);
+    public int deleteProEconCurveFittYearSubGByYear(String year);
 }

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

@@ -15,5 +15,6 @@ import java.util.Date;
  */
 public interface IProEconCurveFittingMainService extends IService<ProEconCurveFittingMain> {
 
-    public int deleteProEconCurveFittingMainByDay(Date recodedate);
+    public int deleteProEconCurveFittingMainFByDay(Date recodedate);
+    public int deleteProEconCurveFittingMainGByDay(Date recodedate);
 }

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

@@ -15,5 +15,6 @@ import java.util.Date;
  */
 public interface IProEconCurveFittingSubService extends IService<ProEconCurveFittingSub> {
 
-    public int deleteProEconCurveFittingSubByDay(Date recodedate);
+    public int deleteProEconCurveFittingSubFByDay(Date recodedate);
+    public int deleteProEconCurveFittingSubGByDay(Date recodedate);
 }

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

@@ -13,5 +13,6 @@ import com.gyee.generation.model.auto.ProEconWtCurveFittingMonth;
  */
 public interface IProEconWtCurveFittingMonthService extends IService<ProEconWtCurveFittingMonth> {
 
-    public int deleteProEconWtCurveFittingByMonth(String year, String month);
+    public int deleteProEconWtCurveFittingFByMonth(String year, String month);
+    public int deleteProEconWtCurveFittingGByMonth(String year, String month);
 }

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

@@ -15,5 +15,6 @@ import java.util.Date;
  */
 public interface IProEconWtCurveFittingService extends IService<ProEconWtCurveFitting> {
 
-    public int deleteProEconWtCurveFittingByDay(Date recodedate);
+    public int deleteProEconWtCurveFittingFByDay(Date recodedate);
+    public int deleteProEconWtCurveFittingGByDay(Date recodedate);
 }

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

@@ -13,5 +13,6 @@ import com.gyee.generation.model.auto.ProEconWtCurveFittingYear;
  */
 public interface IProEconWtCurveFittingYearService extends IService<ProEconWtCurveFittingYear> {
 
-    public int deleteProEconWtCurveFittingByYear(String year);
+    public int deleteProEconWtCurveFittingFByYear(String year);
+    public int deleteProEconWtCurveFittingGByYear(String year);
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconCurveFittMonthMainServiceImpl.java

@@ -22,8 +22,13 @@ public class ProEconCurveFittMonthMainServiceImpl extends ServiceImpl<ProEconCur
     @Resource
     private ProEconCurveFittMonthMainMapper proEconCurveFittMonthMainMapper;
     @Override
-    public int deleteProEconCurveFittMonthMainByMonth(String year, String month) {
+    public int deleteProEconCurveFittMonthMainFByMonth(String year, String month) {
 
-        return proEconCurveFittMonthMainMapper.deleteProEconCurveFittMonthSubByMonth(year,month);
+        return proEconCurveFittMonthMainMapper.deleteProEconCurveFittMonthSubFByMonth(year,month);
+    }
+    @Override
+    public int deleteProEconCurveFittMonthMainGByMonth(String year, String month) {
+
+        return proEconCurveFittMonthMainMapper.deleteProEconCurveFittMonthSubGByMonth(year,month);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconCurveFittMonthSubServiceImpl.java

@@ -22,8 +22,13 @@ public class ProEconCurveFittMonthSubServiceImpl extends ServiceImpl<ProEconCurv
     @Resource
     private ProEconCurveFittMonthSubMapper proEconCurveFittMonthSubMapper;
     @Override
-    public int deleteProEconCurveFittMonthSubByMonth(String year, String month) {
+    public int deleteProEconCurveFittMonthSubFByMonth(String year, String month) {
 
-        return proEconCurveFittMonthSubMapper.deleteProEconCurveFittMonthSubByMonth(year,month);
+        return proEconCurveFittMonthSubMapper.deleteProEconCurveFittMonthSubFByMonth(year,month);
+    }
+    @Override
+    public int deleteProEconCurveFittMonthSubGByMonth(String year, String month) {
+
+        return proEconCurveFittMonthSubMapper.deleteProEconCurveFittMonthSubGByMonth(year,month);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconCurveFittYearMainServiceImpl.java

@@ -22,7 +22,11 @@ public class ProEconCurveFittYearMainServiceImpl extends ServiceImpl<ProEconCurv
     @Resource
     private ProEconCurveFittYearMainMapper proEconCurveFittYearMainMapper;
     @Override
-    public int deleteProEconCurveFittYearMainByYear(String year) {
-        return proEconCurveFittYearMainMapper.deleteProEconCurveFittYearMainByYear(year);
+    public int deleteProEconCurveFittYearMainFByYear(String year) {
+        return proEconCurveFittYearMainMapper.deleteProEconCurveFittYearMainFByYear(year);
+    }
+    @Override
+    public int deleteProEconCurveFittYearMainGByYear(String year) {
+        return proEconCurveFittYearMainMapper.deleteProEconCurveFittYearMainGByYear(year);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconCurveFittYearSubServiceImpl.java

@@ -22,7 +22,11 @@ public class ProEconCurveFittYearSubServiceImpl extends ServiceImpl<ProEconCurve
     @Resource
     private ProEconCurveFittYearSubMapper proEconCurveFittYearSubMapper;
     @Override
-    public int deleteProEconCurveFittYearSubByYear(String year) {
-        return proEconCurveFittYearSubMapper.deleteProEconCurveFittYearSubByYear(year);
+    public int deleteProEconCurveFittYearSubFByYear(String year) {
+        return proEconCurveFittYearSubMapper.deleteProEconCurveFittYearSubFByYear(year);
+    }
+    @Override
+    public int deleteProEconCurveFittYearSubGByYear(String year) {
+        return proEconCurveFittYearSubMapper.deleteProEconCurveFittYearSubGByYear(year);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconCurveFittingMainServiceImpl.java

@@ -25,7 +25,12 @@ public class ProEconCurveFittingMainServiceImpl extends ServiceImpl<ProEconCurve
     private ProEconCurveFittingMainMapper proEconCurveFittingMainMapper;
 
     @Override
-    public int deleteProEconCurveFittingMainByDay(Date recodedate) {
-        return  proEconCurveFittingMainMapper.deleteProEconCurveFittingMainByDay(recodedate);
+    public int deleteProEconCurveFittingMainFByDay(Date recodedate) {
+        return  proEconCurveFittingMainMapper.deleteProEconCurveFittingMainFByDay(recodedate);
+    }
+
+    @Override
+    public int deleteProEconCurveFittingMainGByDay(Date recodedate) {
+        return  proEconCurveFittingMainMapper.deleteProEconCurveFittingMainGByDay(recodedate);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconCurveFittingSubServiceImpl.java

@@ -25,7 +25,12 @@ public class ProEconCurveFittingSubServiceImpl extends ServiceImpl<ProEconCurveF
     private ProEconCurveFittingSubMapper proEconCurveFittingSubMapper;
 
     @Override
-    public int deleteProEconCurveFittingSubByDay(Date recodedate) {
-        return  proEconCurveFittingSubMapper.deleteProEconCurveFittingSubByDay(recodedate);
+    public int deleteProEconCurveFittingSubFByDay(Date recodedate) {
+        return  proEconCurveFittingSubMapper.deleteProEconCurveFittingSubFByDay(recodedate);
+    }
+
+    @Override
+    public int deleteProEconCurveFittingSubGByDay(Date recodedate) {
+        return  proEconCurveFittingSubMapper.deleteProEconCurveFittingSubGByDay(recodedate);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconWtCurveFittingMonthServiceImpl.java

@@ -21,8 +21,13 @@ public class ProEconWtCurveFittingMonthServiceImpl extends ServiceImpl<ProEconWt
     @Resource
     private ProEconWtCurveFittingMonthMapper proEconWtCurveFittingMonthMapper;
     @Override
-    public int deleteProEconWtCurveFittingByMonth(String year, String month) {
+    public int deleteProEconWtCurveFittingFByMonth(String year, String month) {
 
-        return proEconWtCurveFittingMonthMapper.deleteProEconWtCurveFittingByMonth(year,month);
+        return proEconWtCurveFittingMonthMapper.deleteProEconWtCurveFittingFByMonth(year,month);
+    }
+    @Override
+    public int deleteProEconWtCurveFittingGByMonth(String year, String month) {
+
+        return proEconWtCurveFittingMonthMapper.deleteProEconWtCurveFittingGByMonth(year,month);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconWtCurveFittingServiceImpl.java

@@ -25,7 +25,11 @@ public class ProEconWtCurveFittingServiceImpl extends ServiceImpl<ProEconWtCurve
     private ProEconWtCurveFittingMapper proEconWtCurveFittingMapper;
 
     @Override
-    public int deleteProEconWtCurveFittingByDay(Date recodedate) {
-        return  proEconWtCurveFittingMapper.deleteProEconWtCurveFittingByDay(recodedate);
+    public int deleteProEconWtCurveFittingFByDay(Date recodedate) {
+        return  proEconWtCurveFittingMapper.deleteProEconWtCurveFittingFByDay(recodedate);
+    }
+    @Override
+    public int deleteProEconWtCurveFittingGByDay(Date recodedate) {
+        return  proEconWtCurveFittingMapper.deleteProEconWtCurveFittingGByDay(recodedate);
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconWtCurveFittingYearServiceImpl.java

@@ -21,7 +21,11 @@ public class ProEconWtCurveFittingYearServiceImpl extends ServiceImpl<ProEconWtC
     @Resource
     private ProEconWtCurveFittingYearMapper proEconWtCurveFittingYearMapper;
     @Override
-    public int deleteProEconWtCurveFittingByYear(String year) {
-        return proEconWtCurveFittingYearMapper.deleteProEconWtCurveFittingByYear(year);
+    public int deleteProEconWtCurveFittingFByYear(String year) {
+        return proEconWtCurveFittingYearMapper.deleteProEconWtCurveFittingFByYear(year);
+    }
+    @Override
+    public int deleteProEconWtCurveFittingGByYear(String year) {
+        return proEconWtCurveFittingYearMapper.deleteProEconWtCurveFittingGByYear(year);
     }
 }