shilin пре 2 година
родитељ
комит
09607308c1

+ 6 - 5
realtime/failurestatistics-server-cph/src/main/java/com/gyee/failurestatistics/model/auto/Failurestatisticsmain.java

@@ -1,15 +1,14 @@
 package com.gyee.failurestatistics.model.auto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -169,6 +168,8 @@ public class Failurestatisticsmain extends Model {
     private String day1top2Id;
     private String day1top3Id;
 
+
+
     public String getDay3top1Id() {
         return day3top1Id;
     }

+ 11 - 0
realtime/failurestatistics-server-cph/src/main/java/com/gyee/failurestatistics/service/EarlywarningService.java

@@ -153,6 +153,8 @@ public class EarlywarningService {
                         } else {
                             po.setDay1topnum(wtls.size());
                         }
+                    } else {
+                        po.setDay1topnum(wtls.size());
                     }
                     if (day3nummap.containsKey(wt.getId())) {
                         /*********************************************************************************/
@@ -162,6 +164,8 @@ public class EarlywarningService {
                         } else {
                             po.setDay3topnum(wtls.size());
                         }
+                    } else {
+                        po.setDay3topnum(wtls.size());
                     }
                     if (day7nummap.containsKey(wt.getId())) {
                         /*********************************************************************************/
@@ -171,6 +175,8 @@ public class EarlywarningService {
                         } else {
                             po.setDay7topnum(wtls.size());
                         }
+                    } else {
+                        po.setDay7topnum(wtls.size());
                     }
                     /*********************************************************************************/
                     if (day15nummap.containsKey(wt.getId())) {
@@ -180,6 +186,8 @@ public class EarlywarningService {
                         } else {
                             po.setDay15topnum(wtls.size());
                         }
+                    } else {
+                        po.setDay15topnum(wtls.size());
                     }
                     /*********************************************************************************/
                     if (month1nummap.containsKey(wt.getId())) {
@@ -189,6 +197,8 @@ public class EarlywarningService {
                         } else {
                             po.setMonth1topnum(wtls.size());
                         }
+                    } else {
+                        po.setMonth1topnum(wtls.size());
                     }
                     /*********************************************************************************/
 
@@ -206,6 +216,7 @@ public class EarlywarningService {
 
                     String tid=com.gyee.failurestatistics.util.StringUtils.getUUID();
                     po.setId(tid);
+//                    earlywarningmainService.save(po);
                     insertEarlywarningmain(po);
 //					DAY3TOP1
 //					DAY3TOP2

+ 17 - 1
realtime/failurestatistics-server-cph/src/main/java/com/gyee/failurestatistics/service/FailurestatisticsService.java

@@ -115,6 +115,9 @@ public class FailurestatisticsService {
                         } else {
                             po.setDay1topnum(wtls.size());
                         }
+                    }else
+                    {
+                        po.setDay1topnum(wtls.size());
                     }
                     if (day3nummap.containsKey(wt.getId())) {
                         /*********************************************************************************/
@@ -124,6 +127,9 @@ public class FailurestatisticsService {
                         } else {
                             po.setDay3topnum(wtls.size());
                         }
+                    }else
+                    {
+                        po.setDay3topnum(wtls.size());
                     }
                     if (day7nummap.containsKey(wt.getId())) {
                         /*********************************************************************************/
@@ -133,6 +139,9 @@ public class FailurestatisticsService {
                         } else {
                             po.setDay7topnum(wtls.size());
                         }
+                    }else
+                    {
+                        po.setDay7topnum(wtls.size());
                     }
                     /*********************************************************************************/
                     if (day15nummap.containsKey(wt.getId())) {
@@ -142,6 +151,9 @@ public class FailurestatisticsService {
                         } else {
                             po.setDay15topnum(wtls.size());
                         }
+                    }else
+                    {
+                        po.setDay15topnum(wtls.size());
                     }
                     /*********************************************************************************/
                     if (month1nummap.containsKey(wt.getId())) {
@@ -151,6 +163,9 @@ public class FailurestatisticsService {
                         } else {
                             po.setMonth1topnum(wtls.size());
                         }
+                    }else
+                    {
+                        po.setMonth1topnum(wtls.size());
                     }
                     /*********************************************************************************/
 
@@ -165,8 +180,9 @@ public class FailurestatisticsService {
                         po.setSynthesistopnum(wtls.size());
                     }
 
-                    String tid=com.gyee.failurestatistics.util.StringUtils.getUUID();
+                    String tid=StringUtils.getUUID();
                     po.setId(tid);
+ //                   failurestatisticsmainService.save(po);
                     insertFailurestatisticsmain(po);
 //					DAY3TOP1
 //					DAY3TOP2