From 0c78c7aaeaa5a427bc8a5c5faf3cd6bbb589c2da Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 08 十月 2019 12:08:38 +0800
Subject: [PATCH] map 改造
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java | 156 +++++++++++++++++++++------------------------------
1 files changed, 64 insertions(+), 92 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
index bae5662..0b864cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
@@ -4,7 +4,6 @@
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -15,6 +14,7 @@
import com.yeshi.fanli.dao.mybatis.UserInfoCountMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.service.inter.count.UserInfoCountService;
import com.yeshi.fanli.vo.user.UserGoldCoinVO;
@@ -55,27 +55,26 @@
}
@Override
- public List<Map<String, Object>> countNewUserByDate(String channel,Integer type,String years, String startTime,
+ public List<ChartTDO> countNewUserByDate(String channel,Integer type,String years, String startTime,
String endTime) throws Exception {
return userInfoMapper.countNewUserByDate(channel, type, years, startTime, endTime);
}
@Override
- public List<Map<String, Object>> getTodayBuyRate(String channel, Integer dateType,String years, String startTime,
+ public List<ChartTDO> getTodayBuyRate(String channel, Integer dateType,String years, String startTime,
String endTime) throws Exception {
- List<Map<String, Object>> result_list = null;
+ List<ChartTDO> result_list = null;
- List<Map<String, Object>> listToday =
+ List<ChartTDO> listToday =
userInfoMapper.getTodayHasOrder(channel, dateType, years, startTime, endTime);
if (listToday == null || listToday.size() == 0) {
return result_list;
}
- List<Map<String, Object>> listTotal =
- userInfoMapper.countNewUserByDate(channel, dateType, years, startTime, endTime);
+ List<ChartTDO> listTotal = userInfoMapper.countNewUserByDate(channel, dateType, years, startTime, endTime);
if (listTotal == null || listTotal.size() == 0) {
return result_list;
@@ -98,50 +97,40 @@
DecimalFormat df = new DecimalFormat("#.00");
for (int i = 0; i < result_list.size(); i++) {
-
double proportion = 0;
- Map<String, Object> resultMap = result_list.get(i);
- Object showDate = resultMap.get("showDate");
-
+ ChartTDO chartTDO = result_list.get(i);
+ String showDate = chartTDO.getShowDate();
for (int j = 0; j < listToday.size(); j++) {
-
- Map<String, Object> innerMap = listToday.get(j);
- Object innerDate = innerMap.get("showDate");
-
- if (innerDate != null && innerDate.toString().equals(showDate.toString())) {
- Object innerValue = innerMap.get("showValue");
- long innerData = Long.parseLong(innerValue.toString());
+ ChartTDO innerTDO = listToday.get(j);
+ String innerDate = innerTDO.getShowDate();
+ if (innerDate != null && innerDate.equals(showDate)) {
+ String innerValue = innerTDO.getShowValue();
+ long innerData = Long.parseLong(innerValue);
- Object showValue = resultMap.get("showValue");
- long showData = Long.parseLong(showValue.toString());
+ String showValue = chartTDO.getShowValue();
+ long showData = Long.parseLong(showValue);
if (showData > 0) {
proportion = innerData/(double)showData;
}
-
break; // 缁撴潫鍐呴儴寰幆
}
}
-
- resultMap.put("showValue", Double.parseDouble(df.format(proportion *100)));
+ chartTDO.setShowValue(Double.parseDouble(df.format(proportion *100)) + "");
}
-
return result_list;
}
@Override
public List<Object> getWeekBuyRate(String channel, String startTime, String endTime,
- Integer orderNum, List<String> dateList)
- throws Exception {
-
+ Integer orderNum, List<String> dateList) throws Exception {
List<Object> resultList = new ArrayList<Object>();
-
if (dateList == null || dateList.size() == 0) {
return resultList;
}
- List<Map<String, Object>> totalList = userInfoMapper.countNewUserByDate(channel, 1, null, startTime, endTime);
+ List<ChartTDO> totalList = userInfoMapper.countNewUserByDate(channel, 1, null, startTime, endTime);
if (totalList == null || totalList.size() == 0) {
return resultList;
}
@@ -149,24 +138,21 @@
DecimalFormat df = new DecimalFormat("#.00");
for (int i = 0; i < dateList.size(); i++) {
double proportion = 0;
-
String showDate = dateList.get(i);
String plusDay = DateUtil.plusDay(7, showDate);
- Map<String, Object> map = userInfoMapper.getWeekHasOrder(channel, showDate, plusDay, orderNum);
+ ChartTDO chartTDO = userInfoMapper.getWeekHasOrder(channel, showDate, plusDay, orderNum);
- Object showValue = null;
- if (map != null) {
- showValue = map.get("showValue");
-
+ String showValue = null;
+ if (chartTDO != null) {
+ showValue = chartTDO.getShowValue();
if (showValue != null) {
for (int j = 0; j < totalList.size(); j++) {
- Map<String, Object> mapTotal = totalList.get(j);
- String reslutTime = mapTotal.get("showDate").toString();
+ ChartTDO chart = totalList.get(j);
+ String reslutTime = chart.getShowDate();
if (showDate.equalsIgnoreCase(reslutTime)) {
- Object totalObject = mapTotal.get("showValue");
-
- long hasCount = Long.parseLong(showValue.toString());
- long total = Long.parseLong(totalObject.toString());
+ String totalObject = chart.getShowValue();
+ long hasCount = Long.parseLong(showValue);
+ long total = Long.parseLong(totalObject);
if (total > 0) {
proportion = hasCount / (double) total;
@@ -183,19 +169,16 @@
return resultList;
}
-
- public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
+ public List<ChartTDO> dayFactory(String startTime, String endTime, List<ChartTDO> list) throws Exception {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
if (startTime.equals(endTime)) {
-
- Map<String, Object> map = list.get(0);
- Object total = map.get("showValue");
- if (total == null) {
- map.put("showValue", 0);
+ ChartTDO chartTDO = list.get(0);
+ String showValue = chartTDO.getShowValue();
+ if (showValue == null) {
+ chartTDO.setShowValue("0");
}
- listObject.add(map);
+ listObject.add(chartTDO);
return listObject;
}
@@ -207,27 +190,24 @@
plusDay = DateUtil.plusDay(i, startTime);
}
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
+
+ String total = null;
for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
+ ChartTDO chartTDO = list.get(j);
+ String month = chartTDO.getShowDate();
if (plusDay.equalsIgnoreCase(month)) {
- total = map.get("showValue");
+ total = chartTDO.getShowValue();
break;
}
}
if (total == null) {
- total = 0;
+ total = "0";
}
- mapObject.put("showValue", total);
-
- mapObject.put("showDate", plusDay);
-
- listObject.add(mapObject);
+ ChartTDO chartTDO = new ChartTDO();
+ chartTDO.setShowValue(total);
+ chartTDO.setShowDate(plusDay);
+ listObject.add(chartTDO);
if (plusDay.equals(endTime)) {
break; // 鏃堕棿缁撴潫
@@ -237,56 +217,48 @@
return listObject;
}
- public List<Map<String, Object>> monthFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
+ public List<ChartTDO> monthFactory(List<ChartTDO> list) {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
// 12 涓湀澶勭悊
for (int i = 1; i <= 12; i++) {
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
+ String total = null;
for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
+ ChartTDO chartTDO = list.get(j);
+ String month = chartTDO.getShowDate();
if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
- total = map.get("showValue");
+ total = chartTDO.getShowValue();
break;
}
}
if (total == null) {
- total = 0;
+ total = "0";
}
- mapObject.put("showValue", total);
+
+ ChartTDO chartTDO = new ChartTDO();
+ chartTDO.setShowValue(total);
if (i <10) {
- mapObject.put("showDate", "0"+ i);
+ chartTDO.setShowDate( "0"+ i);
} else {
- mapObject.put("showDate", i);
+ chartTDO.setShowDate( ""+ i);
}
-
- listObject.add(mapObject);
+ listObject.add(chartTDO);
}
return listObject;
}
- public List<Map<String, Object>> yearFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
+ public List<ChartTDO> yearFactory(List<ChartTDO> list) {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
for (int i = 0; i < list.size(); i++) {
- Map<String, Object> map = list.get(i);
- Object total = map.get("showValue");
-
+ ChartTDO chartTDO = list.get(i);
+ String total = chartTDO.getShowValue();
if (total == null) {
- total = 0;
+ total = "0";
}
- map.put("showValue", total);
-
- listObject.add(map);
+ chartTDO.setShowValue(total);
+ listObject.add(chartTDO);
}
-
return listObject;
}
--
Gitblit v1.8.0