计算电量算法

realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/mapper/auto/WindturbinebjcountMapper.java

@@ -1,10 +1,7 @@
 package com.gyee.healthmodel.mapper.auto;
 
-import com.gyee.healthmodel.model.auto.Partbjcount;
-import com.gyee.healthmodel.model.auto.Statejudgmentrecord2;
-import com.gyee.healthmodel.model.auto.Windturbinebjcount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gyee.healthmodel.model.auto.Windturbineinfoday3;
+import com.gyee.healthmodel.model.auto.Windturbinebjcount;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
@@ -24,24 +21,27 @@ import java.util.List;
 public interface WindturbinebjcountMapper extends BaseMapper<Windturbinebjcount> {
 
 
-    @Delete(" delete from Windturbinebjcount ")
+    @Delete(" delete from pro_econ_windturbine_warn_count ")
     public int deleteWindturbineBjCountData();
 
 
-    @Insert(" insert into windturbinebjcount (id,wtid,lnid,wpid,alertruleid,alertrulename,part,count,reference,recodedate) values(#{id,jdbcType=VARCHAR},#{wtid,jdbcType=VARCHAR},#{lnid,jdbcType=VARCHAR},#{wpid,jdbcType=VARCHAR},#{alertruleid,jdbcType=VARCHAR},#{alertrulename,jdbcType=VARCHAR},#{part,jdbcType=VARCHAR},#{count,jdbcType=INTEGER},#{reference,jdbcType=DOUBLE},#{recodedate}) ")
+    @Insert(" insert into pro_econ_windturbine_warn_count (id,wp_id,pj_id,ln_id,wt_id,record_date,alertrule_id,alertrule_name,total,average_quantity,part) " +
+            "values(#{id,jdbcType=VARCHAR},#{wp_id,jdbcType=VARCHAR},#{pj_id,jdbcType=VARCHAR}," +
+            "#{ln_id,jdbcType=VARCHAR},#{wt_id,jdbcType=VARCHAR},#{record_date},#{alertrule_id,jdbcType=VARCHAR},#{alertrule_name,jdbcType=VARCHAR}," +
+            "#{total,jdbcType=INTEGER},#{average_quantity,jdbcType=DOUBLE},#{part,jdbcType=VARCHAR}) ")
     public int insertWindturbineBjCount(Windturbinebjcount windturbinebjcount);
 
 
-    @Select(" select * from WindturbinebjCount where alertruleid=#{alertruleid}  and lnid=#{lnid}   ")
-    public List<Windturbinebjcount> queryWindturbinebjCountByLineAndAlertrule(@Param(value = "alertruleid") String alertruleid, @Param(value = "lnid")String lnid);
+    @Select(" select * from pro_econ_windturbine_warn_count where alertrule_id=#{alertrule_id}  and ln_id=#{ln_id}   ")
+    public List<Windturbinebjcount> queryWindturbinebjCountByLineAndAlertrule(@Param(value = "alertrule_id") String alertrule_id, @Param(value = "ln_id")String ln_id);
 
-    @Select(" select lnid from Windturbinebjcount where alertruleid=#{alertruleid}  group by lnid   ")
-    public List<String> queryWindturbinebjCountLine(@Param(value = "alertruleid") String alertruleid);
+    @Select(" select ln_id from pro_econ_windturbine_warn_count where alertrule_id=#{alertrule_id}  group by ln_id   ")
+    public List<String> queryWindturbinebjCountLine(@Param(value = "alertrule_id") String alertrule_id);
 
 
 
-    @Delete(" delete from Windturbinebjcount where recodedate=#{recodedate} ")
-    public int deleteWindturbinebjcount(@Param(value = "recodedate") Date recodedate);
+    @Delete(" delete from pro_econ_windturbine_warn_count where record_date=#{record_date} ")
+    public int deleteWindturbinebjcount(@Param(value = "record_date") Date record_date);
 
 
 

realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/service/auto/impl/CurvefittingsubServiceImpl.java

@@ -1,11 +1,9 @@
 package com.gyee.healthmodel.service.auto.impl;
 
-import com.gyee.healthmodel.mapper.auto.CurvefittingmainMapper;
-import com.gyee.healthmodel.model.auto.Curvefittingmain;
-import com.gyee.healthmodel.model.auto.Curvefittingsub;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.healthmodel.mapper.auto.CurvefittingsubMapper;
+import com.gyee.healthmodel.model.auto.Curvefittingsub;
 import com.gyee.healthmodel.service.auto.ICurvefittingsubService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -29,7 +27,7 @@ public class CurvefittingsubServiceImpl extends ServiceImpl<CurvefittingsubMappe
     public List<Curvefittingsub> getCurvefittingByDate(Date beginDate, Date endDate) {
         return  curvefittingsubMapper.getCurvefittingByDate( beginDate, endDate);
     }
-
+    @Override
     public List<Curvefittingsub> getCurvefittingByParams(Date recorddate,String wtId, Double min,Double max)
     {
         return  curvefittingsubMapper.getCurvefittingByParams(recorddate,wtId,min,max);

realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/util/DateUtils.java

@@ -224,7 +224,6 @@ public class DateUtils {
      * 在指定的时间上加指定的月数
      * 
      * @param date
-     * @param month
      * @return
      */
     public static Date addYears(Date date, int year) {
@@ -238,7 +237,7 @@ public class DateUtils {
      * 在指定时间上加指定的小时
      * 
      * @param date
-     * @param day
+
      * @return
      */
     public static Date addHours(Date date, int hour) {
@@ -249,7 +248,6 @@ public class DateUtils {
      * 在指定时间上加指定的分钟
      * 
      * @param date
-     * @param day
      * @return
      */
     public static Date addMinutes(Date date, int m) {
@@ -260,7 +258,6 @@ public class DateUtils {
      * 在指定时间上加指定的秒
      * 
      * @param date
-     * @param day
      * @return
      */
     public static Date addSeconds(Date date, int s) {
@@ -458,9 +455,9 @@ public class DateUtils {
 
         Calendar c = Calendar.getInstance();
         c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
-        c.set(Calendar.HOUR_OF_DAY, 23);
-        c.set(Calendar.MINUTE, 59);
-        c.set(Calendar.SECOND, 59);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
         return c.getTime();
     }
 

realtime/healthmodel-server-cph/src/test/java/HealthTest.java

@@ -1,12 +1,9 @@
 import com.gyee.healthmodel.HealthmodelMain;
-import com.gyee.healthmodel.service.HealthJudgeService;
-import com.gyee.healthmodel.service.RecommenmainsService;
+import com.gyee.healthmodel.service.LosspowerratesService;
 import com.gyee.healthmodel.util.SpringUtils;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
-import java.util.Calendar;
-
 public class HealthTest {
 
     @SneakyThrows
@@ -16,15 +13,19 @@ public class HealthTest {
 
         System.out.println("调度程序执行开始!........");
 
-        HealthJudgeService healthJudgeService= SpringUtils.getBean("healthJudgeService");
-//        healthJudgeService.healthJudge3();
-        healthJudgeService.changeHealthModelValue();
-       RecommenmainsService recommenmainsService= SpringUtils.getBean("recommenmainsService");
-        Calendar cal = Calendar.getInstance();
+//        HealthJudgeService healthJudgeService= SpringUtils.getBean("healthJudgeService");
+////        healthJudgeService.healthJudge3();
+//        healthJudgeService.changeHealthModelValue();
+//       RecommenmainsService recommenmainsService= SpringUtils.getBean("recommenmainsService");
+//        Calendar cal = Calendar.getInstance();
 //        recommenmainsService.deleteList(cal.getTime());
 //        recommenmainsService.recommenMainWt();
-        healthJudgeService.saveWindturbineBjCount();
- healthJudgeService.savePartbjcount();
+//        healthJudgeService.saveWindturbineBjCount();
+// healthJudgeService.savePartbjcount();
+
+
+        LosspowerratesService losspowerratesService= SpringUtils.getBean("losspowerratesService");
+        losspowerratesService.saveLosspowerrate();
          System.out.println("调度任务处理完成!........");