From 8d7a67ab1d635cb954337d8a767878ae526dd3dc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 九月 2024 10:27:24 +0800
Subject: [PATCH] 修改打开、保存、另存为功能
---
JavaCode/FrmEtown.cs | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/JavaCode/FrmEtown.cs b/JavaCode/FrmEtown.cs
index 2b5a8f7..0eb7e79 100644
--- a/JavaCode/FrmEtown.cs
+++ b/JavaCode/FrmEtown.cs
@@ -158,7 +158,7 @@
if (!Directory.Exists(path)) Directory.CreateDirectory(path);
string tabName = this.txtTabPrefix.Text.Trim() + name;
- string shortName = GetEntityName(name, true);
+ string shortName = GetEntityName(name);
string mapperNS = this.txtMapperNS.Text.Trim();
string mapperName = shortName + "Mapper";
@@ -196,7 +196,7 @@
string tabName = this.txtTabPrefix.Text.Trim() + name;
//string shortName = NameConvert(name, true);
- string shortName = GetEntityName(name, true);
+ string shortName = GetEntityName(name);
string entityNS = this.txtEntityNS.Text.Trim();
string entityName = shortName + "Entity";
@@ -237,10 +237,9 @@
//if ("references" == colName) sb.Append(" @TableField(value = \"\\\"references\\\"\")").Append("\r\n");
SysDict dict = FindSysDict(dicts, ti.col);
- if (null != dict && !string.IsNullOrEmpty(dict.alias))
- {
- sb.Append(" @ApiModelProperty(value = \"" + dict.alias.Trim() + "\")\r\n");
- }
+ string alias = null == dict || string.IsNullOrEmpty(dict.alias) ? (string.IsNullOrEmpty(ti.bak) ? "" : ti.bak.Trim()) : dict.alias.Trim();
+ sb.Append(" @ApiModelProperty(value = \"" + alias + "\")\r\n");
+
sb.Append(" private " + type + " " + colName + ";\r\n");
}
@@ -274,9 +273,16 @@
List<string> names = GetTabList();
foreach (string name in names)
{
- List<TabInfo> tabs = GetTabInfo(name);
- GenerateMapper(mapperPath, name, tabs);
- GenerateEntity(entityPath, name, tabs);
+ try
+ {
+ List<TabInfo> tabs = GetTabInfo(name);
+ GenerateMapper(mapperPath, name, tabs);
+ GenerateEntity(entityPath, name, tabs);
+ }
+ catch (Exception ec)
+ {
+ MessageBox.Show(name + "\r\n" + ec.Message);
+ }
}
string path = Path.Combine(baseDir, "Result");
@@ -289,11 +295,6 @@
}
private void txtTabPrefix_TextChanged(object sender, EventArgs e)
- {
- txtChanged(sender, e);
- }
-
- private void txtNS_TextChanged(object sender, EventArgs e)
{
txtChanged(sender, e);
}
@@ -321,9 +322,9 @@
private SysDict FindSysDict(List<SysDict> list, string field)
{
- IEnumerable<SysDict> rs = from sd in list where sd.field == field select sd;
+ if (null == list) return null;
- return rs.FirstOrDefault();
+ return (from sd in list where sd.field == field select sd).FirstOrDefault();
}
private List<string> GetTabList()
@@ -348,23 +349,25 @@
return tabs;
}
- private static string GetEntityName(string name, bool firstUpper)
+ private static string GetEntityName(string name)
{
- return firstUpper ? ToUpperFirst(name.Replace("_", "")) : name.Replace("_", "");
+ string[] strs = name.ToLower().Split(new char[] { '_' });
+ for (int i = 0, c = strs.Length; i < c; i++)
+ {
+ strs[i] = ToUpperFirst(strs[i]);
+ }
+
+ return string.Join("", strs);
}
private static string NameConvert(string name, bool firstUpper)
{
- string[] strs = name.Split(new char[] { '_' });
-
+ string[] strs = name.ToLower().Split(new char[] { '_' });
for (int i = 0, c = strs.Length; i < c; i++)
{
- if (0 == i && !firstUpper)
- {
- continue;
- }
+ if (0 == i && !firstUpper) continue;
- strs[i] = char.IsDigit(strs[i][0]) ? "_" + strs[i] : ToUpperFirst(strs[i]);
+ strs[i] = ToUpperFirst(strs[i]);
}
return string.Join("", strs);
--
Gitblit v1.9.3