From 9ac43a03bff029540a8ad13b1e977e3147806612 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 09 十二月 2022 12:05:26 +0800
Subject: [PATCH] fix: 预警研判查询 和 保存案件
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 6 ++++++
ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java | 4 +---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 7 ++-----
ycl-platform/src/main/java/com/ycl/controller/cockpit/enforcementEvents/EnforcementEventsController.java | 4 ++--
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 5 +++--
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java | 2 ++
6 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
index 5e2971a..875717f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -99,16 +99,13 @@
@RequestParam(required = false) Integer type,
@RequestParam(required = false) Integer resource) {
if (state != null) {
- Page<Object> page = new Page<>();
- page.setCurrent(current);
- page.setSize(size);
Page<Object> queryList;
Integer violation = 1;
Integer illegalBuilding = 2;
if (type == violation) {
- queryList = baseCaseService.listViolationsPage(page, state, resource);
+ queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource);
} else if (type == illegalBuilding) {
- queryList = baseCaseService.listIllegalBuilding(page, state, resource);
+ queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
} else {
return CommonResult.failed("bad request url");
}
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 4d17945..ebfe719 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
@@ -148,6 +148,6 @@
infoVO.setIdentification(iBaseCaseService.alCount());
infoVO.setEvent(iBaseCaseService.selectEventList(params.getBeginTime(),params.getEndTime()));
return CommonResult.success(infoVO);
- }
-}
+ }
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
index f642980..26e67e5 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
@@ -72,6 +72,4 @@
@ApiModelProperty(value = "娲鹃仯鎰忚")
private Long createUser;
-
-
-}
+}
\ 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 55d88db..2857609 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
@@ -49,4 +49,6 @@
List<EventVO> selectEventList(String beginTime, String endTime);
Integer alCount();
+
+ Long selectRegisterCount();
}
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 15a5b36..d49fcf2 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
@@ -48,6 +48,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Consumer;
/**
* <p>
@@ -416,7 +417,7 @@
public Map<String, Object> selectCount() {
HashMap<String, Object> map = new HashMap<>();
Long review = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 1));
- Long register = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().in(BaseCase::getState, 2, 6));
+ Long register = baseCaseMapper.selectRegisterCount();
Long study = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 3));
map.put("review", review);
map.put("register", register);
@@ -446,7 +447,7 @@
if (violationParam.getState() == 2) {
baseCaseService.uploadEvent(violationParam.getBaseId());
}
- return violationsMapper.insert(violations) == 1 ? true : false;
+ return violationsMapper.updateById(violations) == 1 ? true : false;
}
@Override
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index f542f68..17ff751 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -251,6 +251,12 @@
group by t1.id
</select>
+ <select id="selectRegisterCount" resultType="java.lang.Long">
+ select count(1)
+ from ums_base_case
+ where state in(2,6) and to_days(create_time) = TO_DAYS(now());
+ </select>
+
<select id="dayCount" resultType="java.lang.Integer">
select count(1)
from ums_base_case
--
Gitblit v1.8.0