From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +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 | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 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 af1e87f..a028a7d 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
@@ -30,6 +30,7 @@
import com.ycl.service.resources.IVideoResourcesService;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.vo.casePool.QueryForViolationVO;
+import com.ycl.vo.casePool.WorkOrderVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -44,6 +45,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
@@ -133,7 +135,7 @@
@ApiOperation(value = "鏌ヨ杩濊杩濆缓")
@GetMapping("/query")
@ApiImplicitParams({
- @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(0-寰呭鐞�1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊5绔嬫6璋冨害7澶勭疆8鏍告煡9缁撴)", dataType = "Integer"),
+ @ApiImplicitParam(name = "state", value = "澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)", dataType = "String"),
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer"),
@ApiImplicitParam(name = "resource", value = "1 瑙嗛,2 鎵嬪姩", dataType = "Integer"),
@ApiImplicitParam(name = "code", dataType = "String"),
@@ -147,7 +149,7 @@
})
public CommonResult searchViolation(@RequestParam Integer size,
@RequestParam Integer current,
- @RequestParam(required = false) Integer state,
+ @RequestParam(required = false) String state,
@RequestParam Integer type,
@RequestParam(required = false) Integer resource,
@RequestParam(required = false) String code,
@@ -161,10 +163,33 @@
@RequestParam(required = false) Integer videoId) {
Page<Object> queryList;
+ // 澶勭悊鐘舵��(wait(0-寰呭鐞�) handle(5绔嬫6璋冨害7澶勭疆8鏍告煡) finish(1-璇姤2-涓婃姤3-鍐嶅涔�/鍐嶈缁�4鏆備笉澶勭悊 9缁撴)
+ List<Integer> stateList = new ArrayList<>();
+ switch (state) {
+ case "wait":
+ stateList.add(0);
+ break;
+ case "handle":
+ stateList.add(5);
+ stateList.add(6);
+ stateList.add(7);
+ stateList.add(8);
+ break;
+ case "finish":
+ stateList.add(1);
+ stateList.add(2);
+ stateList.add(3);
+ stateList.add(4);
+ stateList.add(9);
+ break;
+ default:
+ stateList.add(Integer.valueOf(state));
+ break;
+ }
if (type == 1) {
- queryList = baseCaseService.listViolationsPage(current, size, state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId, videoId);
+ queryList = baseCaseService.listViolationsPage(current, size, stateList, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId, videoId);
} else if (type == 2) {
- queryList = baseCaseService.listIllegalBuilding(current, size, state, resource);
+ queryList = baseCaseService.listIllegalBuilding(current, size, stateList, resource);
} else {
return CommonResult.failed("bad request url");
}
@@ -230,6 +255,13 @@
@PostMapping("/addition_violation")
@LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濊妗堜欢")
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
+ log.info("---------------->鍙傛暟,鎶ヨ鏃堕棿{},闄愭椂{},瀵硅薄{}", violationParam.getAlarmTime(), violationParam.getLimitTime(), violationParam);
+ if (violationParam.getAlarmTime() != null) {
+ violationParam.setAlarmTime(violationParam.getAlarmTime().replace("/", "-"));
+ }
+ if (violationParam.getLimitTime() != null) {
+ violationParam.setLimitTime(violationParam.getLimitTime().replace("/", "-"));
+ }
Integer violation = 1;
Integer resource = 2;
BaseCase baseCase = new BaseCase();
@@ -281,6 +313,13 @@
@PostMapping("/addition_illegal_building")
@LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濆缓妗堜欢")
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
+ log.info("---------------->鍙傛暟,鎶ヨ鏃堕棿{},闄愭椂{},瀵硅薄{}", illegalBuildingParam.getAlarmTime(), illegalBuildingParam.getLimitTime(), illegalBuildingParam);
+ if (illegalBuildingParam.getAlarmTime() != null) {
+ illegalBuildingParam.setAlarmTime(illegalBuildingParam.getAlarmTime().replace("/", "-"));
+ }
+ if (illegalBuildingParam.getLimitTime() != null) {
+ illegalBuildingParam.setLimitTime(illegalBuildingParam.getLimitTime().replace("/", "-"));
+ }
Integer illegalBuilding = 2;
Integer resource = 2;
BaseCase baseCase = new BaseCase();
@@ -314,7 +353,7 @@
ImageResources imageResources = new ImageResources();
imageResources.setType("01");
imageResources.setBelongToId(baseCase.getId());
- imageResources.setUrl(illegalBuildingParam.getImageUrls().get(i));
+ imageResources.setUrl(illegalBuildingParam.getImageUrls().toString());
imageResources.setCreateTime(LocalDateTime.now());
imageResources.setCreateUser(user.getUserId());
iImageResourcesService.save(imageResources);
@@ -477,11 +516,12 @@
@ApiOperation("棰勮鐮斿垽")
public CommonResult searchVideoInspection(@RequestParam Integer current,
@RequestParam Integer pageSize,
+ @RequestParam(required = false) Integer type,
@RequestParam(required = false) Long gradeId,
@RequestParam(required = false) Long videoId,
@RequestParam(required = false) String beginTime,
@RequestParam(required = false) String endTime) {
- return CommonResult.success(baseCaseService.selectVideoInspection(current, pageSize, gradeId, videoId, beginTime, endTime));
+ return CommonResult.success(baseCaseService.selectVideoInspection(current, pageSize, gradeId, videoId, beginTime, endTime, type));
}
@GetMapping("/video_inspection/{id}")
@@ -501,4 +541,19 @@
public CommonResult searchCount(@RequestBody VideoInspectParam violationParam) {
return CommonResult.success(baseCaseService.updateCase(violationParam));
}
+
+ @GetMapping("/work_order")
+ @ApiOperation("宸ュ崟缁熻")
+ public CommonResult getWorkOrder(@RequestParam Integer currentPage,
+ @RequestParam Integer pageSize,
+ @RequestParam(required = false) String keyword) {
+ return CommonResult.success(baseCaseService.getWorkOrder(currentPage, pageSize, keyword));
+ }
+
+ @PostMapping("/work_order/export")
+ @ApiOperation("宸ュ崟缁熻-瀵煎嚭")
+ public void getWorkOrderExport(HttpServletResponse response, QueryForViolationParam param) {
+ String sheetName = "宸ュ崟鏁版嵁";
+ EasyExcelUtils.export(response, sheetName, WorkOrderVO.class, baseCaseService.getWorkOrderList(param.getKeyword()));
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0