From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化
---
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java | 148 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 137 insertions(+), 11 deletions(-)
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 fcdf6a6..dacebd9 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
@@ -1,7 +1,11 @@
package com.ycl.controller.caseHandler;
+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.controller.BaseController;
import com.ycl.entity.dict.DataDictionary;
@@ -10,7 +14,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
/**
@@ -29,30 +36,149 @@
IDataDictionaryService iDataDictionaryService;
/**
+ * @return com.ycl.api.CommonResult
* @Description 鏌ヨ杩濆缓绫诲瀷
* @Param [size, current, keyWord]
- * @return com.ycl.api.CommonResult
**/
@ApiOperation(value = "鏌ヨ杩濊绫诲瀷")
@GetMapping("/query")
- public CommonResult searchIllegalBuilding(@RequestParam Integer size,
- @RequestParam Integer current,
- @RequestParam(required = false) String keyWord) {
- Page<ViolationSettingVO> dataDictionaryPage = new Page<>();
- dataDictionaryPage.setSize(size);
- dataDictionaryPage.setCurrent(current);
- return CommonResult.success(iDataDictionaryService.listViolations(dataDictionaryPage,keyWord));
+ public CommonResult searchViolations(@RequestParam Integer size,
+ @RequestParam Integer current,
+ @RequestParam(required = false) String keyWord) {
+
+ return CommonResult.success(iDataDictionaryService.listViolations(current, size, keyWord));
}
/**
- * @Description delete illegal building by id
- * @Param [id]
* @return com.ycl.api.CommonResult
+ * @Description delete illegal building by id
+ * @Param [id]
**/
@ApiOperation(value = "鍒犻櫎杩濊绫诲瀷")
@DeleteMapping("/delete")
- public CommonResult removeIllegalBuilding(@RequestParam Integer id){
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鍒犻櫎杩濊浜嬮」")
+ public CommonResult removeViolation(@RequestParam Integer id) {
return CommonResult.success(iDataDictionaryService.removeById(id));
}
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description batch delete violations
+ * @Param [ids]
+ **/
+ @ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
+ @DeleteMapping("/batch_delete")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濊浜嬮」")
+ public CommonResult removeViolations(@RequestParam String[] ids) {
+
+ return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description search violation type first
+ * @Param []
+ **/
+ @ApiOperation(value = "鏌ヨ鎵�灞炵被鍨�")
+ @GetMapping("/query/type_first")
+ public CommonResult searchViolationsTypeFirst() {
+ String typeLevel = "1";
+ String typeCode = "01";
+ return CommonResult.success(iDataDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getLevel, typeLevel)
+ .eq(DataDictionary::getTypeCode, typeCode)));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description search violation type second
+ * @Param []
+ **/
+ @ApiOperation(value = "鏌ヨ鎵�灞炲ぇ绫�")
+ @GetMapping("/query/type_second")
+ public CommonResult searchViolationsTypeSecond() {
+ String typeLevel = "2";
+ String typeCode = "01";
+ return CommonResult.success(iDataDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getLevel, typeLevel)
+ .eq(DataDictionary::getTypeCode, typeCode)));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description search violation type third
+ * @Param []
+ **/
+ @ApiOperation(value = "鏌ヨ鎵�灞炲皬绫�")
+ @GetMapping("/query/type_third")
+ public CommonResult searchViolationsTypeThird() {
+ String typeLevel = "3";
+ String typeCode = "01";
+ return CommonResult.success(iDataDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getLevel, typeLevel)
+ .eq(DataDictionary::getTypeCode, typeCode)));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description search violation type four
+ * @Param []
+ **/
+ @ApiOperation(value = "鏌ヨ鎵�灞炴鐢�")
+ @GetMapping("/query/type_four")
+ public CommonResult searchViolationsTypeFour() {
+ String typeLevel = "4";
+ String typeCode = "01";
+ return CommonResult.success(iDataDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getLevel, typeLevel)
+ .eq(DataDictionary::getTypeCode, typeCode)));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description search violation event type
+ * @Param []
+ **/
+ @ApiOperation(value = "鏌ヨ浜嬩欢绛夌骇绫诲瀷")
+ @GetMapping("/query/event_type")
+ public CommonResult searchViolationsEventType() {
+ String typeLevel = "1";
+ String typeCode = "02";
+ return CommonResult.success(iDataDictionaryService
+ .list(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getLevel, typeLevel)
+ .eq(DataDictionary::getTypeCode, typeCode)));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description modify violation type
+ * @Param [typeFirst, id]
+ **/
+ @ApiOperation(value = "淇敼鎵�灞炵被鍨�/澶х被/灏忕被/妗堢敱")
+ @PutMapping("/modification/type")
+ public CommonResult modifyViolationTypeFirst(@RequestParam String type, @RequestParam Integer id) {
+ return CommonResult.success(iDataDictionaryService
+ .update(new LambdaUpdateWrapper<DataDictionary>()
+ .eq(DataDictionary::getId, id)
+ .set(StringUtils.isNotBlank(type), DataDictionary::getName, type)));
+ }
+
+ /**
+ * @return com.ycl.api.CommonResult
+ * @Description addition violation type
+ * @Param [dataDictionary]
+ **/
+ @ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/澶х被/灏忕被/妗堢敱")
+ @PostMapping("/addition/type")
+ @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "娣诲姞杩濊浜嬮」")
+ public CommonResult addViolationType(@RequestBody @Validated DataDictionary dataDictionary) {
+ return CommonResult.success(iDataDictionaryService.save(dataDictionary));
+ }
+
+
}
--
Gitblit v1.8.0