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

service-park/service-park-biz/src/main/java/com/usky/park/controller/web/EventEgController.java

@@ -57,15 +57,21 @@ public class EventEgController {
      * 数据中心-单个门禁人员进出通行历史记录列表查询
      *
      * @param deviceId 设备Id
+     * @param personName 通行人员名称
+     * @param startDate 开始时间  格式 yyyy-MM-dd HH:mm:ss
+     * @param endDate  结束时间  格式 yyyy-MM-dd HH:mm:ss
      * @param pageNum 当前页
      * @param pageSize 每页条数
      * @return
      */
     @GetMapping("eventEgOne")
     ApiResult<CommonPage<EventEg>> eventEgOne(@RequestParam(value = "deviceId") String deviceId,
+                                              @RequestParam(value = "personName",required = false) String personName,
+                                              @RequestParam(value = "startDate",required = false) String startDate,
+                                              @RequestParam(value = "endDate",required = false) String endDate,
                                               @RequestParam(value = "pageNum",required = false,defaultValue = "1") Integer pageNum,
                                               @RequestParam(value = "pageSize",required = false,defaultValue = "10") Integer pageSize){
-        return ApiResult.success(eventEgService.eventEgOne(deviceId,pageNum,pageSize));
+        return ApiResult.success(eventEgService.eventEgOne(deviceId,personName,startDate,endDate,pageNum,pageSize));
     }
 
     /**

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

@@ -40,7 +40,7 @@ public interface EventEgService extends CrudService<EventEg> {
      * @param pageSize 每页条数
      * @return
      */
-    CommonPage<EventEg> eventEgOne(String deviceId,Integer pageNum,Integer pageSize);
+    CommonPage<EventEg> eventEgOne(String deviceId, String personName, String startDate, String endDate,Integer pageNum,Integer pageSize);
 
 
     List<EventEgStatisticVO> eventEgStatistic(List<String> enterDeviceId, List<String> outDeviceId, String startDate, String endDate);

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

@@ -50,35 +50,21 @@ public class EventEgServiceImpl extends AbstractCrudService<EventEgMapper, Event
             for(int i=0;i<deviceList.size();i++){
                 LambdaQueryWrapper<EventEg> queryWrapper = Wrappers.lambdaQuery();
                 queryWrapper.eq(EventEg::getDeviceId,deviceList.get(i).getDeviceId())
+                        .like(StringUtils.isNotBlank(deviceName),EventEg::getDeviceName,deviceName)
+                        .like(StringUtils.isNotBlank(installAddress),EventEg::getInstallAddress,installAddress)
+                        .like(StringUtils.isNotBlank(cardNo),EventEg::getCardNo,cardNo)
+                        .like(StringUtils.isNotBlank(orgName),EventEg::getOrgName,orgName)
+                        .eq(eventType != null,EventEg::getEventType,eventType)
                         .orderByDesc(EventEg::getEventTime);
                 List<EventEg> list1 = this.list(queryWrapper);
                 if(list1.size()>0){
-                    list2.add(list1.get(0));
+                    list.add(list1.get(0));
 
                 }
             }
 
         }
 
-        if(StringUtils.isNotBlank(deviceName)){
-            list = list2.stream().filter(e->deviceName.equals(e.getDeviceName())).collect(Collectors.toList());
-        }
-        if(StringUtils.isNotBlank(installAddress)){
-            list = list2.stream().filter(e->installAddress.equals(e.getInstallAddress())).collect(Collectors.toList());
-        }
-        if(StringUtils.isNotBlank(cardNo)){
-            list = list2.stream().filter(e->cardNo.equals(e.getCardNo())).collect(Collectors.toList());
-        }
-        if(StringUtils.isNotBlank(orgName)){
-            list = list2.stream().filter(e->orgName.equals(e.getOrgName())).collect(Collectors.toList());
-        }
-        if(eventType != null){
-            list = list2.stream().filter(e->eventType.equals(e.getEventType())).collect(Collectors.toList());
-        }
-        if(list.size()==0){
-            list = list2;
-        }
-
         List<EventEg> objectList = new ArrayList<>();
         int total = 0;
         if(list.size() > 0){
@@ -98,10 +84,12 @@ public class EventEgServiceImpl extends AbstractCrudService<EventEgMapper, Event
     }
 
     @Override
-    public CommonPage<EventEg> eventEgOne(String deviceId,Integer pageNum,Integer pageSize){
+    public CommonPage<EventEg> eventEgOne(String deviceId, String personName, String startDate, String endDate,Integer pageNum,Integer pageSize){
         IPage<EventEg> page = new Page<>(pageNum,pageSize);
         LambdaQueryWrapper<EventEg> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(EventEg::getDeviceId,deviceId)
+                .like(StringUtils.isNotBlank(personName),EventEg::getPersonName,personName)
+                .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate),EventEg::getEventTime,startDate,endDate)
                 .orderByDesc(EventEg::getId);
         page = this.page(page,queryWrapper);