From dbfc2c6b24fd3389be00c60e0601321c94b0fb92 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 11 十月 2023 16:09:51 +0800
Subject: [PATCH] 修改代码生成工具
---
DataLoader/App.config | 4 ++--
JavaCode/BsTemplate/Entity.java | 1 +
JavaCode/BsTemplate/GeoEntity.java | 1 +
JavaCode/App.config | 4 ++--
MoonExp/export.html | 2 +-
MoonExp/Models/ExportArgs.cs | 2 +-
JavaCode/FrmMyBatisPlus.Designer.cs | 10 +++++-----
JavaCode/FrmMyBatisPlus.cs | 16 ++++++----------
8 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/DataLoader/App.config b/DataLoader/App.config
index 26885e2..dfe9fa7 100644
--- a/DataLoader/App.config
+++ b/DataLoader/App.config
@@ -6,9 +6,9 @@
<add key="StartPath" value="3"/>
<add key="SourcePath" value="D:\Moon\data\DOM"/>
<add key="TargetPath" value="D:\LF\upload"/>
- <!--<add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
+ <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.83;Port=5433;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>-->
- <add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>
+ <!--<add key="pgConn" value="Server=103.85.165.99;Port=5433;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>-->
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
diff --git a/JavaCode/App.config b/JavaCode/App.config
index ec95b63..7724bf6 100644
--- a/JavaCode/App.config
+++ b/JavaCode/App.config
@@ -3,8 +3,8 @@
<appSettings>
<!--<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="pgConn" value="Server=103.85.165.99;Port=25432;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>
+ <add key="pgConn" value="Server=192.168.20.83;Port=5433;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>
+ <!--<add key="pgConn" value="Server=103.85.165.99;Port=25432;Database=moon;User Id=postgres;Password=Postgres!_14_moon;"/>-->
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
diff --git a/JavaCode/BsTemplate/Entity.java b/JavaCode/BsTemplate/Entity.java
index b1ff3e9..55a7c9d 100644
--- a/JavaCode/BsTemplate/Entity.java
+++ b/JavaCode/BsTemplate/Entity.java
@@ -15,6 +15,7 @@
*/
@Data
@AllArgsConstructor
+@SuppressWarnings("ALL")
@TableName("{tabName}")
@EqualsAndHashCode(callSuper = false)
public class {entityName} extends BaseEntity {
diff --git a/JavaCode/BsTemplate/GeoEntity.java b/JavaCode/BsTemplate/GeoEntity.java
index 257efbc..d497ee2 100644
--- a/JavaCode/BsTemplate/GeoEntity.java
+++ b/JavaCode/BsTemplate/GeoEntity.java
@@ -15,6 +15,7 @@
*/
@Data
@AllArgsConstructor
+@SuppressWarnings("ALL")
@TableName("{tabName}")
@EqualsAndHashCode(callSuper = false)
public class {entityName} extends BaseGeoEntity {
diff --git a/JavaCode/FrmMyBatisPlus.Designer.cs b/JavaCode/FrmMyBatisPlus.Designer.cs
index bd01aaf..5fc72ab 100644
--- a/JavaCode/FrmMyBatisPlus.Designer.cs
+++ b/JavaCode/FrmMyBatisPlus.Designer.cs
@@ -57,7 +57,7 @@
this.txtTabNS.Name = "txtTabNS";
this.txtTabNS.Size = new System.Drawing.Size(104, 26);
this.txtTabNS.TabIndex = 25;
- this.txtTabNS.Text = "163875";
+ this.txtTabNS.Text = "51776";
//
// txtTabPre
//
@@ -123,7 +123,7 @@
this.label3.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(385, 94);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(135, 16);
+ this.label3.Size = new System.Drawing.Size(136, 16);
this.label3.TabIndex = 29;
this.label3.Text = "Entity鍚嶇О绌洪棿锛�";
//
@@ -142,7 +142,7 @@
this.label2.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(385, 58);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(135, 16);
+ this.label2.Size = new System.Drawing.Size(136, 16);
this.label2.TabIndex = 31;
this.label2.Text = "Mapper鍚嶇О绌洪棿锛�";
//
@@ -228,7 +228,7 @@
this.label1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(433, 20);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(87, 16);
+ this.label1.Size = new System.Drawing.Size(88, 16);
this.label1.TabIndex = 39;
this.label1.Text = "琛ㄥ悕鍓嶇紑锛�";
//
@@ -248,7 +248,7 @@
this.label9.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(636, 20);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(87, 16);
+ this.label9.Size = new System.Drawing.Size(88, 16);
this.label9.TabIndex = 41;
this.label9.Text = "鍚嶇О绌洪棿锛�";
//
diff --git a/JavaCode/FrmMyBatisPlus.cs b/JavaCode/FrmMyBatisPlus.cs
index f588e3e..bc0e818 100644
--- a/JavaCode/FrmMyBatisPlus.cs
+++ b/JavaCode/FrmMyBatisPlus.cs
@@ -231,8 +231,10 @@
return;
}
+ sb.Append("\r\n");
string colName = NameConvert(ti.col, false);
- sb.Append("\r\n private " + type + " " + colName + ";\r\n");
+ if ("references" == colName) sb.Append(" @TableField(value = \"\\\"references\\\"\")").Append("\r\n");
+ sb.Append(" private " + type + " " + colName + ";\r\n");
}
sb.Append("\r\n public " + entityName + "() {\r\n }\r\n");
@@ -331,23 +333,17 @@
{
string[] strs = name.Split(new char[] { '_' });
- string str = "";
for (int i = 0, c = strs.Length; i < c; i++)
{
- if (i == 0 && !firstUpper)
+ if (0 == i && !firstUpper)
{
- str += strs[i];
continue;
}
- str += strs[i].Length == 1 ? strs[i] : ToUpperFirst(strs[i]);
- }
- if (str.Length == 1 && firstUpper)
- {
- return str.ToUpper();
+ strs[i] = char.IsDigit(strs[i][0]) ? "_" + strs[i] : ToUpperFirst(strs[i]);
}
- return str;
+ return string.Join("", strs);
}
public static string ToUpperFirst(string str)
diff --git a/MoonExp/Models/ExportArgs.cs b/MoonExp/Models/ExportArgs.cs
index 1c24749..bff0b8f 100644
--- a/MoonExp/Models/ExportArgs.cs
+++ b/MoonExp/Models/ExportArgs.cs
@@ -99,7 +99,7 @@
/// </summary>
public void SetDefault()
{
- if (string.IsNullOrWhiteSpace(title)) title = "绠￠亾鍩虹澶ф暟鎹钩鍙�";
+ if (string.IsNullOrWhiteSpace(title)) title = string.Empty;
if (string.IsNullOrWhiteSpace(province)) province = string.Empty;
if (string.IsNullOrWhiteSpace(scale)) scale = string.Empty;
if (string.IsNullOrWhiteSpace(resolution)) resolution = string.Empty;
diff --git a/MoonExp/export.html b/MoonExp/export.html
index 70f7244..3011a04 100644
--- a/MoonExp/export.html
+++ b/MoonExp/export.html
@@ -45,7 +45,7 @@
scale: "1锛�5涓�",
resolution: "5绫�",
date: "2022.11.09",
- layers: "m_hydraulic_protection,m_marker,m_pipeline,m_sitepoint,m_valvehousepoint,m_crossing,楂樺痉鐭㈤噺",
+ layers: "m_hydraulic_protection,m_marker,m_pipeline,m_sitepoint,m_valvehousepoint,m_crossing",
rotation: 0,
xmin: 103.394023,
ymin: 30.690466,
--
Gitblit v1.9.3