1.路单公里统计口径和调度系统统一

王通
1 parent 17b2c875
Showing 2 changed files with 22 additions and 17 deletions
src/main/java/com/bsth/redis/ScheduleRedisService.java
src/main/java/com/bsth/server_ws/util/ScheduleCalculator.java
@@ -192,17 +192,22 @@ public class ScheduleRedisService implements CommandLineRunner {
         Application.mainServices.schedule(new Runnable() {
             @Override
             public void run() {
-                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
-                //设置key 序列化器
-                redisTemplate.setKeySerializer(new StringRedisSerializer());
-
-                DateTime dt = new DateTime();
-                dt = dt.minusDays(cacheDays);
-                List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDateLT(dt.toString("yyyy-MM-dd"));
-                calcTime(list);
-                //写入redis
-                wirte(list);
-                logger.info("redis 实际排班 over...");
+            	try {
+            		logger.info("redis 实际排班 start...");
+	                int cacheDays = Integer.parseInt(ConfigUtil.get("cache.days"));
+	                //设置key 序列化器
+	                redisTemplate.setKeySerializer(new StringRedisSerializer());
+	
+	                DateTime dt = new DateTime();
+	                dt = dt.minusDays(cacheDays);
+	                List<ScheduleRealInfo> list = scheduleRealInfoRepository.findByDateLT(dt.toString("yyyy-MM-dd"));
+	                calcTime(list);
+	                //写入redis
+	                wirte(list);
+	                logger.info("redis 实际排班 over...");
+            	} catch (Exception e) {
+            		logger.info("redis 实际排班 异常", e);
+            	}
             }
         }, 5, TimeUnit.SECONDS);
@@ -61,7 +61,7 @@ public class ScheduleCalculator {
                         if (ct.getType2().equals("3"))
                             sum = Arith.add(sum, ct.getMileage());
                     }
-                } else if (sch.getBcType().equals("out") && sch.getStatus() != -1) {
+                } else if (sch.getBcType().equals("out") && sch.getStatus() != -1 && sch.getFcsjActual() != null && sch.getZdsjActual() != null) {
                     sum = Arith.add(sum, sch.getJhlc());
                 }
             }
@@ -89,7 +89,7 @@ public class ScheduleCalculator {
                         if (ct.getType2().equals("2"))
                             sum = Arith.add(sum, ct.getMileage());
                     }
-                } else if (sch.getBcType().equals("in") && sch.getStatus() != -1) {
+                } else if (sch.getBcType().equals("in") && sch.getStatus() != -1 && sch.getFcsjActual() != null && sch.getZdsjActual() != null) {
                     sum = Arith.add(sum, sch.getJhlc());
                 }
             }
@@ -131,20 +131,20 @@ public class ScheduleCalculator {
         try {
             Set<ChildTaskPlan> cts;
             for (ScheduleRealInfo sch : list) {
-                if (sch.getStatus() == -1)
-                    continue;
                 if (isInOut(sch) || sch.getBcType().equals("ldks"))
                     continue;
                 cts = sch.getcTasks();
+
                 //有子任务
                 if (cts != null && cts.size() > 0) {
                     for (ChildTaskPlan ct : cts) {
                         if (ct.getMileageType().equals("service") && !ct.isDestroy())
                             sum = Arith.add(sum, ct.getMileage());
                     }
-                } else
+                } else if (sch.getStatus() != -1 && sch.getFcsjActual() != null && sch.getZdsjActual() != null) {
                     sum = Arith.add(sum, sch.getJhlc());
+                }
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -171,7 +171,7 @@ public class ScheduleCalculator {
                         if (ct.getMileageType().equals("empty"))
                             sum = Arith.add(sum, ct.getMileage());
                     }
-                } else if ((isInOut(sch) || sch.getBcType().equals("ldks")) && sch.getStatus() != -1) {
+                } else if ((isInOut(sch) || sch.getBcType().equals("ldks")) && sch.getStatus() != -1 && sch.getFcsjActual() != null && sch.getZdsjActual() != null) {
                     sum = Arith.add(sum, sch.getJhlc());
                 }
             }