From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:26:18 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 73 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 16 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 471cbb8..829e41f 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
@@ -6,11 +6,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
-import com.ycl.controller.video.common.constant.BaseCaseStatus;
-import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.controller.BaseController;
+import com.ycl.common.constant.BaseCaseStatus;
+import com.ycl.common.util.UtilNumber;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.casePool.IllegalBuildingParam;
+import com.ycl.dto.casePool.VideoInspectParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.BaseCaseDetail;
@@ -71,7 +72,7 @@
@ApiOperation(value = "涓婁紶甯傚钩鍙�")
@PostMapping("/upload-event")
- public CommonResult uploadEvent(@RequestParam Integer caseId, CommonResult<Object> success) {
+ public CommonResult uploadEvent(@RequestParam Long caseId, CommonResult<Object> success) {
String msg = baseCaseService.uploadEvent(caseId);
if (StringUtils.isEmpty(msg)) {
return success;
@@ -98,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");
}
@@ -247,6 +245,50 @@
.set(BaseCase::getState, state)));
}
+ @ApiOperation(value = "妗堜欢鎵瑰湪瀛︿範")
+ @PutMapping("/batch_case_study")
+ public CommonResult batchHandCaseByStudy(@RequestParam List<Long> ids) {
+ ids.stream().forEach(item ->
+ {
+ BaseCase baseCase = new BaseCase();
+ baseCase.setId(item);
+ baseCase.setState(3);
+ baseCaseService.updateById(baseCase);
+ });
+ return CommonResult.success("success");
+ }
+
+ @ApiOperation(value = "妗堜欢鎵规殏涓嶅鐞�")
+ @PutMapping("/batch_case_Ignore")
+ public CommonResult batchHandCaseByIgnore(@RequestParam List<Long> ids) {
+ ids.stream().forEach(item ->
+ {
+ BaseCase baseCase = new BaseCase();
+ baseCase.setId(item);
+ baseCase.setState(4);
+ baseCaseService.updateById(baseCase);
+ });
+ return CommonResult.success("success");
+ }
+
+ @ApiOperation(value = "璋冨害绠＄悊-鎵归噺鍒犻櫎")
+ @DeleteMapping("/batch_case_delete")
+ public CommonResult batchCaseDelete(@RequestParam List<Long> ids){
+ ids.forEach(
+ item->{
+ BaseCase baseCase = baseCaseService.getOne(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getId, item));
+ if (baseCase.getCategory()==1){
+ violationsService.removeById(item);
+ baseCaseService.removeById(item);
+ }else {
+ illegalBuildingService.removeById(item);
+ baseCaseService.removeById(item);
+ }
+ }
+ );
+ return CommonResult.success("success");
+ }
+
/**
* @return com.ycl.api.CommonResult
* @Description reset case
@@ -297,25 +339,24 @@
@ApiOperation("杩濊妫�绱�-瀵煎嚭")
public void queryForViolationExport(HttpServletResponse response, QueryForViolationParam queryForViolationParam) {
String sheetName = "杩濊鏁版嵁";
- EasyExcelUtils.export(response, sheetName, QueryForViolationVO.class, baseCaseService.selectViolation(queryForViolationParam).getRecords());
+ EasyExcelUtils.export(response, sheetName, QueryForViolationVO.class, baseCaseService.selectViolationList(queryForViolationParam));
}
@GetMapping("/video_inspection")
@ApiOperation("棰勮鐮斿垽")
- public CommonResult searchVideoInspection(@RequestParam Integer current){
- return CommonResult.success(baseCaseService.selectVideoInspection(current));
+ public CommonResult searchVideoInspection(@RequestParam Integer current) {
+ return CommonResult.success(baseCaseService.selectVideoInspection(current));
}
@GetMapping("/video_inspection/Count")
@ApiOperation("棰勮鐮斿垽宸︿笂瑙掑緟瀹℃牳妗堜欢,浠婃棩瀹℃牳,浠婃棩鍦ㄥ涔�")
- public CommonResult searchCount(){
- return CommonResult.success(baseCaseService.selectCount());
+ public CommonResult searchCount() {
+ return CommonResult.success(baseCaseService.selectCount());
}
@PutMapping("/video_inspection")
@ApiOperation("棰勮鐮斿垽纭畾")
- public CommonResult searchCount(ViolationParam violationParam){
- return CommonResult.success(baseCaseService.updateCase(violationParam));
+ public CommonResult searchCount(@RequestBody VideoInspectParam violationParam) {
+ return CommonResult.success(baseCaseService.updateCase(violationParam));
}
-
}
\ No newline at end of file
--
Gitblit v1.8.0