From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期一, 05 十二月 2022 17:59:58 +0800
Subject: [PATCH] update 单元格合并判断cellValue是否相等方法调整

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index e9e61e7..77df9fd 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -12,8 +12,6 @@
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
 import com.ruoyi.generator.service.IGenTableService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -30,7 +28,6 @@
  * @author Lion Li
  */
 @Validated
-@Api(value = "浠ｇ爜鐢熸垚", tags = {"浠ｇ爜鐢熸垚绠＄悊"})
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/tool/gen")
@@ -41,7 +38,6 @@
     /**
      * 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
      */
-    @ApiOperation("鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
     @SaCheckPermission("tool:gen:list")
     @GetMapping("/list")
     public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
@@ -50,8 +46,9 @@
 
     /**
      * 淇敼浠ｇ爜鐢熸垚涓氬姟
+     *
+     * @param tableId 琛↖D
      */
-    @ApiOperation("淇敼浠ｇ爜鐢熸垚涓氬姟")
     @SaCheckPermission("tool:gen:query")
     @GetMapping(value = "/{tableId}")
     public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
@@ -68,7 +65,6 @@
     /**
      * 鏌ヨ鏁版嵁搴撳垪琛�
      */
-    @ApiOperation("鏌ヨ鏁版嵁搴撳垪琛�")
     @SaCheckPermission("tool:gen:list")
     @GetMapping("/db/list")
     public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
@@ -77,8 +73,9 @@
 
     /**
      * 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
+     *
+     * @param tableId 琛↖D
      */
-    @ApiOperation("鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�")
     @SaCheckPermission("tool:gen:list")
     @GetMapping(value = "/column/{tableId}")
     public TableDataInfo<GenTableColumn> columnList(Long tableId) {
@@ -91,8 +88,9 @@
 
     /**
      * 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
+     *
+     * @param tables 琛ㄥ悕涓�
      */
-    @ApiOperation("瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�")
     @SaCheckPermission("tool:gen:import")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
@@ -107,7 +105,6 @@
     /**
      * 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
      */
-    @ApiOperation("淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟")
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
     @PutMapping
@@ -119,8 +116,9 @@
 
     /**
      * 鍒犻櫎浠ｇ爜鐢熸垚
+     *
+     * @param tableIds 琛↖D涓�
      */
-    @ApiOperation("鍒犻櫎浠ｇ爜鐢熸垚")
     @SaCheckPermission("tool:gen:remove")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
     @DeleteMapping("/{tableIds}")
@@ -131,8 +129,9 @@
 
     /**
      * 棰勮浠ｇ爜
+     *
+     * @param tableId 琛↖D
      */
-    @ApiOperation("棰勮浠ｇ爜")
     @SaCheckPermission("tool:gen:preview")
     @GetMapping("/preview/{tableId}")
     public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
@@ -142,8 +141,9 @@
 
     /**
      * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
+     *
+     * @param tableName 琛ㄥ悕
      */
-    @ApiOperation("鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
     @GetMapping("/download/{tableName}")
@@ -154,8 +154,9 @@
 
     /**
      * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
+     *
+     * @param tableName 琛ㄥ悕
      */
-    @ApiOperation("鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
     @GetMapping("/genCode/{tableName}")
@@ -166,8 +167,9 @@
 
     /**
      * 鍚屾鏁版嵁搴�
+     *
+     * @param tableName 琛ㄥ悕
      */
-    @ApiOperation("鍚屾鏁版嵁搴�")
     @SaCheckPermission("tool:gen:edit")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
@@ -178,8 +180,9 @@
 
     /**
      * 鎵归噺鐢熸垚浠ｇ爜
+     *
+     * @param tables 琛ㄥ悕涓�
      */
-    @ApiOperation("鎵归噺鐢熸垚浠ｇ爜")
     @SaCheckPermission("tool:gen:code")
     @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
     @GetMapping("/batchGenCode")

--
Gitblit v1.9.3