From bc2da7908a227c09e5cc7b6d8dab3e9c94b784a1 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期二, 12 十二月 2023 22:18:18 +0800 Subject: [PATCH] 图片压缩及bug修改 --- ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 21 +++++++++++++++++++-- 1 files changed, 19 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 139f112..3082a29 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 @@ -34,6 +34,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; @@ -57,6 +58,7 @@ @RestController @RequestMapping("/base_case") @Api(tags = "妗堜欢姹�") +@Slf4j public class BaseCaseController extends BaseController { private IBaseCaseService baseCaseService; @@ -228,6 +230,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(); @@ -279,6 +288,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(); @@ -312,7 +328,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); @@ -475,11 +491,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}") -- Gitblit v1.8.0