Merge branch 'master' of http://39.105.58.247:3100/hydw/hycw

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmLineMapper.java

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.powerdistribution.domain.PdmLine;
 import com.ruoyi.powerdistribution.domain.vo.PdmLineComplete;
 
@@ -66,4 +68,10 @@ public interface PdmLineMapper
      * @return
      */
     List<PdmLineComplete> selectCompleteList(PdmLineComplete complete);
+
+    /**
+     * 计算无故障持续时间和奖励金额
+     * @param map
+     */
+    void calculateBounsProc(Map<String,Object> map);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmLineService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.powerdistribution.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.powerdistribution.domain.PdmLine;
 import com.ruoyi.powerdistribution.domain.vo.PdmLineComplete;
 
@@ -66,4 +68,10 @@ public interface IPdmLineService
      * @return
      */
     List<PdmLineComplete> selectCompleteList(PdmLineComplete complete);
+
+    /**
+     * 计算无故障持续时间和奖励金额
+     * @param map
+     */
+    void calculateBounsProc(Map<String,Object> map);
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmLineServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.powerdistribution.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.powerdistribution.domain.vo.PdmLineComplete;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,4 +98,9 @@ public class PdmLineServiceImpl implements IPdmLineService
     public List<PdmLineComplete> selectCompleteList(PdmLineComplete complete) {
         return pdmLineMapper.selectCompleteList(complete);
     }
+
+    @Override
+    public void calculateBounsProc(Map<String, Object> map) {
+        pdmLineMapper.calculateBounsProc(map);
+    }
 }

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmLineMapper.xml

@@ -200,4 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ) a
     </select>
+    <update id="calculateBounsProc" statementType="CALLABLE" parameterType="java.util.Map">
+        {call calculateBounsProc(#{calcuDate, mode=IN})}
+    </update>
 </mapper>

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PdmTask.java

@@ -0,0 +1,37 @@
+package com.ruoyi.quartz.task;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.powerdistribution.service.IPdmLineService;
+import com.ruoyi.powerdistribution.service.IPdmScoreRankManagerService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配网定时任务调度
+ *
+ * @author ruoyi
+ */
+@Component("pdmTask")
+public class PdmTask {
+    @Resource
+    private IPdmLineService lineService;
+
+    /**
+     * 计算无故障持续时间奖励金额
+     * @param calcuDate
+     */
+    public void calculateBouns(String calcuDate) {
+        System.out.println("=======计算无故障持续时间奖励金额开始=========");
+        Map<String,Object> map=new HashMap<>();
+        if(StringUtils.isEmpty(calcuDate)){
+            calcuDate= DateUtils.getDate();
+        }
+        map.put("calcuDate",calcuDate);
+        lineService.calculateBounsProc(map);
+        System.out.println("=======计算无故障持续时间奖励金额结束=========");
+    }
+}