From a79be5c75d4409bd14a36b648c1a398b409cad65 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 08 一月 2019 16:48:39 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 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 7c1f698..648d0e5 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
@@ -1219,7 +1219,7 @@
resultList = new ArrayList<Object>();
}
channelData.put("name", channel);
- channelData.put("infos", resultList);
+ channelData.put("data_list", resultList);
array.add(channelData);
}
@@ -1273,13 +1273,80 @@
resultList = new ArrayList<Object>();
}
channelData.put("name", channel);
- channelData.put("infos", resultList);
+ channelData.put("data_list", resultList);
array.add(channelData);
}
JSONObject data = new JSONObject();
data.put("result_list", array);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 褰撳懆浜х敓3鍗曠殑鏂板鐢ㄦ埛姒傜巼
+ * @param callback
+ * @param channelArray 娓犻亾鍚嶇О
+ * @param startTime
+ * @param endTime
+ * @param orderNum 璁㈠崟鏁伴噺
+ * @param out
+ */
+ @RequestMapping(value = "getWeekProportion")
+ public void getWeekProportion(String callback, String channelArray, String startTime, String endTime,
+ Integer orderNum, PrintWriter out) {
+
+ if (StringUtil.isNullOrEmpty(startTime) || StringUtil.isNullOrEmpty(endTime)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝ｇ‘鏃堕棿鍖洪棿"));
+ return;
+ }
+
+ try {
+
+ if (orderNum == null ) {
+ orderNum = 0;
+ }
+
+
+ List<String> channelList = null;
+ if (channelArray != null && channelArray.trim().length() > 0) {
+ Gson gson = new Gson();
+ channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
+ }
+
+ if (channelList == null || channelList.size() == 0) {
+ channelList = new ArrayList<String>();
+ channelList.add("all");
+ }
+
+ JSONArray array = new JSONArray();
+ for (String channel : channelList) {
+ JSONObject channelData = new JSONObject();
+
+
+ List<Map<String, Object>> resultList = userActiveLogService.countOneWeekUserInfo(channel,
+ startTime, endTime, orderNum);
+
+ if (resultList == null) {
+ resultList = new ArrayList<Map<String, Object>>();
+ }
+
+ if ("all".equalsIgnoreCase(channel)) {
+ channel = "鎬昏";
+ }
+
+ channelData.put("name", channel);
+ channelData.put("data_list", resultList);
+ array.add(channelData);
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("result_list", array);
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
@@ -1361,8 +1428,16 @@
resultList = new ArrayList<Object>();
}
+ JSONObject innerList = new JSONObject();
+ innerList.put("name", "鏁伴噺");
+ innerList.put("data_list", resultList);
+
+ JSONArray outList = new JSONArray();
+ outList.add(innerList);
+
JSONObject data = new JSONObject();
- data.put("result_list", resultList);
+ data.put("result_list", outList);
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
--
Gitblit v1.8.0