From 09d16543f899f54b8d96671a355a53a5740b1937 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 11:38:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 6 +++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java | 6 +++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java | 6 ++
ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java | 5 ++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java | 4 ++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java | 2 +
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java | 8 ++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 24 ++++++++++--
ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java | 5 ++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 4 ++
10 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index c6a31a8..893f3b4 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.annotation.LogSave;
import com.ycl.api.BasePageDTO;
import com.ycl.api.BasePageVO;
import com.ycl.api.CommonResult;
@@ -44,6 +45,7 @@
@ApiOperation("娣诲姞閮ㄩ棬")
@PostMapping(value = "/create")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "娣诲姞閮ㄩ棬")
public CommonResult<Void> create(@Validated @RequestBody DepartVO.AddDepartVO addDepartVO) {
departService.create(addDepartVO);
return CommonResult.success(null);
@@ -51,6 +53,7 @@
@ApiOperation("缂栬緫閮ㄩ棬")
@PostMapping(value = "/update")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "缂栬緫閮ㄩ棬")
public CommonResult<Void> create(@Validated @RequestBody DepartVO.UpdateDepartVO params) {
departService.update(params);
return CommonResult.success(null);
@@ -58,6 +61,7 @@
@ApiOperation("鍒犻櫎")
@PostMapping(value = "/delete")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "鍒犻櫎閮ㄩ棬")
public CommonResult<Void> delete(@Validated @RequestBody DepartVO.IdDepartVO params) {
departService.delete(params.getId());
return CommonResult.success(null);
@@ -70,6 +74,7 @@
**/
@ApiOperation("鎵瑰鐞�-鍒犻櫎")
@PostMapping(value = "/batch_deletion")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "鎵归噺鍒犻櫎閮ㄩ棬")
public CommonResult delete(@RequestParam List<Long> ids) {
if (ids.isEmpty()) {
return CommonResult.failed("bad request parameter");
@@ -79,6 +84,7 @@
@ApiOperation("璇︽儏")
@PostMapping(value = "/detail")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "鏌ョ湅閮ㄩ棬")
public CommonResult<UmsDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) {
UmsDepart sccgDepart = departService.loadDepartById(params.getId());
return CommonResult.success(sccgDepart);
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 67706d1..7f227c1 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.dto.UmsAdminLoginParam;
@@ -53,6 +54,7 @@
@ApiOperation(value = "鐢ㄦ埛娉ㄥ唽")
@RequestMapping(value = "/register", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "娣诲姞鐢ㄦ埛")
public CommonResult<UmsAdmin> register(@Validated @RequestBody UmsAdminParam umsAdminParam) {
UmsAdmin umsAdmin = adminService.register(umsAdminParam);
if (umsAdmin == null) {
@@ -139,6 +141,7 @@
@ApiOperation("淇敼鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "淇敼鐢ㄦ埛")
public CommonResult update(@PathVariable Long id, @RequestBody UmsAdmin admin) {
boolean success = adminService.update(id, admin);
if (success) {
@@ -150,6 +153,7 @@
@ApiOperation("淇敼鎸囧畾鐢ㄦ埛瀵嗙爜")
@RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "淇敼鐢ㄦ埛瀵嗙爜")
public CommonResult updatePassword(@Validated @RequestBody UpdateAdminPasswordParam updatePasswordParam) {
int status = adminService.updatePassword(updatePasswordParam);
if (status > 0) {
@@ -168,6 +172,7 @@
@ApiOperation("鍒犻櫎鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鍒犻櫎鐢ㄦ埛")
public CommonResult delete(@PathVariable Long id) {
boolean success = adminService.delete(id);
if (success) {
@@ -179,6 +184,7 @@
@ApiOperation("淇敼甯愬彿鐘舵��")
@RequestMapping(value = "/updateStatus/{id}", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鐢ㄦ埛璐﹀彿鍚敤/绂佺敤")
public CommonResult updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
UmsAdmin umsAdmin = new UmsAdmin();
umsAdmin.setStatus(status);
@@ -215,6 +221,7 @@
@ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids",required = true, dataType = "Array")
})
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鎵归噺鍒犻櫎鐢ㄦ埛")
public CommonResult deleteBatch(@RequestParam("ids") List<Long> ids) {
boolean success = adminService.deleteBatch(ids);
if (success) {
@@ -230,6 +237,7 @@
@ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤",required = true, dataType = "Integer")
})
@ResponseBody
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鐢ㄦ埛璐﹀彿鎵归噺鍚敤/绂佺敤")
public CommonResult updateStatusBatch(@RequestParam("ids") List<Long> ids, @RequestParam(value = "status") Integer status) {
boolean success = adminService.updateStatusBatch(ids, status);
if (success) {
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java
index 24f678a..fe60c3e 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsRoleController.java
@@ -1,6 +1,7 @@
package com.ycl.controller.user;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.entity.user.UmsMenu;
@@ -30,6 +31,7 @@
@ApiOperation("娣诲姞瑙掕壊")
@RequestMapping(value = "/create", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "瑙掕壊绠＄悊",contain = "鏂板缓瑙掕壊")
public CommonResult create(@RequestBody UmsRole role) {
boolean success = roleService.create(role);
if (success) {
@@ -53,6 +55,7 @@
@ApiOperation("鎵归噺鍒犻櫎瑙掕壊")
@RequestMapping(value = "/delete", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "瑙掕壊绠＄悊",contain = "鎵归噺鍒犻櫎瑙掕壊")
public CommonResult delete(@RequestParam("ids") List<Long> ids) {
boolean success = roleService.delete(ids);
if (success) {
@@ -113,6 +116,7 @@
@ApiOperation("缁欒鑹插垎閰嶈彍鍗�")
@RequestMapping(value = "/allocMenu", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "瑙掕壊绠＄悊",contain = "鏉冮檺璁剧疆")
public CommonResult allocMenu(@RequestParam Long roleId, @RequestParam List<Long> menuIds) {
int count = roleService.allocMenu(roleId, menuIds);
return CommonResult.success(count);
@@ -132,6 +136,7 @@
@ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤",required = true, dataType = "Integer")
})
@ResponseBody
+ @LogSave(operationType = "瑙掕壊绠＄悊",contain = "鎵归噺鍚敤/绂佺敤瑙掕壊")
public CommonResult updateStatusBatch(@RequestParam("ids") List<Long> ids, @RequestParam(value = "status") Integer status) {
boolean success = roleService.updateStatusBatch(ids, status);
if (success) {
diff --git a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
index 17c889f..59e643e 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/carManage/CarManageController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.controller.BaseController;
import com.ycl.entity.carManage.CarEnforcecar;
@@ -90,24 +91,28 @@
@ApiOperation("娣诲姞鎵ф硶杞�")
@PostMapping("/addition_enforce")
+ @LogSave(operationType = "杞︿咯绠＄悊",contain = "娣诲姞鎵ф硶杞�")
public CommonResult addEnforceCar(@RequestBody CarEnforcecar carEnforcecar) {
return CommonResult.success(iCarEnforcecarService.save(carEnforcecar));
}
@ApiOperation("娣诲姞娓ｅ湡杞�")
@PostMapping("/addition_slag")
+ @LogSave(operationType = "杞︿咯绠＄悊",contain = "娣诲姞娓ｅ湡杞�")
public CommonResult addSlagCar(@RequestBody CarSlagcar carSlagcar) {
return CommonResult.success(iCarSlagcarService.save(carSlagcar));
}
@ApiOperation("鍒犻櫎鎵ф硶杞�")
@DeleteMapping("/deletion_enforce")
+ @LogSave(operationType = "杞︿咯绠＄悊",contain = "鍒犻櫎鎵ф硶杞�")
public CommonResult deleteEnforceCar(@RequestParam Integer id) {
return CommonResult.success(iCarEnforcecarService.removeById(id));
}
@ApiOperation("鍒犻櫎娓ｅ湡杞�")
@DeleteMapping("/deletion_slag")
+ @LogSave(operationType = "杞︿咯绠＄悊",contain = "鍒犻櫎娓ｅ湡杞�")
public CommonResult deleteSlagCar(@RequestParam Integer id) {
return CommonResult.success(iCarSlagcarService.removeById(id));
}
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 794a558..7fd828e 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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;
@@ -120,6 +121,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鍒犻櫎妗堜欢")
public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
@@ -144,6 +146,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1 杩濊,2 杩濆缓", dataType = "Integer")
})
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鎵归噺鍒犻櫎妗堜欢")
public CommonResult removeCases(@RequestParam List<Long> ids, @RequestParam Integer type) {
Integer violationType = 1;
Integer illegalBuildingType = 2;
@@ -165,6 +168,7 @@
**/
@ApiOperation(value = "娣诲姞杩濊妗堜欢")
@PostMapping("/addition_violation")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鏂板杩濆缓妗堜欢")
public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
Integer violation = 1;
Integer resource = 2;
@@ -185,6 +189,7 @@
**/
@ApiOperation(value = "娣诲姞杩濆缓妗堜欢")
@PostMapping("/addition_illegal_building")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "鏂板杩濊妗堜欢")
public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
Integer illegalBuilding = 2;
Integer resource = 2;
@@ -254,6 +259,7 @@
@ApiOperation(value = "缁撴")
@PutMapping("/end_case")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢缁撴")
public CommonResult endCase(@RequestParam Long caseId, @RequestParam String result) {
baseCaseService.endCase(caseId, result);
return CommonResult.success("end case success~!");
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
index 8dbc0d8..ba55a2e 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
@@ -1,5 +1,6 @@
package com.ycl.controller.caseHandler;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.caseHandler.ChechParam;
@@ -31,6 +32,7 @@
@ApiOperation(value = "瀹℃牳")
@RequestMapping(value = "/check", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "瀹℃牳绠＄悊",contain = "妗堜欢瀹℃牳")
public CommonResult check(@Validated @RequestBody ChechParam chechParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
chechParam.setCurrentUser(user.getUserId());
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index 0a48e39..7282283 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.common.constant.BaseCaseStatus;
@@ -51,6 +52,7 @@
@ApiOperation(value = "璋冨害")
@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢璋冨害")
public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
dispatchInfoParam.setCreateUser(user.getUserId());
@@ -59,6 +61,7 @@
@ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
@PostMapping("/addition_dispose_result")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
public CommonResult searchDisposeList(@RequestParam Long caseId,
@RequestParam Integer type,
@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
@@ -102,6 +105,7 @@
disposeRecord.setCreateTime(LocalDateTime.now());
disposeRecord.setCreateUser(user.getUserId().longValue());
disposeRecord.setStepName("鏍告煡");
+ disposeRecord.setStartTime(LocalDateTime.now());
iDisposeRecordService.save(disposeRecord);
return CommonResult.success("add success");
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
index b7a2bc8..4f462ab 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
@@ -5,6 +5,7 @@
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.controller.BaseController;
import com.ycl.entity.dict.DataDictionary;
@@ -57,6 +58,7 @@
**/
@ApiOperation(value = "鍒犻櫎杩濆缓绫诲瀷")
@DeleteMapping("/delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鍒犻櫎杩濆缓浜嬮」")
public CommonResult removeIllegalBuilding(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
@@ -66,8 +68,9 @@
* @Description batch delete illegal building
* @Param [ids]
**/
- @ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
+ @ApiOperation(value = "鎵归噺鍒犻櫎杩濆缓绫诲瀷")
@DeleteMapping("/batch_delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濆缓浜嬮」")
public CommonResult removeIllegalBuildings(@RequestParam String[] ids) {
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
}
@@ -125,6 +128,7 @@
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/绫诲埆")
@PostMapping("/addition/type")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "娣诲姞杩濆缓浜嬮」")
public CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
index b5ab37d..c30a663 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
@@ -5,6 +5,7 @@
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.controller.BaseController;
import com.ycl.entity.dict.DataDictionary;
@@ -57,6 +58,7 @@
**/
@ApiOperation(value = "鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolation(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
@@ -68,6 +70,7 @@
**/
@ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/batch_delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
public CommonResult removeViolations(@RequestParam String[] ids) {
return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
}
@@ -173,6 +176,7 @@
**/
@ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/澶х被/灏忕被/妗堢敱")
@PostMapping("/addition/type")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆",contain = "娣诲姞杩濊浜嬮」")
public CommonResult addViolationType(@RequestBody @Validated DataDictionary dataDictionary) {
return CommonResult.success(iDataDictionaryService.save(dataDictionary));
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 5d020e7..f4069a2 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -201,17 +201,33 @@
public Boolean saveViolationCase(ViolationParam violationParam, Long id) {
Violations violations = new Violations();
BeanUtils.copyProperties(violationParam, violations);
- violations.setId(id);
Integer value = 1;
+ violations.setId(id);
+ setDisposeRecord(id);
return violationsMapper.insert(violations) == value ? true : false;
+ }
+
+ private void setDisposeRecord(Long id) {
+ String stepName = "璋冨害";
+ Integer state = 0;
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(id);
+ disposeRecord.setState(state);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ disposeRecord.setCreateUser(userDetails.getUserId());
+ disposeRecord.setStartTime(LocalDateTime.now());
+ disposeRecord.setStepName(stepName);
+ disposeRecordMapper.insert(disposeRecord);
}
@Override
public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
IllegalBuilding illegalBuilding = new IllegalBuilding();
BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
- illegalBuilding.setBaseCaseId(id);
+ setDisposeRecord(id);
Integer value = 1;
+ illegalBuilding.setBaseCaseId(id);
return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
}
@@ -232,7 +248,7 @@
Violations violations = violationsMapper.selectCondMap(mapV);
baseCase.setViolations(violations);
} else {
- IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
+ IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
baseCase.setIllegalBuilding(illegalBuilding);
}
bcd.setBaseCase(baseCase);
@@ -264,7 +280,7 @@
continue;
}
for (DisposeRecord record : records) {
- if (record != null&&record.getCreateTime()!=null) {
+ if (record != null && record.getCreateTime() != null) {
record.setLinkTime(
DateUtil.getDistanceDateTime(
DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
--
Gitblit v1.8.0