From cea14a6019ce363742527a92896eb0c49e9e8599 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 三月 2023 16:39:31 +0800
Subject: [PATCH] 驾驶舱事件加分页
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 2
ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java | 12 ++++-
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 6 ++
ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java | 2 +
ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java | 39 +++++++++++--------
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 12 +++++-
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java | 3 +
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 7 ++-
8 files changed, 56 insertions(+), 27 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java b/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
index 766923c..f8d525d 100644
--- a/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/cockpit/CockpitVO.java
@@ -15,7 +15,7 @@
@Data
@ApiModel
public class CockpitVO {
-// @Data
+ // @Data
// @ApiModel
// public class Params1VO implements Serializable {
// @ApiModelProperty(value = "appId", example = "1")
@@ -32,23 +32,30 @@
// @Data
// @ApiModel
// public class Params2VO implements Serializable {
- @ApiModelProperty(value = "appId", example = "1")
- @NotBlank(message = "appId涓嶈兘涓虹┖")
- private String appId;
- @ApiModelProperty(value = "appKey", example = "1")
- @NotBlank(message = "appKey涓嶈兘涓虹┖")
- private String appKey;
- @ApiModelProperty(value = "sign", example = "sfagjgfjgfjdgfjsgdfgsa")
- @NotBlank(message = "sign涓嶈兘涓虹┖")
- private String sign;
+ @ApiModelProperty(value = "appId", example = "1")
+ @NotBlank(message = "appId涓嶈兘涓虹┖")
+ private String appId;
+ @ApiModelProperty(value = "appKey", example = "1")
+ @NotBlank(message = "appKey涓嶈兘涓虹┖")
+ private String appKey;
+ @ApiModelProperty(value = "sign", example = "sfagjgfjgfjdgfjsgdfgsa")
+ @NotBlank(message = "sign涓嶈兘涓虹┖")
+ private String sign;
- @ApiModelProperty(value = "streetId", example = "25")
- private Integer streetId;
- @ApiModelProperty(value = "寮�濮嬫椂闂达紝鏍煎紡yyyy-MM-dd hh:mm:ss", example = "2022-10-22 13:22:22")
+ @ApiModelProperty(value = "streetId", example = "25")
+ private Integer streetId;
+ @ApiModelProperty(value = "寮�濮嬫椂闂达紝鏍煎紡yyyy-MM-dd hh:mm:ss", example = "2022-10-22 13:22:22")
// @NotBlank(message = "寮�濮嬫椂闂翠笉鑳戒负绌�")
- private String beginTime;
- @ApiModelProperty(value = "缁撴潫鏃堕棿锛屾牸寮弝yyy-MM-dd hh:mm:ss", example = "2022-10-23 13:22:22")
+ private String beginTime;
+ @ApiModelProperty(value = "缁撴潫鏃堕棿锛屾牸寮弝yyy-MM-dd hh:mm:ss", example = "2022-10-23 13:22:22")
// @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
- private String endTime;
+ private String endTime;
+
+ @ApiModelProperty(value = "pageIndex", example = "25")
+ private Integer pageIndex;
+
+
+ @ApiModelProperty(value = "pageSize", example = "25")
+ private Integer pageSize;
// }
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
index db89209..09e4880 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java
@@ -1,6 +1,7 @@
package com.ycl.controller.cockpit.enforcementEvents;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.api.CommonResult;
import com.ycl.dto.trend.TrendAnalysisParam;
import com.ycl.entity.caseHandler.BaseCase;
@@ -11,6 +12,7 @@
import com.ycl.util.CheckApiUtil;
import com.ycl.vo.cockpit.CockpitVO;
import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO;
+import com.ycl.vo.cockpit.enforcementEvents.EventVO;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -128,7 +130,9 @@
infoVO.setWeek(iBaseCaseService.weekCount());
infoVO.setDispatch(iBaseCaseService.dispatchCount());
infoVO.setIdentification(iBaseCaseService.alCount());
- infoVO.setEvent(iBaseCaseService.selectEventList(params.getBeginTime(), params.getEndTime()));
+ IPage<EventVO> page = iBaseCaseService.selectEventList(params.getBeginTime(), params.getEndTime(),params.getPageIndex(),params.getPageSize());
+ infoVO.setEvent(page.getRecords());
+ infoVO.setTotal(page.getTotal());
return CommonResult.success(infoVO);
}
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
index ba7288e..72bd768 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -1,6 +1,7 @@
package com.ycl.mapper.caseHandler;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.cockpitManage.DelayDO;
@@ -45,7 +46,7 @@
Integer dispatchCount();
- List<EventVO> selectEventList(String beginTime, String endTime);
+ IPage<EventVO> selectEventList(IPage<EventVO> page, String beginTime, String endTime);
Integer alCount();
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index c2fca5e..d689610 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -1,5 +1,6 @@
package com.ycl.service.caseHandler;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.caseHandler.QueryForViolationParam;
@@ -37,7 +38,7 @@
*/
String uploadEvent(Long caseId);
- Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime,Integer violationsTypeId);
+ Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId);
Page listIllegalBuilding(Page page, Integer state, Integer resource);
@@ -81,11 +82,11 @@
Integer alCount();
- List<EventVO> selectEventList(String beginTime, String endTime);
+ IPage<EventVO> selectEventList(String beginTime, String endTime, Integer pageIndex, Integer pageSize);
List<VideoAndAreaVO> areaCount();
List<DelayVO> selectDelayList();
- Map<String,Object> statistics();
+ Map<String, Object> statistics();
}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 1c62e64..e580a1a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
@@ -476,8 +477,15 @@
}
@Override
- public List<EventVO> selectEventList(String beginTime, String endTime) {
- return baseCaseMapper.selectEventList(beginTime, endTime);
+ public IPage<EventVO> selectEventList(String beginTime, String endTime, Integer pageIndex, Integer pageSize) {
+ if (pageIndex == null) {
+ pageIndex = 1;
+ }
+ if (pageSize == null) {
+ pageSize = 50;
+ }
+ IPage<EventVO> page = new Page<>(pageIndex, pageSize);
+ return baseCaseMapper.selectEventList(page, beginTime, endTime);
}
@Override
diff --git a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
index 4e37981..a6efc68 100644
--- a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
@@ -44,9 +44,15 @@
sb.append("&streetId=");
sb.append(params.getStreetId());
}
+ if (params.getPageIndex() != null && params.getPageSize() != null) {
+ sb.append("&pageIndex=");
+ sb.append(params.getPageIndex());
+ sb.append("&pageSize=");
+ sb.append(params.getPageSize());
+ }
result = MD5Util.md5Encrypt32Lower(sb.toString());
- if (!params.getSign().equals(result)) {
- throw new ApiException(ResultCode.SIGN_ERROR);
- }
+ if (!params.getSign().equals(result)) {
+ throw new ApiException(ResultCode.SIGN_ERROR);
+ }
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
index 1ac0c65..3242fa4 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java
@@ -40,5 +40,7 @@
private Integer identification;
@ApiModelProperty(value = "鍏蜂綋浜嬩欢鐨勬暟鎹俊鎭�")
private List<EventVO> event;
+ @ApiModelProperty(value = "鍏蜂綋浜嬩欢鐨勬暟鎹俊鎭�")
+ private Long total;
}
}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 4a87cec..c1083ad 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -355,7 +355,7 @@
</if>
</where>
-
+ order by t1.id desc
</select>
<select id="areaCount" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO">
SELECT t2.region_name name,
--
Gitblit v1.8.0