|
@@ -100,19 +100,18 @@ public class EventEgServiceImpl extends AbstractCrudService<EventEgMapper, Event
|
|
|
public List<EventEgStatisticVO> eventEgStatistic(List<String> enterDeviceId, List<String> outDeviceId, String startDate, String endDate){
|
|
|
List<EventEgStatisticVO> list = new ArrayList<>();
|
|
|
EventEgStatisticVO eventEgStatisticVO = new EventEgStatisticVO();
|
|
|
- eventEgStatisticVO.setEnterNum(numStatistic(enterDeviceId,startDate,endDate,1));
|
|
|
- eventEgStatisticVO.setOutNum(numStatistic(outDeviceId,startDate,endDate,0));
|
|
|
+ eventEgStatisticVO.setEnterNum(numStatistic(enterDeviceId,startDate,endDate));
|
|
|
+ eventEgStatisticVO.setOutNum(numStatistic(outDeviceId,startDate,endDate));
|
|
|
list.add(eventEgStatisticVO);
|
|
|
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
- public Integer numStatistic(List<String> deviceId,String startDate,String endDate,Integer iType){
|
|
|
+ public Integer numStatistic(List<String> deviceId,String startDate,String endDate){
|
|
|
Integer num = 0;
|
|
|
LambdaQueryWrapper<EventEg> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.in(EventEg::getDeviceId,deviceId)
|
|
|
- .between(EventEg::getEventTime,startDate,endDate)
|
|
|
- .eq(EventEg::getInOutType,iType);
|
|
|
+ .between(EventEg::getEventTime,startDate,endDate);
|
|
|
num = this.count(queryWrapper);
|
|
|
|
|
|
return num;
|