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 | 127 ++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 36 deletions(-)
diff --git a/src/main/resources/generater/admin/adminController.template b/src/main/resources/generater/admin/adminController.template
index f7d8311..eee5247 100644
--- a/src/main/resources/generater/admin/adminController.template
+++ b/src/main/resources/generater/admin/adminController.template
@@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.TimeUtil;
+import com.google.gson.reflect.TypeToken;
import javax.annotation.Resource;
import javax.servlet.http.HttpSession;
@@ -17,19 +18,45 @@
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 AdminAppController {
+public class ${controllerName} {
- <#assign serviceObjName=${service.name?uncap_first}">
+ <#assign serviceObjName="${service.name?uncap_first}">
+ <#assign entityObjName="${entity.name?uncap_first}">
@Resource
private ${service.name} ${serviceObjName};
- @ResponseBody
+ <#macro print data>
+ <#if responseBody>
+ <#if jsonp>
+return JsonUtil.loadJSONP(callback,${data});
+ <#else>
+return ${data};
+ </#if>
+ <#else>
+ <#if jsonp>
+out.print(JsonUtil.loadJSONP(callback,${data}));
+ return;
+ <#else>
+out.print(${data});
+ return;
+ </#if>
+ </#if>
+ </#macro>
+
+ ${responseBody?string("@ResponseBody","")}
@RequestMapping("list")
- public String list(${query.name} query, int page, int limit) {
- List<${entityName}> list = ${serviceObjName}.list(query,page,limit);
+ 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();
Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -42,61 +69,89 @@
data.put("list", gson.toJson(list));
data.put("count", count);
- return JsonUtil.loadTrueResult(data);
+ <@print data="JsonUtil.loadTrueResult(data)" > </@print>
}
- @ResponseBody
+ <#if delete>
+ ${responseBody?string("@ResponseBody","")}
@RequestMapping("delete")
- public String delete(String ids) {
- JSONArray array = JSONArray.fromObject(ids);
- List<String> idList=new ArrayList<>();
- for (int i = 0; i < array.size(); i++) {
- idList.add(array.optString(i));
- }
+ 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 JsonUtil.loadTrueResult("");
+ <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
}
+ </#if>
-
-
-
-
- @ResponseBody
+ <#if add>
+ ${responseBody?string("@ResponseBody","")}
@RequestMapping("add")
- public String add(${entity.name} bean, HttpSession session) {
+
+ <#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 JsonUtil.loadTrueResult("");
+ <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
}catch(Exception e){
- return JsonUtil.loadFalseResult(e.getMessage);
+ <@print data="JsonUtil.loadFalseResult(e.getMessage())" > </@print>
}
}
+ </#if>
+ </#if>
- @ResponseBody
+ ${responseBody?string("@ResponseBody","")}
@RequestMapping("get")
- public String add(String id, HttpSession session) {
- try{
- ${serviceObjName}.get(id);
- return JsonUtil.loadTrueResult("");
- }catch(Exception e){
- return JsonUtil.loadFalseResult(e.getMessage);
+ 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){
+ <@print data="JsonUtil.loadTrueResult(entity)" > </@print>
+ } else {
+ <@print data="JsonUtil.loadFalseResult(\"ID涓嶅瓨鍦╘")" > </@print>
}
}
- @ResponseBody
+ <#if update>
+ ${responseBody?string("@ResponseBody","")}
@RequestMapping("update")
- public String update(${entity.name} bean, HttpSession session) {
- if (app.getId() == null) {
- return JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖");
+ <#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}.updateSelective(bean);
+ ${serviceObjName}.update(vo.toEntity(null));
}catch(Exception e){
- return JsonUtil.loadFalseResult(e.getMessage);
+ <@print data="JsonUtil.loadFalseResult(e.getMessage())" > </@print>
}
- return JsonUtil.loadTrueResult("");
+ <@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) {
+ <@print data="JsonUtil.loadFalseResult(\"ID涓嶈兘涓虹┖\")" > </@print>
+ }
+ try{
+ ${serviceObjName}.update(bean);
+ }catch(Exception e){
+ <@print data="JsonUtil.loadFalseResult(e.getMessage())" > </@print>
+ }
+ <@print data="JsonUtil.loadTrueResult(\"\")" > </@print>
+ }
+ </#if>
+ </#if>
+
}
--
Gitblit v1.8.0