解决-fn参数不正常问题

Author: 杨利兵

src/main/java/com/yanglb/codegen/core/translator/BaseDdlTranslator.java

@@ -34,17 +34,6 @@ public class BaseDdlTranslator extends BaseSqlTranslator<DdlModel> {
 	protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		this.writableModel.setExtension("ddl");
-
-		// 设置文件名（同Excel名）
-		String 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);
-		}
-		this.writableModel.setFileName(fileName);
 	}
 
 	@Override

src/main/java/com/yanglb/codegen/core/translator/BaseMsgTranslator.java

@@ -49,28 +49,6 @@ protected String getSplitString() {
 		return ".";
 	}
 
-	/**
-	 * 文件名，优先使用--fn参数指定的文件名，如不指定使用excel名称
-	 * @return 文件名
-	 */
-	protected String getFileName() {
-		String fileName = this.parameterModel.getFileName();
-		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;
-	}
-	
 	/**
 	 * 获取当前语言是否为默认语言
 	 * @return

src/main/java/com/yanglb/codegen/core/translator/BaseTranslator.java

@@ -15,6 +15,7 @@
  */
 package com.yanglb.codegen.core.translator;
 
+import java.io.File;
 import java.util.HashMap;
 
 import com.yanglb.codegen.model.ParameterModel;
@@ -30,7 +31,29 @@ public class BaseTranslator<T> implements ITranslator<T> {
 	protected BaseTranslator() {
 		this.writableModel = new WritableModel();
 	}
-	
+
+	/**
+	 * 文件名，优先使用--fn参数指定的文件名，如不指定使用excel名称
+	 * @return 文件名
+	 */
+	protected String getFileName() {
+		String fileName = this.parameterModel.getFileName();
+		if (fileName != null) {
+			fileName.replaceAll("\"", "");
+		} else {
+			fileName = this.parameterModel.getFile();
+			File file = new File(fileName);
+			fileName = file.getName();
+
+			int index = fileName.lastIndexOf(".");
+			if(index != -1) {
+				fileName = fileName.substring(0, index);
+			}
+		}
+
+		return fileName;
+	}
+
 	/**
 	 * 进行翻译处理
 	 * @param settingMap 配置信息
@@ -56,7 +79,7 @@ public WritableModel translate(HashMap<String, String> settingMap, ParameterMode
 	protected void onBeforeTranslate() throws CodeGenException {
 		// 设置文件名、等初始化操作
 		this.writableModel.setEncode("utf-8");
-		this.writableModel.setFileName("untitled");
+		this.writableModel.setFileName(getFileName());
 		this.writableModel.setData(new StringBuilder());
 		this.writableModel.setOutputDir(this.parameterModel.getOptDir());
 	}

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

@@ -42,23 +42,6 @@ public DdlMysqlTranslatorImpl() {
 		this.sqlColumnEnd = "`";
 	}
 
-	@Override
-	protected void onBeforeTranslate() throws CodeGenException {
-		super.onBeforeTranslate();
-		this.writableModel.setExtension("ddl");
-
-		// 设置文件名（同Excel名）
-		String 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);
-		}
-		this.writableModel.setFileName(fileName);
-	}
-
 	@Override
 	protected void onTranslate() throws CodeGenException {
 		super.onTranslate();

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

@@ -31,11 +31,6 @@ public DdlSqlServerTranslatorImpl() {
 		this.sqlColumnStart = "[";
 		this.sqlColumnEnd = "]";
 	}
-	
-	@Override
-	protected void onBeforeTranslate() throws CodeGenException {
-		super.onBeforeTranslate();
-	}
 
 	@Override
 	protected void onTranslate() throws CodeGenException {

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

@@ -33,23 +33,6 @@ public DdlSqliteTranslatorImpl() {
 		this.sqlColumnEnd = "\"";
 	}
 
-	@Override
-	protected void onBeforeTranslate() throws CodeGenException {
-		super.onBeforeTranslate();
-		this.writableModel.setExtension("ddl");
-
-		// 设置文件名（同Excel名）
-		String 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);
-		}
-		this.writableModel.setFileName(fileName);
-	}
-
 	@Override
 	protected void onTranslate() throws CodeGenException {
 		super.onTranslate();		

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

@@ -31,17 +31,6 @@ protected void onBeforeTranslate() throws CodeGenException {
 		super.onBeforeTranslate();
 		this.writableModel.setExtension("dml");
 
-		// 设置文件名（同Excel名）
-		String 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);
-		}
-		this.writableModel.setFileName(fileName);
-
 		String target = parameterModel.getOptions().getOptionValue("target", "mysql");
 		switch (target) {
 			case "mysql":

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

@@ -34,14 +34,19 @@ protected void onBeforeTranslate() throws CodeGenException {
 
 		this.writableModel.setExtension("xml");
 
-		// 文件名
-		if (this.parameterModel.getFileName() == null) {
-			this.writableModel.setFileName("strings");
+		// Android 资源输出目录结构为  strings、strings-zh等
+		String path = "values";
+		if (!this.isDefaultLanguage()) {
+			path = String.format("values-%s", this.msgLang);
 		}
 
+		// 文件名，未设置时默认为strings
 		String fileName = writableModel.getFileName();
-		String path =  (this.isDefaultLanguage() ? "" : this.getSplitString() + this.msgLang);
-		fileName = ("values" + path) + "/" + fileName;
+		if (StringUtil.isNullOrEmpty(this.parameterModel.getFileName())) {
+			fileName = "strings";
+		}
+
+		fileName = path + "/" + fileName;
 		writableModel.setFileName(fileName);
 	}