From 664cc2fd39177fd3daa6d3988396c704d130882c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 十月 2021 19:06:55 +0800
Subject: [PATCH] 自动化代码生成优化
---
src/main/resources/generater/admin/adminController.template | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/generater/admin/adminController.template b/src/main/resources/generater/admin/adminController.template
index f7d8311..6ac0695 100644
--- a/src/main/resources/generater/admin/adminController.template
+++ b/src/main/resources/generater/admin/adminController.template
@@ -22,14 +22,24 @@
@RequestMapping("${mapping}")
public class AdminAppController {
- <#assign serviceObjName=${service.name?uncap_first}">
+ <#assign serviceObjName="${service.name?uncap_first}">
+ <#assign entityObjName="${entity.name?uncap_first}">
@Resource
private ${service.name} ${serviceObjName};
+
+ private String loadPrint(String callback, String root){
+ <#if jsonp>
+ return JsonUtil.loadJSONP(callback,root);
+ <#else>
+ return root;
+ </#if>
+ }
+
@ResponseBody
@RequestMapping("list")
- public String list(${query.name} query, int page, int limit) {
- List<${entityName}> list = ${serviceObjName}.list(query,page,limit);
+ public String list(${query.name} query, int page, int limit, String callback) {
+ 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,60 +52,53 @@
data.put("list", gson.toJson(list));
data.put("count", count);
- return JsonUtil.loadTrueResult(data);
+ return loadPrint(callback,JsonUtil.loadTrueResult(data));
}
@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 String delete(String ids, String callback) {
+ Type type = new TypeToken<List<${identifyIdType}>>(){}.get();
+ List<${identifyIdType}> idList=new Gson().from(ids,type);
${serviceObjName}.delete(idList);
- return JsonUtil.loadTrueResult("");
+ return loadPrint(callback, JsonUtil.loadTrueResult(""));
}
-
-
-
-
@ResponseBody
@RequestMapping("add")
- public String add(${entity.name} bean, HttpSession session) {
+ public String add(${entity.name} bean, HttpSession session, String callback) {
try{
${serviceObjName}.add(bean);
- return JsonUtil.loadTrueResult("");
+ return loadPrint(callback, JsonUtil.loadTrueResult(""));
}catch(Exception e){
- return JsonUtil.loadFalseResult(e.getMessage);
+ return loadPrint(callback, JsonUtil.loadFalseResult(e.getMessage));
}
}
@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 String get(${identifyIdType} id, HttpSession session, String callback) {
+ ${entity.name} entity = ${serviceObjName}.get(id);
+ if (entity !=null){
+ return loadPrint(callback,JsonUtil.loadTrueResult(entity));
+ } else {
+ return loadPrint(callback,JsonUtil.loadFalseResult("ID涓嶅瓨鍦�"));
}
}
@ResponseBody
@RequestMapping("update")
- public String update(${entity.name} bean, HttpSession session) {
- if (app.getId() == null) {
- return JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖");
+ public String update(${entity.name} bean, HttpSession session,String callback) {
+ if (bean.getId() == null) {
+ return loadPrint(callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
}
try{
${serviceObjName}.updateSelective(bean);
}catch(Exception e){
- return JsonUtil.loadFalseResult(e.getMessage);
+ return loadPrint(callback,JsonUtil.loadFalseResult(e.getMessage));
}
- return JsonUtil.loadTrueResult("");
+ return loadPrint(callback,JsonUtil.loadTrueResult(""));
}
--
Gitblit v1.8.0