From 97145b853f152ad2271c8f479c8876e204035469 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 16 Aug 2022 18:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hxkj/admin/config/AdminConfig.java     |  1 +
 .../src/main/resources/java/controller.java.vm | 18 ++++++++++++++++--
 .../src/main/resources/java/service.java.vm    |  3 +++
 .../main/resources/java/serviceImpl.java.vm    |  5 +++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
index fce7aa64..d36741fa 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java
@@ -18,6 +18,7 @@ public class AdminConfig {
     public static String[] notLoginUri = new String[]{
             "system:login",         // 登录接口
             "common:index:config",  // 配置接口
+            "gen:downloadCode",  // 配置接口
     };
 
     // 免权限验证
diff --git a/server/like-generator/src/main/resources/java/controller.java.vm b/server/like-generator/src/main/resources/java/controller.java.vm
index b3cccecd..42f0bc65 100644
--- a/server/like-generator/src/main/resources/java/controller.java.vm
+++ b/server/like-generator/src/main/resources/java/controller.java.vm
@@ -1,13 +1,20 @@
 package ${packageName}.admin.controller.${moduleName};
 
+#if(!$table.genTpl.equals("crud"))
+import com.alibaba.fastjson.JSONArray;
+#end
 import ${packageName}.admin.config.aop.Log;
 import ${packageName}.admin.service.${moduleName}.I${EntityName}Service;
-import ${packageName}.admin.validate.common.PageParam;
 import ${packageName}.admin.validate.${moduleName}.${EntityName}Param;
+#if($table.genTpl.equals("crud"))
+import ${packageName}.admin.validate.common.PageParam;
 import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo;
+#end
 import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo;
 import ${packageName}.common.core.AjaxResult;
+#if($table.genTpl.equals("crud"))
 import ${packageName}.common.core.PageResult;
+#end
 import ${packageName}.common.validator.annotation.IDMust;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -35,13 +42,20 @@ public class ${EntityName}Controller {
      * @param params 搜索参数
      * @return Object
      */
+    #if($table.genTpl.equals("crud"))
     @GetMapping("/list")
     public Object list(@Validated PageParam pageParam,
                        @RequestParam Map<String, String> params) {
         PageResult<${EntityName}ListVo> list = i${EntityName}Service.list(pageParam, params);
         return AjaxResult.success(list);
     }
-
+    #else
+    @GetMapping("/list")
+    public Object list(@RequestParam Map<String, String> params) {
+        JSONArray list = i${EntityName}Service.list(params);
+        return AjaxResult.success(list);
+    }
+    #end
     /**
      * ${functionName}详情
      *
diff --git a/server/like-generator/src/main/resources/java/service.java.vm b/server/like-generator/src/main/resources/java/service.java.vm
index 50493c4a..95fcda68 100644
--- a/server/like-generator/src/main/resources/java/service.java.vm
+++ b/server/like-generator/src/main/resources/java/service.java.vm
@@ -1,5 +1,8 @@
 package ${packageName}.admin.service.${moduleName};
 
+#if(!$table.genTpl.equals("crud"))
+import com.alibaba.fastjson.JSONArray;
+#end
 import ${packageName}.admin.validate.common.PageParam;
 import ${packageName}.admin.validate.${moduleName}.${EntityName}Param;
 import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo;
diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
index 0dfde6db..272e4c3d 100644
--- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm
+++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
@@ -1,5 +1,8 @@
 package ${packageName}.admin.service.${moduleName}.impl;
 
+#if(!$table.genTpl.equals("crud"))
+import com.alibaba.fastjson.JSONArray;
+#end
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,7 +64,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
      #if($isAuthor)
      * @author ${authorName}
      #end
+     #if($table.genTpl.equals("crud"))
      * ${pageParam}
+     #end
      #if($isSearchParam)
      * ${searchparams}
      #end