From 723f7f30bd818548cb3dc2a75d11e9666cca4f8a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 15:05:11 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java | 140 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 140 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
index fbd8b64..3837520 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
@@ -1,10 +1,16 @@
package com.yeshi.fanli.service.impl.user;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserActiveLogMapper;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
@@ -37,4 +43,138 @@
return userActiveLogMapper.selectLatestByUid(uid);
}
+
+ @Override
+ public List<Object> countSameDayByChannel(String channel, Integer type, String years,
+ String startTime, String endTime) throws Exception{
+ List<Map<String, Object>> list = userActiveLogMapper.countSameDayByChannel(channel, type, years,
+ startTime, endTime);
+
+ if (list == null || list.size() == 0) {
+ return null;
+ }
+
+ switch (type){
+ case 1: // 鎸夊ぉ澶勭悊
+ return dayFactory(startTime, endTime, list);
+ case 2: // 鎸夋湀澶勭悊
+ return monthFactory(list);
+ case 3:
+ return yearFactory(list);
+ default:
+ return null;
+ }
+ }
+
+
+ public List<Object> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {
+
+ List<Object> listObject = new ArrayList<Object>();
+
+ if (startTime.equals(endTime)) {
+
+ Map<String, Object> map = list.get(0);
+ Object sameDayNum = map.get("sameDayNum");
+
+ if (sameDayNum == null) {
+ map.put("sameDayNum", 0);
+ }
+ listObject.add(map);
+
+ return listObject;
+ }
+
+
+ String plusDay = "";
+ for (int i = 0; i < 1000 ; i++) {
+ if (i == 0) {
+ plusDay = startTime;
+ } else {
+ plusDay = DateUtil.plusDay(i, startTime);
+ }
+
+ Map<String, Object> mapObject = new HashMap<String, Object>();
+ Object sameDayNum = null;
+
+ for (int j = 0; j < list.size(); j++) {
+ Map<String, Object> map = list.get(j);
+ Object createDate = map.get("createDate");
+ String month = createDate.toString();
+ if (plusDay.equalsIgnoreCase(month)) {
+ sameDayNum = map.get("sameDayNum");
+ break;
+ }
+ }
+
+ if (sameDayNum == null) {
+ sameDayNum = 0;
+ }
+ mapObject.put("sameDayNum", sameDayNum);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
+ Date parseDate = sdf.parse(plusDay.toString());
+
+ mapObject.put("createDate", sdf2.format(parseDate));
+
+ listObject.add(mapObject);
+
+ if (plusDay.equals(endTime)) {
+ break; // 鏃堕棿缁撴潫
+ }
+ }
+
+ return listObject;
+ }
+
+
+ public List<Object> monthFactory(List<Map<String, Object>> list) {
+
+ List<Object> listObject = new ArrayList<Object>();
+ // 12 涓湀澶勭悊
+ for (int i = 1; i <= 12; i++) {
+ Map<String, Object> mapObject = new HashMap<String, Object>();
+ Object sameDayNum = null;
+ for (int j = 0; j < list.size(); j++) {
+ Map<String, Object> map = list.get(j);
+ Object createDate = map.get("createDate");
+ String month = createDate.toString();
+ if ((i+"").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
+ sameDayNum = map.get("sameDayNum");
+ break;
+ }
+ }
+
+ if (sameDayNum == null) {
+ sameDayNum = 0;
+ }
+ mapObject.put("sameDayNum", sameDayNum);
+
+ mapObject.put("createDate", i + "鏈�");
+
+ listObject.add(mapObject);
+ }
+ return listObject;
+ }
+
+ public List<Object> yearFactory(List<Map<String, Object>> list) {
+
+ List<Object> listObject = new ArrayList<Object>();
+
+ for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> map = list.get(i);
+ Object sameDayNum = map.get("sameDayNum");
+ Object createDate = map.get("createDate");
+
+ if (sameDayNum == null) {
+ sameDayNum = 0;
+ }
+ map.put("sameDayNum", sameDayNum);
+ map.put("createDate", createDate + "骞�");
+
+ listObject.add(map);
+ }
+
+ return listObject;
+ }
}
--
Gitblit v1.8.0