Browse Source

调整ftl的id处理,以及controller

wutianbin 7 years ago
parent
commit
2e5dec0c21

+ 2 - 2
src/main/java/org/geek/szbay/assistant/code/CodeHelpper.java

@@ -41,9 +41,9 @@ public class CodeHelpper {
     
     /** 表的前导字符 */
     //private String preTableName = "*";
-    private String preTableName = "fp_exam";
+    //private String preTableName = "fp_exam";
     //private String preTableName = "fp\\_exam";
-    //private String preTableName = "sys\\_";
+    private String preTableName = "sys\\_";
     
     /** 指定实体生成所在包的路径 */
     private String entityOutPath = "com.donghaiair.flyprepare.admin.domain";

+ 39 - 53
src/main/java/org/geek/szbay/assistant/code/generator/ControllerMaker.java

@@ -31,15 +31,18 @@ public class ControllerMaker {
         sb.append("package " + outPath + ";\r\n");  
         sb.append("\r\n");  
         
+        sb.append("import java.util.List;\r\n");
+        sb.append("\r\n");  
         sb.append("import org.springframework.beans.factory.annotation.Autowired;\r\n");
         sb.append("import org.springframework.stereotype.Controller;\r\n");
         sb.append("import org.springframework.ui.Model;\r\n");
+        sb.append("import org.springframework.web.bind.annotation.RequestBody;\r\n");
         sb.append("import org.springframework.web.bind.annotation.RequestMapping;\r\n");
         sb.append("import org.springframework.web.bind.annotation.ResponseBody;\r\n");
         sb.append("\r\n");  
 
         sb.append("import " + entityFullClassName + ";\r\n");
-        sb.append("import " + dtoRootPath + ".Page;\r\n");
+        //sb.append("import " + dtoRootPath + ".Page;\r\n");
         sb.append("import " + dtoRootPath + ".RetResult;\r\n");
         sb.append("import " + serviceFullClassName + ";\r\n");
         sb.append("\r\n");  
@@ -62,41 +65,29 @@ public class ControllerMaker {
         String tname = TableHelpper.tableNameToClassName(tableName);
         String tableUrl = "/" + StringUtils.firstToLowerCase(tname) + "/";
         
-    	sb.append("    @RequestMapping(\"").append(tableUrl).append("save\")\r\n");
-    	sb.append("    @Override\r\n");
-    	sb.append("    public RetResult<Integer> save(").append(entityClassName).append(" t) {\r\n");
-    	sb.append("        return super.save(t);\r\n");
-    	sb.append("    }\r\n");
-        sb.append("\r\n");
-        
-        sb.append("    @RequestMapping(\"").append(tableUrl).append("savePage\")\r\n");
-    	sb.append("    @Override\r\n");
-        sb.append("    public String savePage(").append(entityClassName).append(" t, Model model) {\r\n");
-        sb.append("        return super.savePage(t, model);\r\n");
-        sb.append("    }\r\n");
-        sb.append("\r\n");
-
-        sb.append("    @RequestMapping(\"").append(tableUrl).append("delete\")\r\n");
+        sb.append("    @RequestMapping(\"").append(tableUrl).append("list\")\r\n");
+    	sb.append("    @ResponseBody\r\n");
     	sb.append("    @Override\r\n");
-        sb.append("    public RetResult<Integer> delete(String key) {\r\n");
-        sb.append("        return super.delete(key);\r\n");
+    	sb.append("    @SuppressWarnings(\"rawtypes\")\r\n");
+    	sb.append("    public RetResult list(").append(entityClassName).append(" example) {\r\n");
+        sb.append("        return super.list(example);\r\n");
         sb.append("    }\r\n");
-        sb.append("\r\n");
-        
-        sb.append("    @RequestMapping(\"").append(tableUrl).append("deletePage\")\r\n");
+        sb.append("\r\n");  
+      
+        sb.append("    @RequestMapping(\"").append(tableUrl).append("listPage\")\r\n");
     	sb.append("    @Override\r\n");
-        sb.append("    public String deletePage(String key, Model model) {\r\n");
-        sb.append("        return super.deletePage(key, model);\r\n");
+        sb.append("    public String listPage(Model model, ").append(entityClassName).append(" example) {\r\n");
+        sb.append("        return super.listPage(model, example);\r\n");
         sb.append("    }\r\n");
-        sb.append("\r\n");
+        sb.append("\r\n");     
 
-        sb.append("    @RequestMapping(\"").append(tableUrl).append("update\")\r\n");
+        sb.append("    @RequestMapping(\"").append(tableUrl).append("savePage\")\r\n");
     	sb.append("    @Override\r\n");
-        sb.append("    public RetResult<Integer> update(").append(entityClassName).append(" t) {\r\n");
-        sb.append("        return super.update(t);\r\n");
+        sb.append("    public String savePage(").append(entityClassName).append(" t, Model model) {\r\n");
+        sb.append("        return super.savePage(t, model);\r\n");
         sb.append("    }\r\n");
         sb.append("\r\n");
-        
+
         sb.append("    @RequestMapping(\"").append(tableUrl).append("updatePage\")\r\n");
     	sb.append("    @Override\r\n");
         sb.append("    public String updatePage(").append(entityClassName).append(" t, Model model) {\r\n");
@@ -104,39 +95,34 @@ public class ControllerMaker {
         sb.append("    }\r\n");
         sb.append("\r\n");     
         
+    	appendBatchMethod(entityClassName, sb, tableUrl, "saveBatch");
+    	appendBatchMethod(entityClassName, sb, tableUrl, "deleteBatch");
+    	appendBatchMethod(entityClassName, sb, tableUrl, "updateBatch");
+        
         sb.append("    @RequestMapping(\"").append(tableUrl).append("getByKey\")\r\n");
-    	sb.append("    @Override\r\n");
-        sb.append("    public RetResult<").append(entityClassName).append("> getByKey(String key) {\r\n");
+        sb.append("    @ResponseBody\r\n");
+        sb.append("    @SuppressWarnings(\"rawtypes\")\r\n");
+        sb.append("    public RetResult getByKey(")
+        	.append(entityClassName).append(" key) {\r\n");
         sb.append("        return super.getByKey(key);\r\n");
         sb.append("    }\r\n");
         sb.append("\r\n");     
 
-        sb.append("    @RequestMapping(\"").append(tableUrl).append("getByKeyPage\")\r\n");
-    	sb.append("    @Override\r\n");
-        sb.append("    public String getByKeyPage(String key, Model model) {\r\n");
-        sb.append("        return super.getByKeyPage(key, model);\r\n");
-        sb.append("    }\r\n");
-        sb.append("\r\n");  
-        
-        sb.append("    @RequestMapping(\"").append(tableUrl).append("list\")\r\n");
-    	sb.append("    @ResponseBody\r\n");
-    	sb.append("    @Override\r\n");
-        sb.append("    public RetResult<Page<").append(entityClassName).append(">> list(")
-        		.append(entityClassName).append(" example) {\r\n");
-        sb.append("        return super.list(example);\r\n");
-        sb.append("    }\r\n");
-        sb.append("\r\n");  
-      
-        sb.append("    @RequestMapping(\"").append(tableUrl).append("listPage\")\r\n");
-    	sb.append("    @Override\r\n");
-        sb.append("    public String listPage(Model model, ").append(entityClassName).append(" example) {\r\n");
-        sb.append("        return super.listPage(model, example);\r\n");
-        sb.append("    }\r\n");
-        sb.append("\r\n");     
-
         sb.append("}\r\n");  
 
         return sb.toString();  
     }
 
+	private static void appendBatchMethod(String entityClassName, StringBuffer sb, String tableUrl,
+			String methodName) {
+		sb.append("    @RequestMapping(\"").append(tableUrl).append(methodName).append("\")\r\n");
+		sb.append("    @ResponseBody\r\n");
+		sb.append("    @Override\r\n");
+    	sb.append("    public RetResult<Integer> " + methodName + "(@RequestBody List<")
+    		.append(entityClassName).append("> list) {\r\n");
+    	sb.append("        return super." + methodName + "(list);\r\n");
+    	sb.append("    }\r\n");
+        sb.append("\r\n");
+	}
+
 }

+ 8 - 2
src/main/java/org/geek/szbay/assistant/code/generator/UpdateFtlMaker.java

@@ -67,13 +67,19 @@ public class UpdateFtlMaker {
 			if ((attrName.contains("createdOn") || attrName.contains("modifiedOn"))
 					&& colTypes.get(i).contains("Date")) {
 				continue;
+			} else if (attrName.contains("createdBy") || attrName.contains("modifiedBy")) {
+				continue;
 			} else if (keyName.equals(attrNames.get(i)) && update) {
 				sb.append(String.format(
 						"\t<input id=\"updateKey\" type=\"hidden\" name=\"%s\" value=\"${ret.model.%s!}\" />\r\n",
 						attrName, attrName));
 			} else {
-				sb.append("\t<div class=\"form-group row\">\r\n");
-
+				if (keyName.equals(attrNames.get(i)) && "id".equals(keyName)) {
+					sb.append("\t<div class=\"form-group row\"  style=\"display:none\">\r\n");
+				} else {
+					sb.append("\t<div class=\"form-group row\">\r\n");
+				}
+				
 				sb.append(String.format("\t\t<label class=\"col-md-3 form-control-label\" for=\"%s\">%s</label>\r\n",
 						attrName, colComments.get(i)));