#2205 fixed data monitoring sql query mysql dedicated

metatron-app · Jun 12, 2019 · 2cd24cc · 2cd24cc
1 parent 4798833
commit 2cd24cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/discovery-server/src/main/java/app/metatron/discovery/domain/audit/AuditController.java b/discovery-server/src/main/java/app/metatron/discovery/domain/audit/AuditController.java
@@ -214,8 +214,11 @@ public ResponseEntity<?> countByStatusDate(
     LineChartSeriesResponse<DateTime> result = new LineChartSeriesResponse<>(seriesNames);
 
     mapByDate.entrySet().forEach(map -> {
-      DateTime dateTime = new DateTime(map.getKey(), DateTimeZone.UTC)
-              .withTime(0, 0, 0, 0);
+      String yearAndDayOfYear = map.getKey();
+      DateTime dateTime
+          = new DateTime(Integer.parseInt(yearAndDayOfYear.substring(0, 4)), 1, 1, 0, 0, DateTimeZone.UTC)
+                        .plusDays(Integer.parseInt(yearAndDayOfYear.substring(4)) - 1);
+
       Map<Audit.AuditStatus, Long> cntMap = map.getValue();
       result.add(dateTime, cntMap.get(Audit.AuditStatus.SUCCESS), cntMap.get(Audit.AuditStatus.FAIL));
     });

diff --git a/discovery-server/src/main/java/app/metatron/discovery/domain/audit/AuditRepositoryImpl.java b/discovery-server/src/main/java/app/metatron/discovery/domain/audit/AuditRepositoryImpl.java
@@ -54,9 +54,12 @@ public List<AuditStatsDto> countByUser(Predicate predicate) {
   public List<AuditStatsDto> countStatusByDate(Predicate predicate) {
     NumberPath<Long> aliasDate = Expressions.numberPath(Long.class, "date");
     QAudit qAudit = QAudit.audit;
+    Expression<String> groupDateExpr = qAudit.startTime.year().stringValue()
+                                                       .concat(qAudit.startTime.dayOfYear().stringValue());
 
-    Expression<String> groupDateExpr = Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qAudit.startTime, "%Y-%m-%d");
-    Expression<String> selectDateExpr = Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qAudit.startTime, "%Y-%m-%d").as("date");
+    Expression<String> selectDateExpr = qAudit.startTime.year().stringValue()
+                                                        .concat(qAudit.startTime.dayOfYear().stringValue())
+                                                        .as("date");
 
     return from(qAudit)
             .select(Projections.constructor(AuditStatsDto.class, selectDateExpr, qAudit.status, qAudit.count()))