From 905296d89c10d770cb613fd93f1ca4aa687754ce Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 12 六月 2023 09:44:41 +0800
Subject: [PATCH] bug修改
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 ec42868..cc301dc 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
@@ -1,11 +1,14 @@
package com.ycl.controller.caseHandler;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.util.UtilNumber;
@@ -16,10 +19,12 @@
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.BaseCaseDetail;
import com.ycl.entity.caseHandler.DisposeRecord;
+import com.ycl.entity.resources.ImageResources;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDisposeRecordService;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.caseHandler.IViolationsService;
+import com.ycl.service.resources.IImageResourcesService;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.vo.casePool.QueryForViolationVO;
import io.swagger.annotations.Api;
@@ -28,6 +33,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -63,6 +69,9 @@
@Autowired
UtilNumber utilNumber;
+
+ @Autowired
+ IImageResourcesService iImageResourcesService;
@Autowired
@@ -211,7 +220,7 @@
**/
@ApiOperation(value = "娣诲姞杩濊妗堜欢")
@PostMapping("/addition_violation")
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濆缓妗堜欢")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濊妗堜欢")
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
Integer violation = 1;
Integer resource = 2;
@@ -224,6 +233,19 @@
baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
baseCase.setCreateTime(LocalDateTime.now());
baseCaseService.save(baseCase);
+ JSONArray arr = JSON.parseArray(baseCase.getPic());
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+
+ for (int i = 0; i < arr.size(); i++) {
+ ImageResources imageResources = new ImageResources();
+ imageResources.setType("01");
+ imageResources.setBelongToId(baseCase.getId());
+ imageResources.setUrl(arr.getString(i));
+ imageResources.setCreateTime(LocalDateTime.now());
+ imageResources.setCreateUser(user.getUserId());
+ iImageResourcesService.save(imageResources);
+ }
+
return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
}
@@ -234,7 +256,7 @@
**/
@ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
@PostMapping("/addition_illegal_building")
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濊妗堜欢")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "鏂板杩濆缓妗堜欢")
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
Integer illegalBuilding = 2;
Integer resource = 2;
@@ -341,7 +363,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