From 11d5e2cdbbaba1c6b61e57411f623de025aa5d2d Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 17 六月 2022 10:35:43 +0800 Subject: [PATCH] update 优化 代码生成 业务接口 增加事务回滚 --- ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 83 ++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 46 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index 80b1c96..2a99a2e 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -3,8 +3,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Dict; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -49,6 +51,7 @@ * * @author Lion Li */ +@DS("#header.datasource") @Slf4j @RequiredArgsConstructor @Service @@ -56,6 +59,19 @@ private final GenTableMapper baseMapper; private final GenTableColumnMapper genTableColumnMapper; + + /** + * 鏌ヨ涓氬姟瀛楁鍒楄〃 + * + * @param tableId 涓氬姟瀛楁缂栧彿 + * @return 涓氬姟瀛楁闆嗗悎 + */ + @Override + public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) { + return genTableColumnMapper.selectList(new LambdaQueryWrapper<GenTableColumn>() + .eq(GenTableColumn::getTableId, tableId) + .orderByAsc(GenTableColumn::getSort)); + } /** * 鏌ヨ涓氬姟淇℃伅 @@ -76,17 +92,6 @@ return TableDataInfo.build(page); } - /** - * 鏌ヨ涓氬姟鍒楄〃 - * - * @param genTable 涓氬姟淇℃伅 - * @return 涓氬姟闆嗗悎 - */ - @Override - public List<GenTable> selectGenTableList(GenTable genTable) { - return baseMapper.selectList(this.buildGenTableQueryWrapper(genTable)); - } - private QueryWrapper<GenTable> buildGenTableQueryWrapper(GenTable genTable) { Map<String, Object> params = genTable.getParams(); QueryWrapper<GenTable> wrapper = Wrappers.query(); @@ -100,34 +105,8 @@ @Override public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery) { - Page<GenTable> page = baseMapper.selectPageDbTableList(pageQuery.build(), this.buildDbTableQueryWrapper(genTable)); + Page<GenTable> page = baseMapper.selectPageDbTableList(pageQuery.build(), genTable); return TableDataInfo.build(page); - } - - /** - * 鏌ヨ鎹簱鍒楄〃 - * - * @param genTable 涓氬姟淇℃伅 - * @return 鏁版嵁搴撹〃闆嗗悎 - */ - @Override - public List<GenTable> selectDbTableList(GenTable genTable) { - return baseMapper.selectDbTableList(this.buildDbTableQueryWrapper(genTable)); - } - - private Wrapper<Object> buildDbTableQueryWrapper(GenTable genTable) { - Map<String, Object> params = genTable.getParams(); - QueryWrapper<Object> wrapper = Wrappers.query(); - wrapper.apply("table_schema = (select database())") - .notLike("table_name", "xxl_job_%") - .notLike("table_name", "gen_%") - .notInSql("table_name", "select table_name from gen_table") - .like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName())) - .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment())) - .between(params.get("beginTime") != null && params.get("endTime") != null, - "create_time", params.get("beginTime"), params.get("endTime")) - .orderByDesc("create_time"); - return wrapper; } /** @@ -157,8 +136,8 @@ * @param genTable 涓氬姟淇℃伅 * @return 缁撴灉 */ - @Override @Transactional(rollbackFor = Exception.class) + @Override public void updateGenTable(GenTable genTable) { String options = JsonUtils.toJsonString(genTable.getParams()); genTable.setOptions(options); @@ -176,8 +155,8 @@ * @param tableIds 闇�瑕佸垹闄ょ殑鏁版嵁ID * @return 缁撴灉 */ - @Override @Transactional(rollbackFor = Exception.class) + @Override public void deleteGenTableByIds(Long[] tableIds) { List<Long> ids = Arrays.asList(tableIds); baseMapper.deleteBatchIds(ids); @@ -189,8 +168,8 @@ * * @param tableList 瀵煎叆琛ㄥ垪琛� */ - @Override @Transactional(rollbackFor = Exception.class) + @Override public void importGenTable(List<GenTable> tableList) { String operName = LoginHelper.getUsername(); try { @@ -227,6 +206,12 @@ Map<String, String> dataMap = new LinkedHashMap<>(); // 鏌ヨ琛ㄤ俊鎭� GenTable table = baseMapper.selectGenTableById(tableId); + Snowflake snowflake = IdUtil.getSnowflake(); + List<Long> menuIds = new ArrayList<>(); + for (int i = 0; i < 6; i++) { + menuIds.add(snowflake.nextId()); + } + table.setMenuIds(menuIds); // 璁剧疆涓诲瓙琛ㄤ俊鎭� setSubTable(table); // 璁剧疆涓婚敭鍒椾俊鎭� @@ -303,8 +288,8 @@ * * @param tableName 琛ㄥ悕绉� */ - @Override @Transactional(rollbackFor = Exception.class) + @Override public void synchDb(String tableName) { GenTable table = baseMapper.selectGenTableByName(tableName); List<GenTableColumn> tableColumns = table.getColumns(); @@ -328,9 +313,8 @@ column.setQueryType(prevColumn.getQueryType()); } if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() - && (column.isInsert() || column.isEdit()) - && ((column.isUsableColumn()) || (!column.isSuperColumn()))) - { + && (column.isInsert() || column.isEdit()) + && ((column.isUsableColumn()) || (!column.isSuperColumn()))) { // 濡傛灉鏄�(鏂板/淇敼&闈炰富閿�/闈炲拷鐣ュ強鐖跺睘鎬�)锛岀户缁繚鐣欏繀濉�/鏄剧ず绫诲瀷閫夐」 column.setIsRequired(prevColumn.getIsRequired()); column.setHtmlType(prevColumn.getHtmlType()); @@ -374,6 +358,12 @@ private void generatorCode(String tableName, ZipOutputStream zip) { // 鏌ヨ琛ㄤ俊鎭� GenTable table = baseMapper.selectGenTableByName(tableName); + Snowflake snowflake = IdUtil.getSnowflake(); + List<Long> menuIds = new ArrayList<>(); + for (int i = 0; i < 6; i++) { + menuIds.add(snowflake.nextId()); + } + table.setMenuIds(menuIds); // 璁剧疆涓诲瓙琛ㄤ俊鎭� setSubTable(table); // 璁剧疆涓婚敭鍒椾俊鎭� @@ -506,3 +496,4 @@ return genPath + File.separator + VelocityUtils.getFileName(template, table); } } + -- Gitblit v1.9.3