From 704e7207d74b6477c5f472c5aba92d484ab17f98 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 29 十一月 2023 17:07:11 +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 | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 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 4922fec..6a3c479 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;
@@ -86,11 +88,11 @@
}
@ApiOperation(value = "涓婁紶甯傚钩鍙�")
- @PostMapping("/upload-event")
- public CommonResult uploadEvent(@RequestParam Long caseId, CommonResult<Object> success) {
+ @PostMapping("/upload-event/{caseId}")
+ public CommonResult uploadEvent(@PathVariable Long caseId) {
String msg = baseCaseService.uploadEvent(caseId);
if (StringUtils.isEmpty(msg)) {
- return success;
+ return CommonResult.success(msg);
} else {
return CommonResult.failed(msg);
}
@@ -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);
@@ -427,7 +443,7 @@
Integer state = iDisposeRecordService
.list(new LambdaQueryWrapper<DisposeRecord>()
.eq(DisposeRecord::getBaseCaseId, caseId).
- orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
+ orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
return CommonResult.success(baseCaseService
.update(new LambdaUpdateWrapper<BaseCase>()
.eq(BaseCase::getId, caseId)
--
Gitblit v1.8.0