From 65ac9ef57209268a123eb9de8685422f24ea3a88 Mon Sep 17 00:00:00 2001 From: liyd <1419499670@qq.com> Date: Wed, 7 Dec 2022 11:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/service/GeneratorService.java | 30 ------------------- .../service/impl/GeneratorServiceImpl.java | 5 ++-- .../common/generator/wql/Generator.wql | 2 +- .../service/dto/DictDetailQueryCriteria.java | 2 +- .../service/impl/DictDetailServiceImpl.java | 1 + .../modules/system/service/wql/SYS_DICT.wql | 4 +++ 6 files changed, 9 insertions(+), 35 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/GeneratorService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/GeneratorService.java index e1d8bae..b6e6d04 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/GeneratorService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/GeneratorService.java @@ -41,42 +41,12 @@ public interface GeneratorService { @Async void sync(JSONObject columnInfos, JSONArray columnInfoList); - /** - * 保持数据 - * @param columnInfos / - */ -// void save(List columnInfos); - /** * 获取所有table * @return / */ Object getTables(); - /** - * 代码生成 - * @param genConfig 配置信息 - * @param columns 字段信息 - */ -// void generator(GenConfig genConfig, List columns); - - /** - * 预览 - * @param genConfig 配置信息 - * @param columns 字段信息 - * @return / - */ -// ResponseEntity preview(GenConfig genConfig, List columns); - - /** - * 打包下载 - * @param genConfig 配置信息 - * @param columns 字段信息 - * @param request / - * @param response / - */ -// void download(GenConfig genConfig, List columns, HttpServletRequest request, HttpServletResponse response); - /** * 查询数据库的表字段数据数据 * @param table / diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/impl/GeneratorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/impl/GeneratorServiceImpl.java index 7989ac5..5595bec 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/impl/GeneratorServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/service/impl/GeneratorServiceImpl.java @@ -41,8 +41,6 @@ import java.io.IOException; public class GeneratorServiceImpl implements GeneratorService { private static final Logger log = LoggerFactory.getLogger(GeneratorServiceImpl.class); - @PersistenceContext - private EntityManager em; /** * 查询数据库元数据 * @@ -54,7 +52,8 @@ public class GeneratorServiceImpl implements GeneratorService { public Object getTables(String name, Pageable pageable) { JSONObject map = new JSONObject(); map.put("flag", "1"); - map.put("table_name", name); + if (ObjectUtil.isNotEmpty(name)) + map.put("table_name", name); JSONObject json = WQL.getWO("Generator").addParamMap(map).pageQuery(WqlUtil.getHttpContext(pageable), "create_time desc"); return json; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/wql/Generator.wql b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/wql/Generator.wql index 797916c..99383ea 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/wql/Generator.wql +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/generator/wql/Generator.wql @@ -51,7 +51,7 @@ WHERE table_schema = (SELECT DATABASE()) OPTION 输入.table_name <> "" - table_name like "%" 输入.table_name "%" + table_name like "%" 输入.table_name "%" ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java index e93f98c..f261b74 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/dto/DictDetailQueryCriteria.java @@ -27,6 +27,6 @@ public class DictDetailQueryCriteria { private String code; - private String name; + private String dictName; private String dict_id; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java index 6b635e8..98ff3d2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java @@ -54,6 +54,7 @@ public class DictDetailServiceImpl implements DictDetailService { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("code", criteria.getCode()); + map.put("dictName", criteria.getDictName()); JSONObject json = WQL.getWO("SYS_DICT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(pageable), "dict_sort asc"); return json; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/wql/SYS_DICT.wql b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/wql/SYS_DICT.wql index b58fb01..0f4abca 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/wql/SYS_DICT.wql +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/wql/SYS_DICT.wql @@ -16,6 +16,7 @@ 输入.flag TYPEAS s_string 输入.blurry TYPEAS s_string 输入.code TYPEAS s_string + 输入.dictName TYPEAS s_string [临时表] @@ -70,6 +71,9 @@ OPTION 输入.code <> "" dict.code = 输入.code ENDOPTION + OPTION 输入.dictName <> "" + dict.code = 输入.dictName + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF