Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-park/service-park-biz/src/main/java/com/usky/park/service/EventEgService.java

@@ -45,6 +45,6 @@ public interface EventEgService extends CrudService<EventEg> {
 
     List<EventEgStatisticVO> eventEgStatistic(List<String> enterDeviceId, List<String> outDeviceId, String startDate, String endDate);
 
-    Integer numStatistic(List<String> deviceId,String startDate,String endDate,Integer iType);
+    Integer numStatistic(List<String> deviceId,String startDate,String endDate);
 
 }

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/EventEgServiceImpl.java

@@ -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;