From 47e3087067abd35e6337c011f96d2338c0bb1aae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2024 13:39:31 +0800
Subject: [PATCH] 优化自动化代码
---
src/main/java/org/yeshi/utils/generater/vo/admin/page/ListInfoVO.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/yeshi/utils/generater/vo/admin/page/ListInfoVO.java b/src/main/java/org/yeshi/utils/generater/vo/admin/page/ListInfoVO.java
index 26febb4..0f16264 100644
--- a/src/main/java/org/yeshi/utils/generater/vo/admin/page/ListInfoVO.java
+++ b/src/main/java/org/yeshi/utils/generater/vo/admin/page/ListInfoVO.java
@@ -1,6 +1,7 @@
package org.yeshi.utils.generater.vo.admin.page;
import org.yeshi.utils.StringUtil;
+import org.yeshi.utils.generater.GeneraterManager;
import org.yeshi.utils.generater.annotation.admin.form.Select;
import org.yeshi.utils.generater.annotation.admin.form.Text;
import org.yeshi.utils.generater.annotation.admin.form.TextArea;
@@ -8,6 +9,7 @@
import org.yeshi.utils.generater.entity.admin.AdminGeneraterInfo;
import org.yeshi.utils.generater.entity.admin.FormRowData;
import org.yeshi.utils.generater.entity.admin.FormVerifyType;
+import org.yeshi.utils.generater.mybatis.ColumnUtil;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,6 +32,10 @@
private List<FormInputRegexVerifyVO> regexVerifyList;
//鍒楄〃鎺ュ彛
private String listApi;
+
+ //鍒犻櫎鎺ュ彛
+ private String deleteApi;
+
//娣诲姞椤佃矾寰�
private String addPagePath;
//鏇存柊椤佃矾寰�
@@ -47,12 +53,22 @@
public ListInfoVO build() {
ListInfoVO vo = new ListInfoVO();
- vo.setListApi(generaterInfo.getControllerData().mapping() + "/list");
- vo.setAddPagePath("add.html");
- vo.setUpdatePagePath("update.html");
+ vo.setListApi(generaterInfo.getControllerData().getMapping() + "/list");
+ if (generaterInfo.getAddFormRows() != null && generaterInfo.getAddFormRows().size() > 0) {
+ vo.setAddPagePath(GeneraterManager.getHtmlNameFromEntityName(generaterInfo.getEntity().getSimpleName()) + "_add.html");
+ }
+
+ if (generaterInfo.getUpdateFormRows() != null && generaterInfo.getUpdateFormRows().size() > 0) {
+ vo.setUpdatePagePath(GeneraterManager.getHtmlNameFromEntityName(generaterInfo.getEntity().getSimpleName()) + "_update.html");
+ }
vo.setSearchFormRows(generaterInfo.getSearchFormRows());
vo.setShowFileds(generaterInfo.getShowDataList());
- vo.setTitle("淇敼" + generaterInfo.getControllerData().title());
+ vo.setTitle(generaterInfo.getTitle());
+
+ if (generaterInfo.isDelete()) {
+ vo.setDeleteApi(generaterInfo.getControllerData().getMapping() + "/delete");
+ }
+
//閬嶅巻闇�瑕佹鍒欒〃杈惧紡鐨凾ext鎴栬�匱extArea
List<FormInputRegexVerifyVO> verifyVOList = new ArrayList<>();
for (FormRowData row : vo.getSearchFormRows()) {
@@ -85,10 +101,12 @@
}
FormHttpRequestInfoVO requestInfoVO = new FormHttpRequestInfoVO();
Map<String, String> apiParams = new HashMap<>();
- if (((List) row.getParams().get("apiParams")).size() > 0) {
- List<KeyValue> apiParamsList = (List<KeyValue>) row.getParams().get("apiParams");
- for (KeyValue kv : apiParamsList) {
- apiParams.put(kv.getKey(), kv.getValue());
+ if (row.getParams().get("apiParams") != null) {
+ if (((List) row.getParams().get("apiParams")).size() > 0) {
+ List<KeyValue> apiParamsList = (List<KeyValue>) row.getParams().get("apiParams");
+ for (KeyValue kv : apiParamsList) {
+ apiParams.put(kv.getKey(), kv.getValue());
+ }
}
}
requestInfoVO.setParams(apiParams);
@@ -118,6 +136,9 @@
if (layVerify.endsWith("|"))
layVerify = layVerify.substring(0, layVerify.length() - 1);
//閲嶆柊璧嬪�硷紝琛ㄥ崟涓洿鎺ュ彇鍊�
+ if (row.getParams() == null) {
+ row.setParams(new HashMap<>());
+ }
row.getParams().put("verifyValue", layVerify);
}
@@ -190,4 +211,12 @@
public void setShowFileds(List<Map<String, Object>> showFileds) {
this.showFileds = showFileds;
}
+
+ public String getDeleteApi() {
+ return deleteApi;
+ }
+
+ public void setDeleteApi(String deleteApi) {
+ this.deleteApi = deleteApi;
+ }
}
--
Gitblit v1.8.0