diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java index 17f16894..d27f2bc0 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java @@ -80,12 +80,12 @@ public class GeneratorServiceImpl extends BaseServiceImpl { @Select("") List selectTables(); - @Select("select column_name, is_nullable, data_type, column_comment, column_key, extra from information_schema.columns " + - "where table_name = #{name} and table_schema = (select database()) order by ordinal_position") + @Select("SELECT COLUMN_NAME, IS_NULLABLE, DATA_TYPE, COLUMN_COMMENT, COLUMN_KEY, EXTRA FROM INFORMATION_SCHEMA.COLUMNS " + + "WHERE TABLE_NAME = #{name} AND TABLE_SCHEMA = (SELECT DATABASE()) ORDER BY ORDINAL_POSITION") List> queryByTableName(@Param("name") String name); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index a1dea528..e1b7084b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -69,14 +69,11 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl queryAll(YxStoreProductReplyQueryCriteria criteria){ List storeProductReplyList = baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreProductReply.class, criteria)); - List storeProductReplys = storeProductReplyList.stream().map(i ->{ - YxStoreProductReply yxStoreProductReply = new YxStoreProductReply(); - BeanUtils.copyProperties(i,yxStoreProductReply); + storeProductReplyList.forEach(yxStoreProductReply->{ yxStoreProductReply.setUser(yxUserService.getById(yxStoreProductReply.getUid()));; yxStoreProductReply.setStoreProduct(yxStoreProductService.getById(yxStoreProductReply.getProductId())); - return yxStoreProductReply; - }).collect(Collectors.toList()); - return storeProductReplys; + }); + return storeProductReplyList; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index 58d7d0fa..d46ef5a4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -88,13 +88,10 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl queryAll(YxStoreProductQueryCriteria criteria){ List yxStoreProductList = baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreProduct.class, criteria)); - List storeProductList = yxStoreProductList.stream().map(i ->{ - YxStoreProduct yxStoreProduct = new YxStoreProduct(); - BeanUtils.copyProperties(i,yxStoreProduct); - yxStoreProduct.setStoreCategory(yxStoreCategoryService.getById(i.getCateId())); - return yxStoreProduct; - }).collect(Collectors.toList()); - return storeProductList; + yxStoreProductList.forEach(yxStoreProduct ->{ + yxStoreProduct.setStoreCategory(yxStoreCategoryService.getById(yxStoreProduct.getCateId())); + }); + return yxStoreProductList; } diff --git a/yshop-system/src/main/java/co/yixiang/AppRun.java b/yshop-system/src/main/java/co/yixiang/AppRun.java index aa1bd3c8..7163ce5d 100644 --- a/yshop-system/src/main/java/co/yixiang/AppRun.java +++ b/yshop-system/src/main/java/co/yixiang/AppRun.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @SpringBootApplication @EnableTransactionManagement -@MapperScan({"co.yixiang.*.mapper"}) +@MapperScan(basePackages ={ "co.yixiang.*.mapper", "co.yixiang.config"}) public class AppRun { public static void main(String[] args) {