Browse Source

调整
实时模型

guoqiang 7 months ago
parent
commit
ce2ae83536

+ 4 - 2
jeecg-module-gather/src/main/java/org/jeecg/modules/fpgJob/LeanModelStatistics.java

@@ -318,11 +318,13 @@ public class LeanModelStatistics {
                         finalDatestr = new SimpleDateFormat("HH:00").format(fpgGatherData.getCreateTime());
                     } else if("day". equals(fpgLeanModeInfo.getTotalUnit())){ //
                         finalDatestr = new SimpleDateFormat("yyyy-MM-dd").format(fpgGatherData.getCreateTime());
-                    } else if("week". equals(fpgLeanModeInfo.getTotalUnit())){ //
+                    } else if("week". equals(fpgLeanModeInfo.getTotalUnit())){ //
                         Calendar calendar = Calendar.getInstance();
                         finalDatestr = String.valueOf(calendar.get(Calendar.WEEK_OF_MONTH));
-                    } else if("month". equals(fpgLeanModeInfo.getTotalUnit())){ //
+                    } else if("month". equals(fpgLeanModeInfo.getTotalUnit())){ //
                         finalDatestr = new SimpleDateFormat("yyyy-MM").format(fpgGatherData.getCreateTime());
+                    } else if("real_time". equals(fpgLeanModeInfo.getTotalUnit())){ // 实时
+                        finalDatestr = new SimpleDateFormat("yyyy-MM-dd HH:ii:ss").format(fpgGatherData.getCreateTime());
                     }
                     String dayDate = new SimpleDateFormat("yyyy-MM-dd").format(fpgGatherData.getCreateTime());
                     String classs = "";