修改添加优化日志查询分页

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/syslog/sysLogController.java

 package net.wanji.opt.controllerv2.syslog;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.rest.JsonViewObject;
@@ -35,18 +36,19 @@ public class sysLogController {
             @ApiImplicitParam(name = "crossId", value = "路口id", required = true, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "startTime", value = "日期 格式：yyyy-MM-dd h:i:s", required = true, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "endTime", value = "日期 格式：yyyy-MM-dd h:i:s", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "pageNum", value = "分页页码", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "分页数据条数", required = true, dataType = "Integer", paramType = "query"),
     })
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = String.class),
     })
-    public JsonViewObject getOptimizeLog(String crossId,String startTime,String endTime) {
-        List<SysOptimizeLog> list = Collections.emptyList();
+    public JsonViewObject getOptimizeLog(String crossId,String startTime,String endTime,Integer pageNum,Integer pageSize) {
         try {
-            list = sysLogServer.findSysOptimizeLog(crossId,startTime,endTime);
+            JSONObject list = sysLogServer.findSysOptimizeLog(crossId,startTime,endTime,pageNum,pageSize);
+            return JsonViewObject.newInstance().success(list);
         } catch (Exception e) {
             log.error("系统日志-优化日志-查询失败：{}", e);
-            JsonViewObject.newInstance().success(list);
+            return JsonViewObject.newInstance().success("");
         }
-        return JsonViewObject.newInstance().success(list);
     }
 }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/syslog/SysLogServer.java

 package net.wanji.opt.servicev2.syslog;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import net.wanji.opt.entity.syslog.SysOptimizeLog;
 import java.util.List;
@@ -14,5 +15,5 @@ import java.util.List;
  */
 
 public interface SysLogServer extends IService<SysOptimizeLog> {
-    List<SysOptimizeLog> findSysOptimizeLog(String crossId,String startTime,String endTime);
+    JSONObject findSysOptimizeLog(String crossId, String startTime, String endTime, Integer pageNum, Integer pageSize);
 }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/syslog/impl/SysLogServerImpl.java

 package net.wanji.opt.servicev2.syslog.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.wanji.opt.dao.mapper.judgeanalysis.AnalysisProblemCrossDayMapper;
 import net.wanji.opt.dao.mapper.syslog.SysLogMapper;
+import net.wanji.opt.entity.comprehensivequery.CrossLaneDataHistPoExtendName;
 import net.wanji.opt.entity.judgeanalysis.AnalysisProblemCrossDay;
 import net.wanji.opt.entity.syslog.SysOptimizeLog;
 import net.wanji.opt.servicev2.syslog.SysLogServer;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -25,8 +30,17 @@ public class SysLogServerImpl extends ServiceImpl<SysLogMapper, SysOptimizeLog>
     private SysLogMapper sysLogMapper;
 
     @Override
-    public List<SysOptimizeLog> findSysOptimizeLog(String crossId,String startTime,String endTime) {
-
-        return sysLogMapper.findSysOptimizeLog(crossId,startTime,endTime);
+    public JSONObject findSysOptimizeLog(String crossId,String startTime,String endTime,Integer pageNum,Integer pageSize) {
+        List<SysOptimizeLog> list = sysLogMapper.findSysOptimizeLog(crossId,startTime,endTime);
+        List<SysOptimizeLog> collect = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(list)){
+            collect = list.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        }
+        JSONObject result = new JSONObject();
+        result.put("fullDataList",list);
+        result.put("pageList",collect);
+        result.put("totalPage",Math.ceil((double) list.size() / pageSize));
+        result.put("totalSize",list.size());
+        return result;
     }
 }