Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/pom.xml

@@ -103,7 +103,9 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
+            <version>42.6.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

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

@@ -18,9 +18,9 @@ import org.springframework.core.env.Environment;
 
 
 @Configuration
-//@PropertySource("classpath:xxl-job-executor.properties")
+@PropertySource("classpath:xxl-job-executor.properties")
 //@PropertySource("classpath:xxl-job-executor2.properties")
-@PropertySource("classpath:xxl-job-executor3.properties")
+//@PropertySource("classpath:xxl-job-executor3.properties")
 //@PropertySource("classpath:xxl-job-executor4.properties")
 //@PropertySource("classpath:xxl-job-executorWPLY.properties")
 //@PropertySource("classpath:xxl-job-executorRG.properties")

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

@@ -1,7 +1,13 @@
 package com.gyee.generation.mapper.auto;
 
-import com.gyee.generation.model.auto.ProEconFaultLiminatedefects;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.generation.model.auto.ProEconFaultLiminatedefects;
+import com.gyee.generation.model.vo.FaultLiminatedefectsVo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,23 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProEconFaultLiminatedefectsMapper extends BaseMapper<ProEconFaultLiminatedefects> {
 
+    @Select("select  sum(fault_count) as faultCount,sum(right_count)  as rightCount  from pro_econ_fault_liminatedefects t  where  t.date_time>=#{beginDate}   and  t.date_time<=#{endDate} and t.windpowerstation_id=#{wpId} ")
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsRangeList(@Param(value = "beginDate") Date beginDate, @Param(value = "endDate")Date endDate, @Param(value = "wpId")String wpId);
+
+    @Select("select  sum(fault_count) as faultCount,sum(right_count)  as rightCount  from pro_econ_fault_liminatedefects t  where  t.date_time=#{recordDate}   and t.windpowerstation_id=#{wpId} ")
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsList(@Param(value = "recordDate") Date recordDate, @Param(value = "wpId")String wpId);
+
+
+    @Select("select  sum(fault_count) as faultCount,sum(right_count)  as rightCount  from pro_econ_fault_liminatedefects t  where  t.date_time>=#{beginDate}   and  t.date_time<=#{endDate} and t.project_id=#{pjId} ")
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsProjectRangeList(@Param(value = "beginDate") Date beginDate, @Param(value = "endDate")Date endDate, @Param(value = "pjId")String pjId);
+
+    @Select("select  sum(fault_count) as faultCount,sum(right_count)  as rightCount  from pro_econ_fault_liminatedefects t  where  t.date_time=#{recordDate}   and t.project_id=#{pjId} ")
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsProjectList(@Param(value = "recordDate") Date recordDate, @Param(value = "pjId")String pjId);
+
+    @Select("select  sum(fault_count) as faultCount,sum(right_count)  as rightCount  from pro_econ_fault_liminatedefects t  where  t.date_time>=#{beginDate}   and  t.date_time<=#{endDate} and t.line_id=#{lnId} ")
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsLineRangeList(@Param(value = "beginDate") Date beginDate, @Param(value = "endDate")Date endDate, @Param(value = "lnId")String lnId);
+
+    @Select("select  sum(fault_count) as faultCount,sum(right_count)  as rightCount  from pro_econ_fault_liminatedefects t  where  t.date_time=#{recordDate}   and t.line_id=#{lnId} ")
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsLineList(@Param(value = "recordDate") Date recordDate, @Param(value = "lnId")String lnId);
+
 }

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

@@ -0,0 +1,15 @@
+package com.gyee.generation.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FaultLiminatedefectsVo {
+
+    private Double faultCount;
+    private Double rightCount;
+}

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

@@ -1,7 +1,11 @@
 package com.gyee.generation.service.auto;
 
-import com.gyee.generation.model.auto.ProEconFaultLiminatedefects;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.generation.model.auto.ProEconFaultLiminatedefects;
+import com.gyee.generation.model.vo.FaultLiminatedefectsVo;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconFaultLiminatedefectsService extends IService<ProEconFaultLiminatedefects> {
 
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsRangeList(Date beginDate,Date endDate, String wpId);
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsList(Date recordDate,String wpId);
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsProjectRangeList(Date beginDate, Date endDate, String pjId);
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsProjectList( Date recordDate, String pjId);
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsLineRangeList(Date beginDate, Date endDate, String lnId);
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsLineList( Date recordDate, String lnId);
+
 }

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

@@ -2,10 +2,17 @@ package com.gyee.generation.service.auto.impl;
 
 import com.gyee.generation.model.auto.ProEconFaultLiminatedefects;
 import com.gyee.generation.mapper.auto.ProEconFaultLiminatedefectsMapper;
+import com.gyee.generation.model.vo.FaultLiminatedefectsVo;
 import com.gyee.generation.service.auto.IProEconFaultLiminatedefectsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.generation.util.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 故障消缺及时率 服务实现类
@@ -17,4 +24,60 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconFaultLiminatedefectsServiceImpl extends ServiceImpl<ProEconFaultLiminatedefectsMapper, ProEconFaultLiminatedefects> implements IProEconFaultLiminatedefectsService {
 
+    @Resource
+    private ProEconFaultLiminatedefectsMapper proEconFaultLiminatedefectsMapper;
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsRangeList(Date beginDate, Date endDate, String wpId)
+    {
+        List<FaultLiminatedefectsVo> ls=new ArrayList<>();
+        if(StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) && StringUtils.notEmp(wpId))
+        {
+            ls=proEconFaultLiminatedefectsMapper.queryFaultLiminatedefectsRangeList(beginDate,endDate,wpId);
+        }
+        return ls;
+    }
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsList(Date recordDate, String wpId)
+    {
+        List<FaultLiminatedefectsVo> ls=new ArrayList<>();
+        if(StringUtils.notEmp(recordDate)  && StringUtils.notEmp(wpId))
+        {
+            ls=proEconFaultLiminatedefectsMapper.queryFaultLiminatedefectsList(recordDate,wpId);
+        }
+        return ls;
+    }
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsProjectRangeList(Date beginDate, Date endDate, String pjId) {
+        List<FaultLiminatedefectsVo> ls=new ArrayList<>();
+        if(StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) && StringUtils.notEmp(pjId))
+        {
+            ls=proEconFaultLiminatedefectsMapper.queryFaultLiminatedefectsProjectRangeList(beginDate,endDate,pjId);
+        }
+        return ls;
+    }
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsProjectList( Date recordDate, String pjId) {
+        List<FaultLiminatedefectsVo> ls=new ArrayList<>();
+        if(StringUtils.notEmp(recordDate)  && StringUtils.notEmp(pjId))
+        {
+            ls=proEconFaultLiminatedefectsMapper.queryFaultLiminatedefectsProjectList(recordDate,pjId);
+        }
+        return ls;
+    }
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsLineRangeList(Date beginDate, Date endDate, String lnId) {
+        List<FaultLiminatedefectsVo> ls=new ArrayList<>();
+        if(StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) && StringUtils.notEmp(lnId))
+        {
+            ls=proEconFaultLiminatedefectsMapper.queryFaultLiminatedefectsLineRangeList(beginDate,endDate,lnId);
+        }
+        return ls;
+    }
+
+    public List<FaultLiminatedefectsVo> queryFaultLiminatedefectsLineList( Date recordDate, String lnId) {
+        List<FaultLiminatedefectsVo> ls=new ArrayList<>();
+        if(StringUtils.notEmp(recordDate)  && StringUtils.notEmp(lnId))
+        {
+            ls=proEconFaultLiminatedefectsMapper.queryFaultLiminatedefectsLineList(recordDate,lnId);
+        }
+        return ls;
+    }
 }

realtime/generationXK-service/src/test/java/com/gyee/generation/HealthTest.java

@@ -1,7 +1,8 @@
 package com.gyee.generation;
 
 import com.gyee.common.util.DateUtils;
-import com.gyee.generation.service.*;
+import com.gyee.generation.service.InputOrOutPutService;
+import com.gyee.generation.service.ShutdownnewService;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -76,18 +77,18 @@ public class HealthTest {
 //
 //
 //
-//        begin=new Date();
-//        System.out.println("停机记录调度程序执行开始!。。。。。。");
-//        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
-////       List<ProBasicPowerstation> wpls=new ArrayList<>();
-////
-////        ProBasicPowerstation wp=  CacheContext.wpmap.get("SXJ_KGDL_GJY_FDC_STA");
-////       wpls.add(wp);
-////        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
-//        shutdownnewService.execShutdown(c.getTime());
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("停机记录调度程序执行结束!。。。。。。");
+        begin=new Date();
+        System.out.println("停机记录调度程序执行开始!。。。。。。");
+        ShutdownnewService shutdownnewService= SpringUtils.getBean("shutdownnewService");
+//       List<ProBasicPowerstation> wpls=new ArrayList<>();
+//
+//        ProBasicPowerstation wp=  CacheContext.wpmap.get("SXJ_KGDL_GJY_FDC_STA");
+//       wpls.add(wp);
+//        List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get("SXJ_KGDL_GJY_FDC_STA");
+        shutdownnewService.execShutdown(c.getTime());
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("停机记录调度程序执行结束!。。。。。。");
 //
 //
 //        begin=new Date();
@@ -177,15 +178,15 @@ public class HealthTest {
 //        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 //
 //
-        begin=new Date();
-        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-       EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-        EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-        EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-        EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
-        EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
-        WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
+//        begin=new Date();
+//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+//       EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
+//        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
+//        EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
+//        EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
+//        EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
+//        EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
+//        WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
 //
 //        equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
 //
@@ -193,7 +194,7 @@ public class HealthTest {
 //
 //        equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
 //
-        equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+//        equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
 //
 //        equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
 //
@@ -202,9 +203,9 @@ public class HealthTest {
 //        equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
 //
 //        wtAlysisDayService.calEquipmentInfoDay(c.getTime());
-        end=new Date();
-        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 //
 //
 //