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/CommonOrderCountServiceImpl.java | 129 +++++++++++++++++-------------------------
1 files changed, 53 insertions(+), 76 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
index 6b942e8..ce588b7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
@@ -3,7 +3,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;
@@ -17,6 +16,7 @@
import com.yeshi.fanli.dao.mybatis.pdd.PDDOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.util.Constant;
@@ -43,19 +43,16 @@
return commonOrderCountMapper.countByState(state);
}
- public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list)
+ public List<ChartTDO> dayFactory(String startTime, String endTime, List<ChartTDO> list)
throws Exception {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
+ 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;
}
@@ -67,27 +64,22 @@
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();
- if (plusDay.equalsIgnoreCase(month)) {
- total = map.get("showValue");
+ ChartTDO chartTDO = list.get(j);
+ String showDate = chartTDO.getShowDate();
+ if (plusDay.equalsIgnoreCase(showDate)) {
+ 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.setShowDate(plusDay);
+ chartTDO.setShowValue(total);
+ listObject.add(chartTDO);
if (plusDay.equals(endTime)) {
break; // 鏃堕棿缁撴潫
@@ -97,74 +89,64 @@
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");
-
- if (total == null) {
- total = 0;
+ ChartTDO chartTDO = list.get(i);
+ String showValue = chartTDO.getShowValue();
+ if (showValue == null) {
+ chartTDO.setShowValue("0");
}
- map.put("showValue", total);
-
- listObject.add(map);
+ listObject.add(chartTDO);
}
-
return listObject;
}
@Override
- public List<Map<String, Object>> getTrackAccuracyRate(Integer dateType, String year, String startTime,
+ public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime,
String endTime, int sourceType) throws Exception {
- List<Map<String, Object>> result_list = null;
+ List<ChartTDO> result_list = null;
// 鐢ㄦ埛璁㈠崟
- List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year, startTime,
+ List<ChartTDO> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year, startTime,
endTime, sourceType);
if (listTotal == null || listTotal.size() == 0) {
return result_list;
}
// 娣樺疂鑱旂洘
- List<Map<String, Object>> type_list = null;
+ List<ChartTDO> type_list = null;
switch (sourceType) {
case Constant.SOURCE_TYPE_TAOBAO:
type_list = taoBaoOrderMapper.countOrderNumber(dateType, year, startTime, endTime);
@@ -197,44 +179,39 @@
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 < listTotal.size(); j++) {
- Map<String, Object> innerMap = listTotal.get(j);
- Object innerDate = innerMap.get("showDate");
-
+ ChartTDO innerChartTDO = listTotal.get(j);
+ String innerDate = innerChartTDO.getShowDate();
if (innerDate != null && innerDate.toString().equals(showDate.toString())) {
- Object innerValue = innerMap.get("showValue");
- long innerData = Long.parseLong(innerValue.toString());
+ String innerValue = innerChartTDO.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<Map<String, Object>> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
+ public List<ChartTDO> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
String endTime) throws Exception {
return taoBaoWeiQuanOrderMapper.countWeiQaunOrderMoney(dateType, year, startTime, endTime);
}
@Override
- public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,
+ public List<ChartTDO> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,
String endTime) throws Exception {
return taoBaoWeiQuanOrderMapper.countWeiQaunOrderNumber(dateType, year, startTime, endTime);
}
--
Gitblit v1.8.0