Просмотр исходного кода

// car data

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
250eba88ce
1 измененных файлов: 16 добавлений и 15 удалений
  1. +16
    -15
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java

+ 16
- 15
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Просмотреть файл

@@ -547,11 +547,11 @@ public class DataTowerServiceImpl implements DataTowerService {
return m.getResult();
}));

Map<Object, Object> historymap = new LinkedHashMap<>();
Map<String, String> historymap = new LinkedHashMap<>();
for (String date : tjTimeList) {
Object o = collect.get(date);
String o = collect.get(date);
if (o == null) {
historymap.put(date.substring(5).replace("-", "/"), 0L);
historymap.put(date.substring(5).replace("-", "/"), "0");
} else {
historymap.put(date.substring(5).replace("-", "/"), o);
}
@@ -588,14 +588,14 @@ public class DataTowerServiceImpl implements DataTowerService {
}));
List<String> days = DateUtils.getTjTimeList(oneWeekStartdate, oneWeekEndDate, "0");

TreeMap<String, Object> weekMap = new TreeMap<>();
TreeMap<String, String> weekMap = new TreeMap<>();
for (String date:days) {
String dateStr = date.substring(5,date.length()).replace("-","/");
Object o = weekCollect.get(dateStr);
String o = weekCollect.get(dateStr);
if(o == null) {
weekMap.put(dateStr,"0");
} else {
weekMap.put(dateStr,o.toString());
weekMap.put(dateStr,o);
}
}
datamap.put("oneWeekCarPayFeeCount",weekMap);
@@ -610,14 +610,14 @@ public class DataTowerServiceImpl implements DataTowerService {
}, m -> {
return m.getResult();
}));
TreeMap<String, Object> weekCarMap = new TreeMap<>();
TreeMap<String, String> weekCarMap = new TreeMap<>();
for (String date:days) {
String dateStr = date.substring(5,date.length()).replace("-","/");
Object o = weekCarCollect.get(dateStr);
String o = weekCarCollect.get(dateStr);
if(o == null) {
weekCarMap.put(dateStr, "0");
} else {
weekCarMap.put(dateStr, o.toString());
weekCarMap.put(dateStr, o);
}
}
datamap.put("oneWeekNewCarUserHistory",weekCarMap);
@@ -649,13 +649,13 @@ public class DataTowerServiceImpl implements DataTowerService {

//今日车流量
logger.info("停车-今日车流量-开始");
long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd"));
datamap.put("todaycar", todaycar);
String todaycarStr = historymap.get(DateUtils.getSystemTime("MM/dd"));
datamap.put("todaycar", todaycarStr);
long todaycar = Long.parseLong(todaycarStr);
//环比
logger.info("-----"+JSON.toJSONString(historymap));
String yesterday = DateUtils.getTimeBefore(1, new Date());
logger.info("-----"+yesterday);
long yesterdaycar = (long) historymap.get(yesterday.substring(5).replace("-", "/"));
String yesterdaycarStr = historymap.get(yesterday.substring(5).replace("-", "/"));
long yesterdaycar = Long.parseLong(yesterdaycarStr);
if (yesterdaycar > 0) {
double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100;
double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -668,7 +668,8 @@ public class DataTowerServiceImpl implements DataTowerService {
//上周同期
logger.info("停车-上周同期-开始");
String lastweek = DateUtils.getTimeBefore(7, new Date());
long last = (long) historymap.get(lastweek.substring(5).replace("-", "/"));
String lastStr = historymap.get(lastweek.substring(5).replace("-", "/"));
long last = Long.parseLong(lastStr);
if (last > 0) {
double lasthbd = (double) (todaycar - last) / last * 100;
double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();


Загрузка…
Отмена
Сохранить