diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java index b738e8d..6acfb2a 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/controller/TopQueryController.java @@ -47,7 +47,7 @@ public class TopQueryController extends BaseController { @GetMapping("/online/{id}") public Result online(@PathVariable("id") Long id) { - // ServerResult ServerResult = queryService.updateQueryInfo(uniQuery); +// ServerResult ServerResult = queryService.updateQueryInfo(uniQuery); // if (ServerResult.isStart()) { // return AjaxResult.success(ServerResult.getData()); // } else { diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java index 6ced88e..7c5e6e0 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopQueryServiceImpl.java @@ -127,7 +127,7 @@ public class TopQueryServiceImpl implements TopQueryService { } if (columns.getJSONObject(i).getInteger("isUse")==1){ // infoList.add(new UniColumnInfo(uniQuery.getId(),node.getRelTable()+"."+column.getString("columnName"),column.getString("columnComment"))); - infoList.add(new UniColumnInfo(uniQuery.getId(),column.getString("columnName"),column.getString("columnComment"))); + infoList.add(new UniColumnInfo(uniQuery.getId(),column.getString("columnName"),column.getString("columnComment"),column.getString("dictType"))); } } } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java index 59343a0..5bc2a65 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/TopSearchTableServiceImpl.java @@ -139,13 +139,6 @@ public class TopSearchTableServiceImpl implements TopSearchTableService { topSearchTableDao.updateTopSearchTable(topSearchTable); return Result.ok(); } -// void deleteSearchTableRoleById(Long id){ -// try { -// -// }catch (RuntimeException e){ -// log.error("无数据"); -// } -// } @Override diff --git a/ebts/ebts-generator/src/main/resources/mapper/generator/UniColumnInfoMapper.xml b/ebts/ebts-generator/src/main/resources/mapper/generator/UniColumnInfoMapper.xml index 7cf2ca6..6fe1cae 100644 --- a/ebts/ebts-generator/src/main/resources/mapper/generator/UniColumnInfoMapper.xml +++ b/ebts/ebts-generator/src/main/resources/mapper/generator/UniColumnInfoMapper.xml @@ -5,9 +5,9 @@ - insert into gen_uni_column_info (query_id,prop,label) values + insert into gen_uni_column_info (query_id,prop,label,dict_type) values - (#{item.queryId},#{item.prop},#{item.label}) + (#{item.queryId},#{item.prop},#{item.label},#{item.dictType})