优化json生成器

Author: 杨利兵

src/main/java/com/yanglb/codegen/core/translator/impl/MsgJsonTranslatorImpl.java

@@ -31,6 +31,16 @@ protected void onBeforeTranslate() throws CodeGenException {
 		this.writableModel.setExtension("json");
 	}
 
+	private void tblModel2Json(JSONObject json, TableModel tblModel) {
+		for(Map<String, String> itm : tblModel.toList()) {
+			String id = itm.get("id");
+			String value = itm.get(this.msgLang);
+			if(StringUtil.isNullOrEmpty(id)) continue;
+
+			json.put(id, value);
+		}
+	}
+
 	@Override
 	protected void onTranslate() throws CodeGenException {
 		super.onTranslate();
@@ -40,25 +50,14 @@ protected void onTranslate() throws CodeGenException {
 		if(this.paramaModel.getOptions().hasOption("combine")) {
 			// 合并输出
 			for(TableModel tblModel : this.model) {
-				for(Map<String, String> itm : tblModel.toList()) {
-					String id = itm.get("id");
-					String value = itm.get(this.msgLang);
-					if(StringUtil.isNullOrEmpty(id)) continue;
-
-					json.put(id, value);
-				}
+				tblModel2Json(json, tblModel);
 			}
 		} else {
 			// 分组输出
 			for(TableModel tblModel : this.model) {
 				JSONObject sub = new JSONObject();
-				for(Map<String, String> itm : tblModel.toList()) {
-					String id = itm.get("id");
-					String value = itm.get(this.msgLang);
-					if(StringUtil.isNullOrEmpty(id)) continue;
+				tblModel2Json(sub, tblModel);
 
-					sub.put(id, value);
-				}
 				String sheetName = tblModel.getSheetName();
 				json.put(sheetName, sub);
 			}

src/main/java/com/yanglb/codegen/shell/CGShell.java

@@ -26,7 +26,7 @@ public class CGShell {
 	public boolean invoke(String[] args) {
 
 		// test data
-		args = new String[] {"msg.prop", "/Users/yanglibing/Work/cg/tests/msg.xlsx"};
+		args = new String[] {"msg.json", "/Users/yanglibing/Work/cg/tests/msg.xlsx", "-c"};
 //		args = new String[] {"ddl.sqlite", "/Users/yanglibing/Work/cg/tests/ddl.xlsx"};
 //		args = new String[] {"dml", "/Users/yanglibing/Work/cg/tests/dml.xlsx"};
 //		args = new String[] {"", "-h"};