优化自动化代码

admin

2022-04-07 211840b64fa1132d76d6dff6c779e9ba2c0c450f

 src/main/java/org/yeshi/utils/generater/vo/admin/page/ListInfoVO.java

@@ -8,6 +8,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;
@@ -53,11 +54,11 @@
            ListInfoVO vo = new ListInfoVO();
            vo.setListApi(generaterInfo.getControllerData().getMapping() + "/list");
            if (generaterInfo.getAddFormRows() != null && generaterInfo.getAddFormRows().size() > 0) {
                vo.setAddPagePath(generaterInfo.getEntity().getSimpleName().toLowerCase() + "_add.html");
                vo.setAddPagePath(ColumnUtil.getColumnFromProperty(generaterInfo.getEntity().getSimpleName()) + "_add.html");
            }

            if (generaterInfo.getUpdateFormRows() != null && generaterInfo.getUpdateFormRows().size() > 0) {
                vo.setUpdatePagePath(generaterInfo.getEntity().getSimpleName().toLowerCase() + "_update.html");
                vo.setUpdatePagePath(ColumnUtil.getColumnFromProperty(generaterInfo.getEntity().getSimpleName()) + "_update.html");
            }
            vo.setSearchFormRows(generaterInfo.getSearchFormRows());
            vo.setShowFileds(generaterInfo.getShowDataList());
@@ -99,10 +100,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);