From 233b0814bbb73b5c791ebe3643f4bd91ba2fa959 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 09:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 109 +++++-------------------------------------------------
1 files changed, 11 insertions(+), 98 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
index 3fddce4..c05f24f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java
@@ -1188,8 +1188,8 @@
* @param endTime 2018-12-01
* @param out
*/
- @RequestMapping(value = "getSameDayUserByChannel")
- public void getSameDayUserByChannel(String callback, String channelArray, Integer dateType,
+ @RequestMapping(value = "getNewUserCharts")
+ public void getNewUserCharts(String callback, String channelArray, Integer dateType,
String year, String startTime, String endTime, PrintWriter out) {
@@ -1246,7 +1246,7 @@
JSONArray line_list = new JSONArray();
for (String channel : channelList) {
- List<Map<String, Object>> list = userActiveLogService.countSameDayByChannel(channel,
+ List<Map<String, Object>> list = userInfoCountService.countNewUserByDate(channel,
dateType, year, startTime, endTime);
if ("all".equalsIgnoreCase(channel)) {
@@ -1257,7 +1257,7 @@
innerList.put("name", channel);
if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
} else {
// 骞磋鍥�
Map<String, Object> map = AdminUtils.yearsDataFactory(list);
@@ -1299,8 +1299,8 @@
* @param endTime 2018-12-01
* @param out
*/
- @RequestMapping(value = "getBuyProportion")
- public void getBuyProportion(String callback, String channelArray, Integer dateType,
+ @RequestMapping(value = "getTodayBuyRate")
+ public void getTodayBuyRate(String callback, String channelArray, Integer dateType,
String year, String startTime, String endTime, Integer orderNum, PrintWriter out) {
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
@@ -1322,7 +1322,9 @@
for (String channel: list) {
JSONObject channelData = new JSONObject();
- List<Object> resultList = userActiveLogService.getBuyProportion(channel, dateType, year, startTime, endTime, orderNum);
+ List<Object> resultList = null;
+
+ //userActiveLogService.getBuyProportion(channel, dateType, year, startTime, endTime, orderNum);
if (resultList == null) {
resultList = new ArrayList<Object>();
}
@@ -1383,8 +1385,8 @@
JSONObject channelData = new JSONObject();
- List<Map<String, Object>> resultList = userActiveLogService.countOneWeekUserInfo(channel,
- startTime, endTime, orderNum);
+ List<Map<String, Object>> resultList = null;
+ //userActiveLogService.countOneWeekUserInfo(channel, startTime, endTime, orderNum);
if (resultList == null) {
resultList = new ArrayList<Map<String, Object>>();
@@ -1434,95 +1436,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("缁熻寮傚父"));
}
- }
-
- /**
- * 缁熻鍘嗗彶鏂板鐢ㄦ埛
- * @param callback
- * @param dateType 绫诲瀷 1鏃� 2鏈� 3骞�
- * @param year 2018
- * @param startTime 2018-12-01
- * @param endTime 2018-12-01
- * @param out
- */
- @RequestMapping(value = "getNewUserCharts")
- public void getNewUserCharts(String callback, Integer dateType, String year, String startTime,
- String endTime, PrintWriter out) {
-
- String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
- if (validateMsg != null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
- return;
- }
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
-
- if (dateType == 1 && year != null) {
- year = null; // 璁剧疆涓虹┖
- } else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
- } else if (dateType == 3) {
- if (year != null)
- year = null;
-
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
- }
-
- try {
-
- Gson gson = new Gson();
- Object objectDate = null;
- List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
- JSONArray line_list = new JSONArray();
-
- List<Map<String, Object>> list = userInfoCountService
- .countNewUserByDate(dateType, year, startTime, endTime);
-
- JSONObject innerList = new JSONObject();
- innerList.put("name", "鎬昏");
-
- if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));
- } else {
- // 骞磋鍥�
- Map<String, Object> map = AdminUtils.yearsDataFactory(list);
-
- if (objectDate == null) {
- objectDate = map.get("date");
- }
- innerList.put("data", gson.toJson(map.get("value")));
- }
-
- line_list.add(innerList);
-
- JSONObject data = new JSONObject();
- if (objectDate != null) {
- data.put("xAxis_list", gson.toJson(objectDate));
- } else {
- data.put("xAxis_list", gson.toJson(dateList));
- }
-
- data.put("line_list", line_list);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
}
}
--
Gitblit v1.8.0