1.导出限制每页最多10000条

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

@@ -249,7 +249,9 @@ public class PersonDeviceLogController {
             String deviceNo, String aliasName, String personName,
             String timeRanges, String temperatureRanges, String matchMsg,
             @RequestParam(value = "distinct", defaultValue = "false") Boolean distinct,
-            @RequestAttribute String subject) {
+            @RequestAttribute String subject,
+            @RequestParam(defaultValue = "1000") int pageSize
+        ) {
         MessageResult<String> msgResult = new MessageResult<>();
 
         try {
@@ -384,10 +386,13 @@ public class PersonDeviceLogController {
             int pageNum = 1;
             boolean needCount = true;
             int totalPages = 1;
-            int pageSize = 1000;
             long total = 0;
             long exportNum = 0;
 
+            if(pageSize>10000){
+                pageSize = 10000;
+            }
+
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
             //起始时间和截止时间不能超过1一个月