From c05fa8a85061355577aba11107932bb85df3517c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 17 二月 2024 15:30:19 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/resources/templates/react/Edit.txt | 48 -----------------------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 1
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java | 31 +++++++++++++++
zy-asrs-framework/src/main/resources/templates/react/Sql.txt | 10 ++--
4 files changed, 37 insertions(+), 53 deletions(-)
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
index ee3c5d2..ede2c73 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
@@ -41,6 +41,7 @@
public String username;
public String password;
public String table;
+ public String tableName;
public String packagePath;
public boolean controller = true;
public boolean service = true;
@@ -71,6 +72,7 @@
private String systemPackage;
private String itemName;
private String tableColumns;
+ private String formEditColumns;
public void build() throws Exception {
init();
@@ -163,6 +165,7 @@
}
itemName = packagePathSplit[packagePathSplit.length - 1];
tableColumns = createTableColumns();
+ formEditColumns = createFormEditColumns();
}
private String readFile(String template){
@@ -190,6 +193,7 @@
if(!writerFile.exists()){
content=content.
replaceAll("@\\{TABLENAME}", table)
+ .replaceAll("@\\{TABLEDESC}", tableName)
.replaceAll("@\\{ENTITYIMPORT}", entityImport)
.replaceAll("@\\{ENTITYCONTENT}", entityContent)
.replaceAll("@\\{ENTITYNAME}", fullEntityName)
@@ -212,6 +216,7 @@
.replaceAll("@\\{UPCASEMARJORCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
.replaceAll("@\\{SYSTEMPACKAGE}",systemPackage)
.replaceAll("@\\{TABLECOLUMNS}", tableColumns)
+ .replaceAll("@\\{FORMEDITCOLUMNS}", formEditColumns)
;
writerFile.createNewFile();
BufferedWriter writer=new BufferedWriter(new FileWriter(writerFile));
@@ -227,7 +232,13 @@
private void gainDbInfo() throws Exception {
Connection conn;
if (null == this.sqlOsType) {
- throw new RuntimeException("璇锋寚瀹氭暟鎹簱绫诲瀷锛�");
+ throw new RuntimeException("璇烽�夋嫨sqlOsType锛�");
+ }
+ if (null == this.table) {
+ throw new RuntimeException("璇疯緭鍏able锛�");
+ }
+ if (null == this.tableName) {
+ throw new RuntimeException("璇疯緭鍏ableName锛�");
}
switch (this.sqlOsType) {
case MYSQL:
@@ -840,7 +851,25 @@
/************************************** Edit鍔ㄦ�佸瓧娈� ********************************************/
/**********************************************************************************************/
+ private String createFormEditColumns() {
+ StringBuilder sb = new StringBuilder();
+ int times = 0;
+ for (Column column : columns) {
+ if (column.isPrimaryKey()
+ || column.getHumpName().equals("deleted")
+ || column.getHumpName().equals("hostId")
+ ) {
+ continue;
+ }
+ if (times%2 == 0) {
+
+ }
+
+ times++;
+ }
+ return sb.toString();
+ }
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Edit.txt b/zy-asrs-framework/src/main/resources/templates/react/Edit.txt
index aee6263..b3e5ab4 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Edit.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Edit.txt
@@ -56,53 +56,7 @@
disabled
hidden={true}
/>
- <ProForm.Group>
- <ProFormText
- name="name"
- label="瑙掕壊鍚嶇О"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- rules={[{ required: true, message: "璇疯緭鍏ヨ鑹插悕绉帮紒" }]}
- />
- <ProFormText
- name="code"
- label="瑙掕壊鏍囪瘑"
- colProps={{ md: 12, xl: 12 }}
- placeholder="璇疯緭鍏�"
- rules={[{ required: true, message: "璇疯緭鍏ヨ鑹叉爣璇嗭紒" }]}
- />
- </ProForm.Group>
- <ProForm.Group>
- <ProFormSelect
- name="status"
- label="鐘舵��"
- colProps={{ md: 12, xl: 12 }}
- options={[
- { label: '姝ｅ父', value: 1 },
- { label: '绂佺敤', value: 0 },
- ]}
- rules={[{ required: true, message: "璇烽�夋嫨鐘舵�侊紒" }]}
- />
- <ProFormDateTimePicker
- name="updateTime"
- label="淇敼鏃堕棿"
- colProps={{ md: 12, xl: 12 }}
- transform={(value) => {
- return moment(value).toISOString();
- }}
- />
- </ProForm.Group>
- <ProFormSelect
- name="hostId"
- label="鏈烘瀯"
- colProps={{ md: 12, xl: 12 }}
- showSearch
- debounceTime={300}
- request={async ({ keyWords }) => {
- const resp = await Http.doPostForm('api/hostId/query', { condition: keyWords });
- return resp.data;
- }}
- />
+@{FORMEDITCOLUMNS}
</ProForm>
</Modal>
</>
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Sql.txt b/zy-asrs-framework/src/main/resources/templates/react/Sql.txt
index 4733885..2a2374b 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Sql.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Sql.txt
@@ -1,9 +1,9 @@
-- save @{SIMPLEENTITYNAME} record
-- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `type`, `sort`, `host_id`, `status`) values ( '@{SIMPLEENTITYNAME}绠＄悊', '0', '/@{ITEMNAME}/@{SIMPLEENTITYNAME}', '0' , '0', '1' , '1');
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `type`, `sort`, `host_id`, `status`) values ( '@{SIMPLEENTITYNAME}绠＄悊', '0', '/@{TABLEDESC}/@{SIMPLEENTITYNAME}', '0' , '0', '1' , '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ@{SIMPLEENTITYNAME}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞@{SIMPLEENTITYNAME}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼@{SIMPLEENTITYNAME}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎@{SIMPLEENTITYNAME}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:remove', '3', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ@{TABLEDESC}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞@{TABLEDESC}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼@{TABLEDESC}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎@{TABLEDESC}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:remove', '3', '1', '1');
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index 42d3fa7..b4466f1 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -23,6 +23,7 @@
// generator.password="Zoneyung@zy56$";
generator.table="sys_dept";
+ generator.tableName="閮ㄩ棬";
generator.packagePath="com.zy.asrs.wcs.system";
generator.build();
--
Gitblit v1.9.1