From 160f973ce4eb04e690c396ebd45bffbc6fb99961 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期一, 28 十一月 2022 15:43:18 +0800 Subject: [PATCH] fix: 预警研判报警事间未显示 --- ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 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 4d16ee5..471cbb8 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,9 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.annotation.LogSave; import com.ycl.api.CommonResult; -import com.ycl.common.constant.BaseCaseStatus; -import com.ycl.common.util.UtilNumber; +import com.ycl.controller.video.common.constant.BaseCaseStatus; +import com.ycl.controller.video.common.util.UtilNumber; import com.ycl.controller.BaseController; +import com.ycl.dto.caseHandler.QueryForViolationParam; import com.ycl.dto.casePool.IllegalBuildingParam; import com.ycl.dto.casePool.ViolationParam; import com.ycl.entity.caseHandler.BaseCase; @@ -18,6 +19,8 @@ import com.ycl.service.caseHandler.IDisposeRecordService; import com.ycl.service.caseHandler.IIllegalBuildingService; import com.ycl.service.caseHandler.IViolationsService; +import com.ycl.utils.EasyExcelUtils; +import com.ycl.vo.casePool.QueryForViolationVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,6 +30,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; @@ -282,4 +286,36 @@ @RequestParam(required = false) String site) { return CommonResult.success(baseCaseService.selectPage(new Page<BaseCase>().setCurrent(current).setSize(pageSize), number, communityId, categories, startTime, endTime, site)); } + + @GetMapping("/query_for_violation") + @ApiOperation("杩濊妫�绱�") + public CommonResult queryForViolation(QueryForViolationParam queryForViolationParam) { + return CommonResult.success(baseCaseService.selectViolation(queryForViolationParam)); + } + + @PostMapping("/query_for_violation/export") + @ApiOperation("杩濊妫�绱�-瀵煎嚭") + public void queryForViolationExport(HttpServletResponse response, QueryForViolationParam queryForViolationParam) { + String sheetName = "杩濊鏁版嵁"; + EasyExcelUtils.export(response, sheetName, QueryForViolationVO.class, baseCaseService.selectViolation(queryForViolationParam).getRecords()); + } + + @GetMapping("/video_inspection") + @ApiOperation("棰勮鐮斿垽") + 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()); + } + + @PutMapping("/video_inspection") + @ApiOperation("棰勮鐮斿垽纭畾") + public CommonResult searchCount(ViolationParam violationParam){ + return CommonResult.success(baseCaseService.updateCase(violationParam)); + } + } \ No newline at end of file -- Gitblit v1.8.0