diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/RelDao.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/RelDao.java index 1225d8f..ea85265 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/RelDao.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/dao/RelDao.java @@ -2,6 +2,7 @@ package com.ebts.generator.dao; import com.ebts.generator.entity.RelColumn; import com.ebts.generator.entity.RelTable; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -48,7 +49,7 @@ public interface RelDao { * @param tableName * @return */ - List> tableColumns(String tableName); + List> tableColumns(@Param("tableName") String tableName); /** * 通过主表id查询子表信息 diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/RelService.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/RelService.java index 002cfce..d4bdeb9 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/RelService.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/RelService.java @@ -1,6 +1,6 @@ package com.ebts.generator.service; -import com.ebts.common.utils.ServerResult; +import com.ebts.common.core.entity.Result; import com.ebts.generator.entity.RelColumn; import com.ebts.generator.entity.RelTable; @@ -19,16 +19,16 @@ public interface RelService { * * @return */ - ServerResult>> tableInfos(); + Result>> tableInfos(); /** * 获取到关联边字段信息 * * @param tableName 关联表表名 - * @param relId 关联关系id + * @param relId 关联关系id * @return */ - ServerResult> relColumns(String tableName, Long relId); + Result> relColumns(String tableName, Long relId); /** * 通过tableName获取到字段信息 @@ -36,7 +36,7 @@ public interface RelService { * @param tableName * @return */ - ServerResult>> tableColumns(String tableName); + Result>> tableColumns(String tableName); /** * 通过主表id查询子表信息 @@ -44,6 +44,6 @@ public interface RelService { * @param tableId * @return */ - ServerResult> relTableByTableId(Long tableId); + Result> relTableByTableId(Long tableId); } diff --git a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/RelServiceImpl.java b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/RelServiceImpl.java index c269c3b..7b032df 100644 --- a/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/RelServiceImpl.java +++ b/ebts/ebts-generator/src/main/java/com/ebts/generator/service/impl/RelServiceImpl.java @@ -1,5 +1,6 @@ package com.ebts.generator.service.impl; +import com.ebts.common.core.entity.Result; import com.ebts.common.exception.EbtsException; import com.ebts.common.utils.ServerResult; import com.ebts.generator.dao.RelDao; @@ -11,7 +12,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.List; import java.util.Map; @@ -24,7 +28,7 @@ import java.util.Map; public class RelServiceImpl implements RelService { private Logger logger = LoggerFactory.getLogger(RelServiceImpl.class); - @Autowired + @Resource private RelDao relDao; /** @@ -33,14 +37,10 @@ public class RelServiceImpl implements RelService { * @return */ @Override - public ServerResult>> tableInfos() { - try { - List> dataMap = relDao.tableInfos(); - return new ServerResult<>(dataMap); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - throw new EbtsException("获取数据库表信息错误",e); - } + @Transactional(propagation = Propagation.SUPPORTS) + public Result>> tableInfos() { + List> dataMap = relDao.tableInfos(); + return Result.ok(dataMap); } /** @@ -51,38 +51,26 @@ public class RelServiceImpl implements RelService { * @return */ @Override - public ServerResult> relColumns(String tableName, Long relId) { - try { - List relColumns = relDao.selectTableColumn(tableName); - for (RelColumn relColumn : relColumns) { - RelUtil.initRelColumn(relColumn, relId); - } - return new ServerResult<>(relColumns); - } catch (RuntimeException e) { - logger.error(e.getMessage()); - throw new EbtsException("获取关联边字段信息错误",e); + @Transactional(propagation = Propagation.SUPPORTS) + public Result> relColumns(String tableName, Long relId) { + List relColumns = relDao.selectTableColumn(tableName); + for (RelColumn relColumn : relColumns) { + RelUtil.initRelColumn(relColumn, relId); } + return Result.ok(relColumns); } @Override - public ServerResult>> tableColumns(String tableName) { - try { - List> columns = relDao.tableColumns(tableName); - return new ServerResult<>(columns); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - throw new EbtsException("获取字段信息错误",e); - } + @Transactional(propagation = Propagation.SUPPORTS) + public Result>> tableColumns(String tableName) { + List> columns = relDao.tableColumns(tableName); + return Result.ok(columns); } @Override - public ServerResult> relTableByTableId(Long tableId) { - try { - List relTables = relDao.relTableByTableId(tableId); - return new ServerResult<>(relTables); - }catch (RuntimeException e){ - logger.error(e.getMessage()); - throw new EbtsException("获取关联数据错误",e); - } + @Transactional(propagation = Propagation.SUPPORTS) + public Result> relTableByTableId(Long tableId) { + List relTables = relDao.relTableByTableId(tableId); + return Result.ok(relTables); } } \ No newline at end of file