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/IllegalBuildingController.java |   63 ++++++++++++++++---------------
 1 files changed, 32 insertions(+), 31 deletions(-)

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 07c9d13..74ba142 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,10 +5,10 @@
 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;
-import com.ycl.service.caseHandler.IIllegalBuildingService;
 import com.ycl.service.dict.IDataDictionaryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,97 +36,98 @@
     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<DataDictionary> dataDictionaryPage = new Page<>();
-        dataDictionaryPage.setSize(size);
-        dataDictionaryPage.setCurrent(current);
-        return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(dataDictionaryPage,keyWord));
+
+        return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(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 removeIllegalBuilding(@RequestParam Integer id) {
         return CommonResult.success(iDataDictionaryService.removeById(id));
     }
 
     /**
+     * @return com.ycl.api.CommonResult
      * @Description batch delete illegal building
      * @Param [ids]
-     * @return com.ycl.api.CommonResult
      **/
-    @ApiOperation(value = "鎵归噺鍒犻櫎杩濊绫诲瀷")
+    @ApiOperation(value = "鎵归噺鍒犻櫎杩濆缓绫诲瀷")
     @DeleteMapping("/batch_delete")
-    public CommonResult removeIllegalBuildings(@RequestParam String[] ids){
+    @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "鎵归噺鍒犻櫎杩濆缓浜嬮」")
+    public CommonResult removeIllegalBuildings(@RequestParam String[] ids) {
         return CommonResult.success(iDataDictionaryService.removeBatchByIds(Arrays.asList(ids)));
     }
 
     /**
+     * @return com.ycl.api.CommonResult
      * @Description search illegal building  type first
      * @Param []
-     * @return com.ycl.api.CommonResult
      **/
     @ApiOperation(value = "鏌ヨ鎵�灞炵被鍨�")
     @GetMapping("/query/type_first")
-    public  CommonResult searchIllegalBuildingTypeFirst(){
-        String typeLevel="1";
-        String typeCode="06";
+    public CommonResult searchIllegalBuildingTypeFirst() {
+        String typeLevel = "1";
+        String typeCode = "06";
         return CommonResult.success(iDataDictionaryService
                 .list(new LambdaQueryWrapper<DataDictionary>()
-                        .eq(DataDictionary::getLevel,typeLevel)
-                        .eq(DataDictionary::getTypeCode,typeCode)));
+                        .eq(DataDictionary::getLevel, typeLevel)
+                        .eq(DataDictionary::getTypeCode, typeCode)));
     }
 
     /**
+     * @return com.ycl.api.CommonResult
      * @Description search illegal building type second
      * @Param []
-     * @return com.ycl.api.CommonResult
      **/
     @ApiOperation(value = "鏌ヨ鎵�灞炵被鍒�")
     @GetMapping("/query/type_second")
-    public  CommonResult searchIllegalBuildingTypeSecond(){
-        String typeLevel="2";
-        String typeCode="06";
+    public CommonResult searchIllegalBuildingTypeSecond() {
+        String typeLevel = "2";
+        String typeCode = "06";
         return CommonResult.success(iDataDictionaryService
                 .list(new LambdaQueryWrapper<DataDictionary>()
-                        .eq(DataDictionary::getLevel,typeLevel)
-                        .eq(DataDictionary::getTypeCode,typeCode)));
+                        .eq(DataDictionary::getLevel, typeLevel)
+                        .eq(DataDictionary::getTypeCode, typeCode)));
     }
 
     /**
+     * @return com.ycl.api.CommonResult
      * @Description modify illegal building type
      * @Param [typeFirst, id]
-     * @return com.ycl.api.CommonResult
      **/
     @ApiOperation(value = "淇敼鎵�灞炵被鍨�/绫诲埆")
     @PutMapping("/modification/type")
-    public  CommonResult modifyIllegalBuildingType(@RequestParam String type,@RequestParam Integer id){
-        return  CommonResult.success(iDataDictionaryService
+    public CommonResult modifyIllegalBuildingType(@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)));
+                        .eq(DataDictionary::getId, id)
+                        .set(StringUtils.isNotBlank(type), DataDictionary::getName, type)));
     }
 
     /**
+     * @return com.ycl.api.CommonResult
      * @Description addition illegal building  type
      * @Param [dataDictionary]
-     * @return com.ycl.api.CommonResult
      **/
     @ApiOperation(value = "娣诲姞鎵�灞炵被鍨�/绫诲埆")
     @PostMapping("/addition/type")
-    public  CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary){
+    @LogSave(operationType = "杩愯惀鍩虹璁剧疆", contain = "娣诲姞杩濆缓浜嬮」")
+    public CommonResult addIllegalBuildingTypeFirst(@RequestBody @Validated DataDictionary dataDictionary) {
         return CommonResult.success(iDataDictionaryService.save(dataDictionary));
     }
 

--
Gitblit v1.8.0