|
@@ -6,14 +6,11 @@ import com.fdkankan.manage.mapper.IDataMapper;
|
|
|
import com.fdkankan.manage.service.IDataService;
|
|
|
import com.fdkankan.manage.service.ISceneProService;
|
|
|
import com.fdkankan.manage.service.IUserService;
|
|
|
-import com.fdkankan.manage.util.Dateutils;
|
|
|
+import com.fdkankan.manage.util.DateUtils;
|
|
|
import com.fdkankan.manage.vo.response.*;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.poi.ss.formula.functions.Count;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import javax.annotation.Resource;
|
|
|
import java.util.*;
|
|
|
|
|
|
@Service
|
|
@@ -74,12 +71,12 @@ public class DataService implements IDataService {
|
|
|
|
|
|
@Override
|
|
|
public List<DataGroupByCount> userTrend(Integer type,Integer dataType,String startTime,String endTime) {
|
|
|
- startTime = Dateutils.formatStartTime(startTime);
|
|
|
- endTime = Dateutils.formatEndTime(endTime);
|
|
|
+ startTime = DateUtils.formatStartTime(startTime);
|
|
|
+ endTime = DateUtils.formatEndTime(endTime);
|
|
|
|
|
|
List<DataGroupByCount> dataList = new ArrayList<>();
|
|
|
List<DataGroupByCount> result = new ArrayList<>();
|
|
|
- int rule = Dateutils.DAY;
|
|
|
+ int rule = DateUtils.DAY;
|
|
|
String tb = "t_user";
|
|
|
if(dataType == 2){
|
|
|
tb = "t_login_log";
|
|
@@ -89,11 +86,11 @@ public class DataService implements IDataService {
|
|
|
dataList = dataMapper.userDataGroupBy(tb, dayFormat, startTime, endTime);
|
|
|
break;
|
|
|
case 1 :
|
|
|
- rule = Dateutils.WEEK;
|
|
|
+ rule = DateUtils.WEEK;
|
|
|
dataList = dataMapper.userDataGroupByWeek(tb,startTime,endTime);
|
|
|
break;
|
|
|
case 2 :
|
|
|
- rule = Dateutils.MONTH;
|
|
|
+ rule = DateUtils.MONTH;
|
|
|
dataList = dataMapper.userDataGroupBy(tb,mouthFormat,startTime,endTime);
|
|
|
break;
|
|
|
}
|
|
@@ -106,7 +103,7 @@ public class DataService implements IDataService {
|
|
|
//查询从开始时间到结束时间为止所有天数,月份,不存在结果补零
|
|
|
HashMap<String,Long> map = new HashMap<>();
|
|
|
dataList.forEach(entity -> map.put(entity.getGroupKey(),entity.getCount()));
|
|
|
- List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
|
|
|
+ List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
|
|
|
|
|
|
setListData(result,map,dates,dataType,totalCount);
|
|
|
|
|
@@ -115,8 +112,8 @@ public class DataService implements IDataService {
|
|
|
|
|
|
@Override
|
|
|
public HashMap<String, Object> orderTrend(Integer type,Integer dataType,String startTime,String endTime) {
|
|
|
- startTime = Dateutils.formatStartTime(startTime);
|
|
|
- endTime = Dateutils.formatEndTime(endTime);
|
|
|
+ startTime = DateUtils.formatStartTime(startTime);
|
|
|
+ endTime = DateUtils.formatEndTime(endTime);
|
|
|
|
|
|
HashMap<String,Object> map = new HashMap<>();
|
|
|
if(dataType == 1){
|
|
@@ -128,7 +125,7 @@ public class DataService implements IDataService {
|
|
|
List<DataGroupByCount> incrementOrderResultList = new ArrayList<>();
|
|
|
List<DataGroupByCount> downOrderResultList = new ArrayList<>();
|
|
|
List<DataGroupByCount> partOrderResultList = new ArrayList<>();
|
|
|
- int rule = Dateutils.DAY;
|
|
|
+ int rule = DateUtils.DAY;
|
|
|
switch (type){
|
|
|
case 0 :
|
|
|
incrementOrderList = dataMapper.userDataGroupBy("t_increment_order",dayFormat,startTime,endTime);
|
|
@@ -136,13 +133,13 @@ public class DataService implements IDataService {
|
|
|
partOrderList = dataMapper.userDataGroupBy("t_order",dayFormat,startTime,endTime);
|
|
|
break;
|
|
|
case 1 :
|
|
|
- rule = Dateutils.WEEK;
|
|
|
+ rule = DateUtils.WEEK;
|
|
|
incrementOrderList = dataMapper.userDataGroupByWeek("t_increment_order",startTime,endTime);
|
|
|
downOrderList = dataMapper.userDataGroupByWeek("t_download_order",startTime,endTime);
|
|
|
partOrderList = dataMapper.userDataGroupByWeek("t_order",startTime,endTime);
|
|
|
break;
|
|
|
case 2 :
|
|
|
- rule = Dateutils.MONTH;
|
|
|
+ rule = DateUtils.MONTH;
|
|
|
incrementOrderList = dataMapper.userDataGroupBy("t_increment_order",mouthFormat,startTime,endTime);
|
|
|
downOrderList = dataMapper.userDataGroupBy("t_download_order",mouthFormat,startTime,endTime);
|
|
|
partOrderList = dataMapper.userDataGroupBy("t_order",mouthFormat,startTime,endTime);
|
|
@@ -156,7 +153,7 @@ public class DataService implements IDataService {
|
|
|
downOrderList.forEach(entity -> downOrderMap.put(entity.getGroupKey(),entity.getCount()));
|
|
|
partOrderList.forEach(entity -> partMap.put(entity.getGroupKey(),entity.getCount()));
|
|
|
|
|
|
- List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
|
|
|
+ List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
|
|
|
for (String date : dates) {
|
|
|
DataGroupByCount groupByCount = new DataGroupByCount();
|
|
|
groupByCount.setGroupKey(date);
|
|
@@ -186,7 +183,7 @@ public class DataService implements IDataService {
|
|
|
List<DataGroupBySum> incrementOrderResultList = new ArrayList<>();
|
|
|
List<DataGroupBySum> downOrderResultList = new ArrayList<>();
|
|
|
List<DataGroupBySum> partOrderResultList = new ArrayList<>();
|
|
|
- int rule = Dateutils.DAY;
|
|
|
+ int rule = DateUtils.DAY;
|
|
|
switch (type){
|
|
|
case 0 :
|
|
|
incrementOrderList = dataMapper.userDataSumGroupBy("t_increment_order",dayFormat,startTime,endTime);
|
|
@@ -194,13 +191,13 @@ public class DataService implements IDataService {
|
|
|
partOrderList = dataMapper.userDataSumGroupBy("t_order",dayFormat,startTime,endTime);
|
|
|
break;
|
|
|
case 1 :
|
|
|
- rule = Dateutils.WEEK;
|
|
|
+ rule = DateUtils.WEEK;
|
|
|
incrementOrderList = dataMapper.userDataSumGroupByWeek("t_increment_order",startTime,endTime);
|
|
|
downOrderList = dataMapper.userDataSumGroupByWeek("t_download_order",startTime,endTime);
|
|
|
partOrderList = dataMapper.userDataSumGroupByWeek("t_order",startTime,endTime);
|
|
|
break;
|
|
|
case 2 :
|
|
|
- rule = Dateutils.MONTH;
|
|
|
+ rule = DateUtils.MONTH;
|
|
|
incrementOrderList = dataMapper.userDataSumGroupBy("t_increment_order",mouthFormat,startTime,endTime);
|
|
|
downOrderList = dataMapper.userDataSumGroupBy("t_download_order",mouthFormat,startTime,endTime);
|
|
|
partOrderList = dataMapper.userDataSumGroupBy("t_order",mouthFormat,startTime,endTime);
|
|
@@ -214,7 +211,7 @@ public class DataService implements IDataService {
|
|
|
downOrderList.forEach(entity -> downOrderMap.put(entity.getGroupKey(),entity.getCount()));
|
|
|
partOrderList.forEach(entity -> partMap.put(entity.getGroupKey(),entity.getCount()));
|
|
|
|
|
|
- List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
|
|
|
+ List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
|
|
|
for (String date : dates) {
|
|
|
DataGroupBySum groupByCount = new DataGroupBySum();
|
|
|
groupByCount.setGroupKey(date);
|
|
@@ -239,8 +236,8 @@ public class DataService implements IDataService {
|
|
|
|
|
|
@Override
|
|
|
public HashMap<String, List<DataGroupByCount>> sceneTrend(Integer type,Integer dataType,String startTime,String endTime) {
|
|
|
- startTime = Dateutils.formatStartTime(startTime);
|
|
|
- endTime = Dateutils.formatEndTime(endTime);
|
|
|
+ startTime = DateUtils.formatStartTime(startTime);
|
|
|
+ endTime = DateUtils.formatEndTime(endTime);
|
|
|
|
|
|
HashMap<String,List<DataGroupByCount>> map = new HashMap<>();
|
|
|
List<DataGroupByCount> kkList = new ArrayList<>();
|
|
@@ -251,7 +248,7 @@ public class DataService implements IDataService {
|
|
|
List<DataGroupByCount> plusList = new ArrayList<>();
|
|
|
List<DataGroupByCount> proObjList = new ArrayList<>();
|
|
|
List<DataGroupByCount> plusObjList = new ArrayList<>();
|
|
|
- int rule = Dateutils.DAY;
|
|
|
+ int rule = DateUtils.DAY;
|
|
|
switch (type){
|
|
|
case 0 :
|
|
|
proList = dataMapper.sceneGroupBy("t_scene_pro",dayFormat,startTime,endTime);
|
|
@@ -260,14 +257,14 @@ public class DataService implements IDataService {
|
|
|
plusObjList = dataMapper.sceneObjGroupBy("t_scene_plus",dayFormat,startTime,endTime);
|
|
|
break;
|
|
|
case 1 :
|
|
|
- rule = Dateutils.WEEK;
|
|
|
+ rule = DateUtils.WEEK;
|
|
|
proList = dataMapper.sceneGroupByWeek("t_scene_pro",startTime,endTime);
|
|
|
plusList = dataMapper.sceneGroupByWeek("t_scene_plus",startTime,endTime);
|
|
|
proObjList = dataMapper.sceneObjGroupByWeek("t_scene_pro",startTime,endTime);
|
|
|
plusObjList = dataMapper.sceneObjGroupByWeek("t_scene_plus",startTime,endTime);
|
|
|
break;
|
|
|
case 2 :
|
|
|
- rule = Dateutils.MONTH;
|
|
|
+ rule = DateUtils.MONTH;
|
|
|
proList = dataMapper.sceneGroupBy("t_scene_pro",mouthFormat,startTime,endTime);
|
|
|
plusList = dataMapper.sceneGroupBy("t_scene_plus",mouthFormat,startTime,endTime);
|
|
|
proObjList = dataMapper.sceneObjGroupBy("t_scene_pro",mouthFormat,startTime,endTime);
|
|
@@ -320,7 +317,7 @@ public class DataService implements IDataService {
|
|
|
ssCount = sceneProService.getSsCount(Arrays.asList("4"),startTime);
|
|
|
ssObjCount = sceneProService.getSsObjCount(Arrays.asList("4"),startTime);
|
|
|
}
|
|
|
- List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
|
|
|
+ List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
|
|
|
setListData(kkList,kkMap,dates,dataType,kkCount);
|
|
|
setListData(kjList,kjMap,dates,dataType,KjCount);
|
|
|
setListData(ssList,ssMap,dates,dataType,ssCount);
|
|
@@ -359,25 +356,25 @@ public class DataService implements IDataService {
|
|
|
|
|
|
@Override
|
|
|
public HashMap<String, Object> cameraTrend(Integer type, String startTime, String endTime) {
|
|
|
- startTime = Dateutils.formatStartTime(startTime);
|
|
|
- endTime = Dateutils.formatEndTime(endTime);
|
|
|
+ startTime = DateUtils.formatStartTime(startTime);
|
|
|
+ endTime = DateUtils.formatEndTime(endTime);
|
|
|
|
|
|
HashMap<String,Object> map = new HashMap<>();
|
|
|
List<DataGroupByCount> allList = new ArrayList<>();
|
|
|
List<DataGroupByCount> kkList = new ArrayList<>();
|
|
|
List<DataGroupByCount> kjList = new ArrayList<>();
|
|
|
List<DataGroupByCount> ssList = new ArrayList<>();
|
|
|
- int rule = Dateutils.DAY;
|
|
|
+ int rule = DateUtils.DAY;
|
|
|
switch (type){
|
|
|
case 0 :
|
|
|
allList = dataMapper.sceneOutTimeGroupBy("t_camera_detail",dayFormat,startTime,endTime);
|
|
|
break;
|
|
|
case 1 :
|
|
|
- rule = Dateutils.WEEK;
|
|
|
+ rule = DateUtils.WEEK;
|
|
|
allList = dataMapper.sceneOutTimeGroupByWeek("t_camera_detail",startTime,endTime);
|
|
|
break;
|
|
|
case 2 :
|
|
|
- rule = Dateutils.MONTH;
|
|
|
+ rule = DateUtils.MONTH;
|
|
|
allList = dataMapper.sceneOutTimeGroupBy("t_camera_detail",mouthFormat,startTime,endTime);
|
|
|
break;
|
|
|
}
|
|
@@ -395,7 +392,7 @@ public class DataService implements IDataService {
|
|
|
kkMap.merge(dataGroupByCount.getGroupKey(),dataGroupByCount.getCount(), Long:: sum);
|
|
|
}
|
|
|
}
|
|
|
- List<String> dates = Dateutils.findDatesStr(Dateutils.getDate(startTime), Dateutils.getDate(endTime),rule );
|
|
|
+ List<String> dates = DateUtils.findDatesStr(DateUtils.getDate(startTime), DateUtils.getDate(endTime),rule );
|
|
|
setListData(kkList,kkMap,dates);
|
|
|
setListData(kjList,kjMap,dates);
|
|
|
setListData(ssList,ssMap,dates);
|