From 7690be43e84bea722fc458aac26aa70d9e22de00 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 26 一月 2024 14:06:42 +0800
Subject: [PATCH] 修改代码生成逻辑~
---
JavaCode/EtownTemplate/Entity.java | 4 +-
JavaCode/EtownTemplate/Mapper.java | 2
JavaCode/FrmEtown.Designer.cs | 2
JavaCode/cs/SysDict.cs | 23 +++++++++++
JavaCode/App.config | 2
JavaCode/FrmEtown.cs | 57 ++++++++++++++++++++++------
JavaCode/FrmMain.cs | 3 +
JavaCode/JavaCode.csproj | 1
8 files changed, 76 insertions(+), 18 deletions(-)
diff --git a/JavaCode/App.config b/JavaCode/App.config
index cd0d77f..c735c72 100644
--- a/JavaCode/App.config
+++ b/JavaCode/App.config
@@ -4,7 +4,7 @@
<!--<add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
<!--<add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
<add key="pgConn" value="Server=192.168.20.83;Port=5433;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>
- <add key="etownConn" value="Server=192.168.20.83;Port=5433;Database=etown;User Id=postgres;Password=postgres;"/>
+ <add key="etownConn" value="Server=127.0.0.1;Port=5433;Database=etown;User Id=postgres;Password=postgres;"/>
<!--<add key="pgConn" value="Server=103.85.165.99;Port=25432;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>-->
</appSettings>
<startup>
diff --git a/JavaCode/EtownTemplate/Entity.java b/JavaCode/EtownTemplate/Entity.java
index 842f368..bd607d4 100644
--- a/JavaCode/EtownTemplate/Entity.java
+++ b/JavaCode/EtownTemplate/Entity.java
@@ -12,7 +12,7 @@
import java.time.LocalDate;
/**
- * {bak}实体类
+ * {bak}瀹炰綋绫�
* @author WWW
* @date {date}
*/
@@ -20,7 +20,7 @@
@ToString
@SuppressWarnings("ALL")
@TableName("{tabName}")
-@ApiModel(value = "{bak}实体类")
+@ApiModel(value = "{bak}瀹炰綋绫�")
@EqualsAndHashCode(callSuper = false)
public class {entityName} extends BaseGeoEntity implements Serializable {
private static final long serialVersionUID = {uid}L;
diff --git a/JavaCode/EtownTemplate/Mapper.java b/JavaCode/EtownTemplate/Mapper.java
index 8bbcf8f..b41e1c4 100644
--- a/JavaCode/EtownTemplate/Mapper.java
+++ b/JavaCode/EtownTemplate/Mapper.java
@@ -6,7 +6,7 @@
import org.springframework.stereotype.Repository;
/**
- * {bak}映射类
+ * {bak}鏄犲皠绫�
* @author WWW
* @date {date}
*/
diff --git a/JavaCode/FrmEtown.Designer.cs b/JavaCode/FrmEtown.Designer.cs
index 3459ab9..889e8a5 100644
--- a/JavaCode/FrmEtown.Designer.cs
+++ b/JavaCode/FrmEtown.Designer.cs
@@ -55,7 +55,7 @@
this.txtTabNS.Name = "txtTabNS";
this.txtTabNS.Size = new System.Drawing.Size(104, 26);
this.txtTabNS.TabIndex = 25;
- this.txtTabNS.Text = "11859871";
+ this.txtTabNS.Text = "11860504";
//
// txtTabPre
//
diff --git a/JavaCode/FrmEtown.cs b/JavaCode/FrmEtown.cs
index aa966e7..2b5a8f7 100644
--- a/JavaCode/FrmEtown.cs
+++ b/JavaCode/FrmEtown.cs
@@ -26,12 +26,12 @@
public FrmEtown()
{
InitializeComponent();
- this.Load += new System.EventHandler(this.FrmMyBatisPlus_Load);
+ this.Load += new System.EventHandler(this.FrmEtown_Load);
}
- private void FrmMyBatisPlus_Load(object sender, EventArgs e)
+ private void FrmEtown_Load(object sender, EventArgs e)
{
- _dbHelper = new PostgreHelper(DbEnum.langfang);
+ _dbHelper = new PostgreHelper(DbEnum.etown);
}
#endregion
@@ -113,7 +113,7 @@
{
try
{
- string path = Path.Combine(baseDir, "EtownTemplate\\Mapper");
+ string path = Path.Combine(baseDir, "Result\\Mapper");
List<string> names = GetTabList();
foreach (string name in names)
@@ -134,7 +134,7 @@
{
try
{
- string path = Path.Combine(baseDir, "EtownTemplate\\Entity");
+ string path = Path.Combine(baseDir, "Result\\Entity");
List<string> names = GetTabList();
foreach (string name in names)
@@ -167,7 +167,11 @@
string entityName = shortName + "Entity";
string ns = this.txtTabPrefix.Text.Trim();
- string bak = string.IsNullOrWhiteSpace(tabs[0].desc) ? shortName : tabs[0].desc.Replace("琛�", "");
+ string bak = shortName;
+ if (!string.IsNullOrEmpty(tabs[0].desc)) bak = tabs[0].desc.Replace("琛�", "");
+
+ List<SysDict> dicts = SelectSysDicts(tabName);
+ if (dicts != null) bak = dicts[0].descr;
string javaFile = "Mapper.java";
string xml = File.ReadAllText(Path.Combine(baseDir, "EtownTemplate\\" + javaFile));
@@ -198,8 +202,12 @@
string entityName = shortName + "Entity";
string ns = this.txtTabPrefix.Text.Trim();
- string bak = string.IsNullOrWhiteSpace(tabs[0].desc) ? shortName : tabs[0].desc.Replace("琛�", "");
long uid = (long)Math.Floor((new Random()).NextDouble() * 1000000000000000000D);
+
+ string bak = shortName;
+ if (!string.IsNullOrEmpty(tabs[0].desc)) bak = tabs[0].desc.Replace("琛�", "");
+ List<SysDict> dicts = SelectSysDicts(tabName);
+ if (dicts != null) bak = dicts[0].descr;
string javaFile = "Entity.java";
string xml = File.ReadAllText(Path.Combine(baseDir, "EtownTemplate\\" + javaFile));
@@ -213,6 +221,7 @@
.Replace("{date}", DateTime.Now.ToString("yyyy-MM-dd"));
StringBuilder sb = new StringBuilder();
+ sb.Append("\r\n public " + entityName + "() {\r\n }\r\n");
foreach (TabInfo ti in tabs)
{
string type = GetJavaType(ti);
@@ -225,10 +234,15 @@
sb.Append("\r\n");
string colName = NameConvert(ti.col, false);
- if ("references" == colName) sb.Append(" @TableField(value = \"\\\"references\\\"\")").Append("\r\n");
+ //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");
+ }
sb.Append(" private " + type + " " + colName + ";\r\n");
}
- sb.Append("\r\n public " + entityName + "() {\r\n }\r\n");
foreach (TabInfo ti in tabs)
{
@@ -254,8 +268,8 @@
{
try
{
- string mapperPath = Path.Combine(baseDir, "EtownTemplate\\Mapper");
- string entityPath = Path.Combine(baseDir, "EtownTemplate\\Entity");
+ string mapperPath = Path.Combine(baseDir, "Result\\Mapper");
+ string entityPath = Path.Combine(baseDir, "Result\\Entity");
List<string> names = GetTabList();
foreach (string name in names)
@@ -265,7 +279,7 @@
GenerateEntity(entityPath, name, tabs);
}
- string path = Path.Combine(baseDir, "EtownTemplate");
+ string path = Path.Combine(baseDir, "Result");
OpenFolder(path);
}
catch (Exception ex)
@@ -293,6 +307,25 @@
#endregion
#region 鍏叡鏂规硶
+ private List<SysDict> SelectSysDicts(string table)
+ {
+ string[] strs = table.Split(new char[] { '.' });
+ string sql = string.Format("select id,ns||'.'||tab table, descr, field, alias, type from se.sys_dict where ns='{0}' and tab='{1}' order by orderid", strs[0], strs[1]);
+
+ DataTable dt = _dbHelper.GetDataTable(sql, null);
+
+ List<SysDict> list = ModelHandler.FillModel<SysDict>(dt);
+
+ return null == list || list.Count == 0 ? null : list;
+ }
+
+ private SysDict FindSysDict(List<SysDict> list, string field)
+ {
+ IEnumerable<SysDict> rs = from sd in list where sd.field == field select sd;
+
+ return rs.FirstOrDefault();
+ }
+
private List<string> GetTabList()
{
List<string> list = new List<string>();
diff --git a/JavaCode/FrmMain.cs b/JavaCode/FrmMain.cs
index bcc44e7..14d02eb 100644
--- a/JavaCode/FrmMain.cs
+++ b/JavaCode/FrmMain.cs
@@ -48,7 +48,8 @@
private void btnEtown_Click(object sender, EventArgs e)
{
-
+ FrmEtown frm = new FrmEtown();
+ frm.Show();
}
}
}
diff --git a/JavaCode/JavaCode.csproj b/JavaCode/JavaCode.csproj
index 3027ff6..893718c 100644
--- a/JavaCode/JavaCode.csproj
+++ b/JavaCode/JavaCode.csproj
@@ -88,6 +88,7 @@
<Compile Include="cs\ReadExcel.cs" />
<Compile Include="cs\SQLiteHelper.cs" />
<Compile Include="cs\TabInfo.cs" />
+ <Compile Include="cs\SysDict.cs" />
<Compile Include="cs\TerrainHelper.cs" />
<Compile Include="FrmMain.cs">
<SubType>Form</SubType>
diff --git a/JavaCode/cs/SysDict.cs b/JavaCode/cs/SysDict.cs
new file mode 100644
index 0000000..062bfca
--- /dev/null
+++ b/JavaCode/cs/SysDict.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JavaCode.cs
+{
+ public class SysDict
+ {
+ public long id { set; get; }
+
+ public string table { set; get; }
+
+ public string descr { set; get; }
+
+ public string field { set; get; }
+
+ public string alias { set; get; }
+
+ public string type { set; get; }
+ }
+}
--
Gitblit v1.9.3