修改日志查询时间条件

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceLogController.java

@@ -36,13 +36,13 @@ public class PersonDeviceLogController {
             @ApiImplicitParam(name = "aliasName",value = "设备别名", paramType = "query"),
             @ApiImplicitParam(name = "personName",value = "人员姓名", paramType = "query"),
             @ApiImplicitParam(name = "matchStatus",value = "开门类型", paramType = "query"),
-            @ApiImplicitParam(name = "beginTime",value = "开始时间", paramType = "query"),
-            @ApiImplicitParam(name = "endTime",value = "结束时间", paramType = "query")
+            @ApiImplicitParam(name = "timeRanges",value = "时间范围", paramType = "query")
+
     })
     public MessageResult<Map> pageList(
             String companyId,
             String deviceNo,String aliasName,String personName,
-            String matchStatus,String beginTime,String endTime,
+            String matchStatus,String timeRanges,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject){
@@ -72,10 +72,20 @@ public class PersonDeviceLogController {
         if(StringUtil.isNotEmpty(matchStatus)){
             searchParams.put("matchStatus",matchStatus);
         }
-        if(StringUtil.isNotEmpty(beginTime)){
+
+        if(StringUtil.isNotEmpty(timeRanges)){
+            String[] timeRangeArray = timeRanges.split(",");
+            String beginTime = "";
+            String endTime = "";
+            if(timeRangeArray.length==1){
+                beginTime = timeRangeArray[0];
+            }
+            else if(timeRangeArray.length==2){
+                beginTime = timeRangeArray[0];
+                endTime = timeRangeArray[1];
+            }
+
             searchParams.put("beginTime",beginTime);
-        }
-        if(StringUtil.isNotEmpty(endTime)){
             searchParams.put("endTime",endTime);
         }