From 47e3087067abd35e6337c011f96d2338c0bb1aae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2024 13:39:31 +0800
Subject: [PATCH] 优化自动化代码

---
 src/main/resources/generater/admin/adminController.template |   99 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/generater/admin/adminController.template b/src/main/resources/generater/admin/adminController.template
index 2fbfc9c..eee5247 100644
--- a/src/main/resources/generater/admin/adminController.template
+++ b/src/main/resources/generater/admin/adminController.template
@@ -18,7 +18,14 @@
 import ${entity.clazz};
 import ${service.clazz};
 import ${query.clazz};
+<#if adminVO??>
+import ${adminVO.clazz};
+</#if>
 
+<#if responseBody>
+<#else>
+import java.io.PrintWriter;
+</#if>
 @Controller
 @RequestMapping("${mapping}")
 public class ${controllerName} {
@@ -28,18 +35,27 @@
     @Resource
     private ${service.name} ${serviceObjName};
 
-
-    private String loadPrint(String callback, String root){
+    <#macro print data>
+      <#if responseBody>
         <#if jsonp>
-        return JsonUtil.loadJSONP(callback,root);
+return JsonUtil.loadJSONP(callback,${data});
         <#else>
-          return root;
+return ${data};
         </#if>
-    }
+      <#else>
+       <#if jsonp>
+out.print(JsonUtil.loadJSONP(callback,${data}));
+        return;
+        <#else>
+out.print(${data});
+        return;
+        </#if>
+       </#if>
+    </#macro>
 
-    @ResponseBody
+   ${responseBody?string("@ResponseBody","")}
     @RequestMapping("list")
-    public String list(${query.name} query, int page, int limit, String callback) {
+    public ${responseBody?string("String","void")} list(${query.name} query, int page, int limit${jsonp?string(", String callback","")}${responseBody?string("",",PrintWriter out")} ) {
         List<${entity.name}> list = ${serviceObjName}.list(query,page,limit);
         long count = ${serviceObjName}.count(query);
         JSONObject data = new JSONObject();
@@ -53,54 +69,89 @@
 
         data.put("list", gson.toJson(list));
         data.put("count", count);
-        return loadPrint(callback,JsonUtil.loadTrueResult(data));
+        <@print data="JsonUtil.loadTrueResult(data)" > </@print>
     }
 
-    @ResponseBody
+    <#if delete>
+    ${responseBody?string("@ResponseBody","")}
     @RequestMapping("delete")
-    public String delete(String ids, String callback) {
+    public ${responseBody?string("String","void")} delete(String ids${jsonp?string(", String callback","")}${responseBody?string("",",PrintWriter out")}) {
         Type type = new TypeToken<List<${identifyIdType}>>(){}.getType();
         List<${identifyIdType}> idList=new Gson().fromJson(ids,type);
         ${serviceObjName}.delete(idList);
-        return loadPrint(callback, JsonUtil.loadTrueResult(""));
+        <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
     }
+     </#if>
 
-    @ResponseBody
+    <#if add>
+    ${responseBody?string("@ResponseBody","")}
     @RequestMapping("add")
-    public String add(${entity.name} bean, HttpSession session, String callback) {
+
+     <#if adminVO??>
+    public ${responseBody?string("String","void")} add(${adminVO.name} vo,AcceptAdminData acceptAdminData${jsonp?string(", String callback","")}${responseBody?string("",",PrintWriter out")}) {
+        try{
+            ${serviceObjName}.add(vo.toEntity(acceptAdminData.getSystem()));
+            <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
+        }catch(Exception e){
+            <@print data="JsonUtil.loadFalseResult(e.getMessage())" > </@print>
+        }
+    }
+     <#else>
+    public ${responseBody?string("String","void")} add(${entity.name} bean, AcceptAdminData acceptAdminData${jsonp?string(", String callback","")}${responseBody?string("",",PrintWriter out")}) {
         try{
             ${serviceObjName}.add(bean);
-            return loadPrint(callback, JsonUtil.loadTrueResult(""));
+            <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
         }catch(Exception e){
-            return loadPrint(callback, JsonUtil.loadFalseResult(e.getMessage()));
+            <@print data="JsonUtil.loadFalseResult(e.getMessage())" > </@print>
         }
     }
+    </#if>
+    </#if>
 
-    @ResponseBody
+    ${responseBody?string("@ResponseBody","")}
     @RequestMapping("get")
-    public String get(${identifyIdType} id, HttpSession session, String callback) {
+    public ${responseBody?string("String","void")} get(${identifyIdType} id, AcceptAdminData acceptAdminData${jsonp?string(", String callback","")}${responseBody?string("",",PrintWriter out")}) {
         ${entity.name} entity = ${serviceObjName}.get(id);
         if (entity !=null){
-            return loadPrint(callback,JsonUtil.loadTrueResult(entity));
+            <@print data="JsonUtil.loadTrueResult(entity)" > </@print>
         } else {
-            return loadPrint(callback,JsonUtil.loadFalseResult("ID涓嶅瓨鍦�"));
+            <@print data="JsonUtil.loadFalseResult(\"ID涓嶅瓨鍦╘")" > </@print>
         }
     }
 
 
-    @ResponseBody
+    <#if update>
+    ${responseBody?string("@ResponseBody","")}
     @RequestMapping("update")
-    public String update(${entity.name} bean, HttpSession session,String callback) {
+    <#if adminVO??>
+
+    public ${responseBody?string("String","void")} update( ${adminVO.name} vo ,AcceptAdminData acceptAdminData${jsonp?string(", String callback","")}${responseBody?string("",",PrintWriter out")}) {
+        if (vo.getId() == null) {
+           <@print data="JsonUtil.loadFalseResult(\"ID涓嶈兘涓虹┖\")" > </@print>
+        }
+        try{
+            ${serviceObjName}.update(vo.toEntity(null));
+        }catch(Exception e){
+            <@print data="JsonUtil.loadFalseResult(e.getMessage())" > </@print>
+        }
+        <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
+    }
+
+    <#else>
+
+    public ${responseBody?string("String","void")} update( ${entity.name} bean , AcceptAdminData acceptAdminData${jsonp?string(", String callback","")}${responseBody?string("",",PrintWriter out")}) {
         if (bean.getId() == null) {
-            return loadPrint(callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+           <@print data="JsonUtil.loadFalseResult(\"ID涓嶈兘涓虹┖\")" > </@print>
         }
         try{
             ${serviceObjName}.update(bean);
         }catch(Exception e){
-            return loadPrint(callback,JsonUtil.loadFalseResult(e.getMessage()));
+            <@print data="JsonUtil.loadFalseResult(e.getMessage())" > </@print>
         }
-        return loadPrint(callback,JsonUtil.loadTrueResult(""));
+        <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
     }
+    </#if>
+    </#if>
 
 
 }

--
Gitblit v1.8.0