From 2922e51a7a8e657a8467c818ae16700e41ddac77 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 五月 2022 19:45:58 +0800
Subject: [PATCH] bug修复
---
app/src/main/java/com/yeshi/makemoney/app/controller/admin/goldcorn/GoldCornGetRecordAdminController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/goldcorn/GoldCornGetRecordAdminController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/goldcorn/GoldCornGetRecordAdminController.java
index 865fe21..4fd3927 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/admin/goldcorn/GoldCornGetRecordAdminController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/admin/goldcorn/GoldCornGetRecordAdminController.java
@@ -2,6 +2,7 @@
import com.google.gson.*;
import com.yeshi.makemoney.app.entity.goldcorn.GoldCornGetType;
+import com.yeshi.makemoney.app.vo.AcceptAdminData;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
@@ -20,6 +21,10 @@
import com.yeshi.makemoney.app.entity.goldcorn.GoldCornGetRecord;
import com.yeshi.makemoney.app.service.inter.goldcorn.GoldCornGetRecordService;
import com.yeshi.makemoney.app.service.query.goldcorn.GoldCornGetRecordQuery;
+import org.yeshi.utils.statistic.BaseStatisticTimeQuery;
+import org.yeshi.utils.statistic.StatisticNumberResult;
+import org.yeshi.utils.statistic.StatisticResulterFilterUtil;
+import org.yeshi.utils.statistic.StatisticTimeSpan;
@Controller
@RequestMapping("admin/api/goldcorn/get/record")
@@ -70,4 +75,29 @@
}
+ @ResponseBody
+ @RequestMapping("statistic")
+ public String statistic(AcceptAdminData acceptAdminData, long startTime, long endTime, String span, String callback) {
+ if (endTime < startTime) {
+ return JsonUtil.loadFalseResult("寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�");
+ }
+
+ if (StatisticTimeSpan.valueOf(span) == null) {
+ return JsonUtil.loadFalseResult("鏃堕棿闂撮殧涓嶅瓨鍦�");
+ }
+
+ BaseStatisticTimeQuery timeQuery = new BaseStatisticTimeQuery();
+ timeQuery.setStartTime(new Date(startTime));
+ timeQuery.setEndTime(new Date(endTime));
+ timeQuery.setTimeSpan(StatisticTimeSpan.valueOf(span));
+
+ List<StatisticNumberResult> list = goldCornGetRecordService.statistic(acceptAdminData.getSystem(), timeQuery);
+ list = StatisticResulterFilterUtil.filterNumberResult(list, timeQuery);
+ JSONObject data = new JSONObject();
+ data.put("list", new Gson().toJson(list));
+ data.put("count", list.size());
+ return JsonUtil.loadTrueResult(data);
+ }
+
+
}
--
Gitblit v1.8.0