Преглед изворни кода

[车流数据][修改][已绑定车牌数据展示]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
d8b3451597
3 измењених фајлова са 54 додато и 8 уклоњено
  1. +6
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java
  2. +43
    -7
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  3. +5
    -0
      mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml

+ 6
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java Прегледај датотеку

@@ -1,13 +1,18 @@
package com.iformall.mapper; package com.iformall.mapper;


import java.util.*;
import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.WxCUserCar; import com.iformall.domain.po.WxCUserCar;


import java.util.List;
import java.util.Map;

public interface WxCUserCarMapper extends CommonMapper<WxCUserCar, Long> { public interface WxCUserCarMapper extends CommonMapper<WxCUserCar, Long> {


List<WxCUserCar> findList(WxCUserCar wxCUserCar); List<WxCUserCar> findList(WxCUserCar wxCUserCar);
Integer countList(WxCUserCar wxCUserCar); Integer countList(WxCUserCar wxCUserCar);
Integer countUser(WxCUserBasicInfoDto dto); Integer countUser(WxCUserBasicInfoDto dto);

long queryCarCount(Map<String,Object> carParams);

} }

+ 43
- 7
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Прегледај датотеку

@@ -67,6 +67,9 @@ public class DataTowerServiceImpl implements DataTowerService {
@Autowired @Autowired
WxMsgConfigMapper wxMsgConfigMapper; WxMsgConfigMapper wxMsgConfigMapper;


@Autowired
WxCUserCarMapper wxCUserCarMapper;



//出租与未出租*********************************************** //出租与未出租***********************************************
private Map<String, Object> shopRunning(String tenantId){ private Map<String, Object> shopRunning(String tenantId){
@@ -198,7 +201,8 @@ public class DataTowerServiceImpl implements DataTowerService {
carMap.put("carCount", todaycar); carMap.put("carCount", todaycar);


//环比 //环比
long yesterdaycar = (long) historymap.get(tjTimeList.get(8 - 2).substring(5).replace("-", "/"));
String yesterday = DateUtils.getTimeBefore(1, new Date());
long yesterdaycar = (long) historymap.get(yesterday.substring(5).replace("-", "/"));
if (yesterdaycar > 0) { if (yesterdaycar > 0) {
double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100; double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100;
double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -208,7 +212,8 @@ public class DataTowerServiceImpl implements DataTowerService {
} }


//上周同期 //上周同期
long last = (long) historymap.get(tjTimeList.get(0).substring(5).replace("-", "/"));
String lastweek = DateUtils.getTimeBefore(7, new Date());
long last = (long) historymap.get(lastweek.substring(5).replace("-", "/"));
if (last > 0) { if (last > 0) {
double lasthbd = (double) (todaycar - last) / last * 100; double lasthbd = (double) (todaycar - last) / last * 100;
double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -507,7 +512,8 @@ public class DataTowerServiceImpl implements DataTowerService {
long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd")); long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd"));
datamap.put("todaycar", todaycar); datamap.put("todaycar", todaycar);
//环比 //环比
long yesterdaycar = (long) historymap.get(tjTimeList.get(8 - 2).substring(5).replace("-", "/"));
String yesterday = DateUtils.getTimeBefore(1, new Date());
long yesterdaycar = (long) historymap.get(yesterday.substring(5).replace("-", "/"));
if (yesterdaycar > 0) { if (yesterdaycar > 0) {
double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100; double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100;
double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); double hb = new BigDecimal(hbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -517,7 +523,8 @@ public class DataTowerServiceImpl implements DataTowerService {
} }


//上周同期 //上周同期
long last = (long) historymap.get(tjTimeList.get(0).substring(5).replace("-", "/"));
String lastweek = DateUtils.getTimeBefore(7, new Date());
long last = (long) historymap.get(lastweek.substring(5).replace("-", "/"));
if (last > 0) { if (last > 0) {
double lasthbd = (double) (todaycar - last) / last * 100; double lasthbd = (double) (todaycar - last) / last * 100;
double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); double lasthb = new BigDecimal(lasthbd).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -553,7 +560,6 @@ public class DataTowerServiceImpl implements DataTowerService {


datamap.put("todaycardata", hourMap); datamap.put("todaycardata", hourMap);


String yesterday = DateUtils.getTimeBefore(1, new Date());
params.put("startdate", yesterday + " 05:00:00"); params.put("startdate", yesterday + " 05:00:00");
params.put("enddate", yesterday + " 22:59:59"); params.put("enddate", yesterday + " 22:59:59");
List<Map<String, Object>> yesterdayCarlist = wxCarCmdLogMapper.queryTodayCar(params); List<Map<String, Object>> yesterdayCarlist = wxCarCmdLogMapper.queryTodayCar(params);
@@ -567,8 +573,6 @@ public class DataTowerServiceImpl implements DataTowerService {


datamap.put("yesterdaycardata", yesterdaytreemap); datamap.put("yesterdaycardata", yesterdaytreemap);



String lastweek = DateUtils.getTimeBefore(7, new Date(), "yyyy-MM-dd");
params.put("startdate", lastweek + " 05:00:00"); params.put("startdate", lastweek + " 05:00:00");
params.put("enddate", lastweek + " 22:59:59"); params.put("enddate", lastweek + " 22:59:59");
List<Map<String, Object>> lastdayCarlist = wxCarCmdLogMapper.queryTodayCar(params); List<Map<String, Object>> lastdayCarlist = wxCarCmdLogMapper.queryTodayCar(params);
@@ -582,6 +586,38 @@ public class DataTowerServiceImpl implements DataTowerService {
datamap.put("lastdaycardata", lastdaytreemap); datamap.put("lastdaycardata", lastdaytreemap);




//绑定车牌
Map<String,Object> carParams=new HashMap<>();
carParams.put("tenantId",tenantId);
carParams.put("startdate",DateUtils.getSystemTime("yyyy-MM-dd 00:00:00"));
carParams.put("enddate",DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"));
long todaybindcar = wxCUserCarMapper.queryCarCount(carParams);
carParams.put("startdate",yesterday+" 00:00:00");
carParams.put("enddate",yesterday+" 23:59:59");
long yesterdaybindcar = wxCUserCarMapper.queryCarCount(carParams);
carParams.put("startdate",lastweek+" 00:00:00");
carParams.put("enddate",lastweek+" 23:59:59");
long lastweekbindcar = wxCUserCarMapper.queryCarCount(carParams);
datamap.put("todaybindcar",todaybindcar);
//datamap.put("yesterdaybindcar",yesterdaybindcar);
//datamap.put("lastweekbindcar",lastweekbindcar);

if (yesterdaybindcar > 0) {
double yesterdaybinddhb = (double) (todaycar - yesterdaybindcar) / yesterdaybindcar * 100;
double yesterdaybindhb = new BigDecimal(yesterdaybinddhb).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
datamap.put("yesterdaybindhb", yesterdaybindhb);
} else {
datamap.put("yesterdaybindhb", "--");
}

if (lastweekbindcar > 0) {
double lastweekbinddhb = (double) (todaycar - lastweekbindcar) / lastweekbindcar * 100;
double lastweekbindhb = new BigDecimal(lastweekbinddhb).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
datamap.put("lastweekbindhb", lastweekbindhb);
} else {
datamap.put("lastweekbindhb", "--");
}

return datamap; return datamap;
} }




+ 5
- 0
mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml Прегледај датотеку

@@ -92,4 +92,9 @@
</if> </if>


</select> </select>
<select id="queryCarCount" parameterType="hashmap" resultType="long">
select count(id) from wx_c_user_car where tenant_id=#{tenantId} and create_date between #{startdate} and #{enddate}
</select>
</mapper> </mapper>

Loading…
Откажи
Сачувај