改进msg生成功能

杨利兵 · 杨利兵 · commit bb0c83a14675 · 2019-12-06T15:56:42.000+08:00
diff --git a/src/com/yanglb/utilitys/codegen/core/translator/BaseMsgTranslator.java b/src/com/yanglb/utilitys/codegen/core/translator/BaseMsgTranslator.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2015 yanglb.com
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yanglb.utilitys.codegen.core.translator;
+
+import java.io.File;
+import java.util.List;
+
+import com.yanglb.utilitys.codegen.core.model.TableModel;
+
+public class BaseMsgTranslator extends BaseTranslator<List<TableModel>> {
+	
+	/**
+	 * 文件名，优先使用--fn参数指定的文件名，如不指定使用excel名称
+	 * @return 文件名
+	 */
+	protected String getFileName() {
+		String fileName = this.paramaModel.getOptions().get("fn");
+		if (fileName != null) {
+			fileName.replaceAll("\"", "");
+		} else {
+			fileName = this.model.get(0).getExcelFileName();
+			File file = new File(fileName);
+			fileName = file.getName();
+			
+			int index = fileName.lastIndexOf(".");
+			if(index != -1) {
+				fileName = fileName.substring(0, index);
+			}
+		}
+		
+		return fileName;
+	}
+}
diff --git a/src/com/yanglb/utilitys/codegen/core/translator/impl/MsgJavaTranslatorImpl.java b/src/com/yanglb/utilitys/codegen/core/translator/impl/MsgJavaTranslatorImpl.java
@@ -15,15 +15,14 @@
  */
 package com.yanglb.utilitys.codegen.core.translator.impl;
 
-import java.util.List;
 import java.util.Map;
 
 import com.yanglb.utilitys.codegen.core.model.TableModel;
-import com.yanglb.utilitys.codegen.core.translator.BaseTranslator;
+import com.yanglb.utilitys.codegen.core.translator.BaseMsgTranslator;
 import com.yanglb.utilitys.codegen.exceptions.CodeGenException;
 import com.yanglb.utilitys.codegen.utility.StringUtility;
 
-public class MsgJavaTranslatorImpl extends BaseTranslator<List<TableModel>> {
+public class MsgJavaTranslatorImpl extends BaseMsgTranslator {
 	protected String msgLang = "";
 
 	@Override
@@ -33,11 +32,19 @@ protected void onBeforeTranslate() throws CodeGenException {
 		// 当前生成的国际化语言
 		this.msgLang = this.settingMap.get("MsgLang");
 		
-		this.writableModel.setExtension("properties");
-		this.writableModel.setFileName("message");
-		if(!this.msgLang.equals("default")) {
-			this.writableModel.setFileName("message_"+this.msgLang);
+		// 文件名
+		String fileName = getFileName();
+		if (fileName.equals("")) {
+			// 空文件名
+			fileName = this.msgLang;
+		} else {
+			if(!this.msgLang.equals("default")) {
+				fileName = fileName + "_" + this.msgLang;
+			}
 		}
+		
+		this.writableModel.setFileName(fileName);
+		this.writableModel.setExtension("properties");
 		this.writableModel.setFilePath("msg/properties");
 	}
 
diff --git a/src/com/yanglb/utilitys/codegen/core/translator/impl/MsgJsTranslatorImpl.java b/src/com/yanglb/utilitys/codegen/core/translator/impl/MsgJsTranslatorImpl.java
@@ -15,15 +15,14 @@
  */
 package com.yanglb.utilitys.codegen.core.translator.impl;
 
-import java.util.List;
 import java.util.Map;
 
 import com.yanglb.utilitys.codegen.core.model.TableModel;
-import com.yanglb.utilitys.codegen.core.translator.BaseTranslator;
+import com.yanglb.utilitys.codegen.core.translator.BaseMsgTranslator;
 import com.yanglb.utilitys.codegen.exceptions.CodeGenException;
 import com.yanglb.utilitys.codegen.utility.StringUtility;
 
-public class MsgJsTranslatorImpl extends BaseTranslator<List<TableModel>> {
+public class MsgJsTranslatorImpl extends BaseMsgTranslator {
 	protected String msgLang = "";
 
 	@Override
@@ -33,16 +32,19 @@ protected void onBeforeTranslate() throws CodeGenException {
 		// 当前生成的国际化语言
 		this.msgLang = this.settingMap.get("MsgLang");
 		
-		// 可指定文件名
-		String fileName = this.paramaModel.getOptions().get("fn");
-		if(fileName == null || fileName.equals("")){
-			fileName = "message";
+		// 文件名
+		String fileName = getFileName();
+		if (fileName.equals("")) {
+			// 空文件名
+			fileName = this.msgLang;
+		} else {
+			if(!this.msgLang.equals("default")) {
+				fileName = fileName + "." + this.msgLang;
+			}
 		}
-		this.writableModel.setExtension("js");
+		
 		this.writableModel.setFileName(fileName);
-		if(!this.msgLang.equals("default")) {
-			this.writableModel.setFileName(fileName + "." + this.msgLang);
-		}
+		this.writableModel.setExtension("js");
 		this.writableModel.setFilePath("msg/js");
 	}
 
@@ -70,16 +72,16 @@ protected void onTranslate() throws CodeGenException {
 						if(StringUtility.isNullOrEmpty(id)) continue;
 						// 对字符串进行转换
 						String value = this.convert2JsCode(itm.get(this.msgLang));
-						sb.append(String.format("    %s: '%s', \r\n", id, value));
+						sb.append(String.format("    %s: \"%s\", \r\n", id, value));
 					}
 				} else {
-					sb.append(String.format("    '%s': { \r\n", tblModel.getSheetName()));
+					sb.append(String.format("    %s: { \r\n", tblModel.getSheetName()));
 					for(Map<String, String> itm : tblModel.toList()) {
 						String id = itm.get("id");
 						if(StringUtility.isNullOrEmpty(id)) continue;
 						// 对字符串进行转换
 						String value = this.convert2JsCode(itm.get(this.msgLang));
-						sb.append(String.format("        %s: '%s', \r\n", id, value));
+						sb.append(String.format("        %s: \"%s\", \r\n", id, value));
 					}
 					int idx = sb.lastIndexOf(",");
 					if(idx != -1) {
@@ -103,7 +105,7 @@ protected void onTranslate() throws CodeGenException {
 					if(StringUtility.isNullOrEmpty(id)) continue;
 					// 对字符串进行转换
 					String value = this.convert2JsCode(itm.get(this.msgLang));
-					sb.append(String.format("    %s: '%s', \r\n", id, value));
+					sb.append(String.format("    %s: \"%s\", \r\n", id, value));
 				}
 			}
 			
diff --git a/src/com/yanglb/utilitys/codegen/core/translator/impl/MsgJsonTranslatorImpl.java b/src/com/yanglb/utilitys/codegen/core/translator/impl/MsgJsonTranslatorImpl.java
@@ -15,15 +15,14 @@
  */
 package com.yanglb.utilitys.codegen.core.translator.impl;
 
-import java.util.List;
 import java.util.Map;
 
 import com.yanglb.utilitys.codegen.core.model.TableModel;
-import com.yanglb.utilitys.codegen.core.translator.BaseTranslator;
+import com.yanglb.utilitys.codegen.core.translator.BaseMsgTranslator;
 import com.yanglb.utilitys.codegen.exceptions.CodeGenException;
 import com.yanglb.utilitys.codegen.utility.StringUtility;
 
-public class MsgJsonTranslatorImpl extends BaseTranslator<List<TableModel>> {
+public class MsgJsonTranslatorImpl extends BaseMsgTranslator {
 	protected String msgLang = "";
 
 	@Override
@@ -33,16 +32,19 @@ protected void onBeforeTranslate() throws CodeGenException {
 		// 当前生成的国际化语言
 		this.msgLang = this.settingMap.get("MsgLang");
 		
-		// 可指定文件名
-		String fileName = this.paramaModel.getOptions().get("fn");
-		if(fileName == null || fileName.equals("")){
-			fileName = "message";
+		// 文件名
+		String fileName = getFileName();
+		if (fileName.equals("")) {
+			// 空文件名
+			fileName = this.msgLang;
+		} else {
+			if(!this.msgLang.equals("default")) {
+				fileName = fileName + "." + this.msgLang;
+			}
 		}
-		this.writableModel.setExtension("json");
+		
 		this.writableModel.setFileName(fileName);
-		if(!this.msgLang.equals("default")) {
-			this.writableModel.setFileName(fileName + "." + this.msgLang);
-		}
+		this.writableModel.setExtension("json");
 		this.writableModel.setFilePath("msg/json");
 	}
 
