From 5bd60304ecdc639a27d9385dd066afd647474624 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Thu, 28 May 2020 09:25:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=9B=A0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=A5?= =?UTF-8?q?=E6=A0=BC=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9F=A5=E8=AF=A2=E8=A1=A8=E7=9A=84=E5=88=97=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gen/service/impl/GeneratorServiceImpl.java | 12 ++++++------ .../yixiang/gen/service/mapper/ColumnInfoMapper.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) 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); } From c194e92020f17cd3b57985fed3ff480dbe0a79ea Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Thu, 28 May 2020 09:49:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0MapperScan=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E5=90=AF=E5=8A=A8=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yshop-system/src/main/java/co/yixiang/AppRun.java | 1 + 1 file changed, 1 insertion(+) diff --git a/yshop-system/src/main/java/co/yixiang/AppRun.java b/yshop-system/src/main/java/co/yixiang/AppRun.java index 7a41f2aa..7163ce5d 100644 --- a/yshop-system/src/main/java/co/yixiang/AppRun.java +++ b/yshop-system/src/main/java/co/yixiang/AppRun.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @SpringBootApplication @EnableTransactionManagement +@MapperScan(basePackages ={ "co.yixiang.*.mapper", "co.yixiang.config"}) public class AppRun { public static void main(String[] args) { From 4918cd69ea66d353a12f0ae0cdb3b1a4855e462e Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Thu, 28 May 2020 10:28:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=B0=8F=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java index bb6d641a..4c5bdcc6 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java @@ -29,7 +29,7 @@ public interface ColumnInfoMapper extends CoreMapper { "where table_schema = (select database()) order by create_time desc") 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") + "WHERE TABLE_NAME = #{name} AND TABLE_SCHEMA = (SELECT DATABASE()) ORDER BY ORDINAL_POSITION") List> queryByTableName(@Param("name") String name); } From 73caf5700f0238fec82c61b3fd5564b88ee3621b Mon Sep 17 00:00:00 2001 From: LionCity <18026623439@163.com> Date: Thu, 28 May 2020 18:52:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/service/impl/YxStoreProductServiceImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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; } From 92f0911e3433ff562443d9d18d4de963aec95fcb Mon Sep 17 00:00:00 2001 From: LionCity <18026623439@163.com> Date: Thu, 28 May 2020 22:50:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YxStoreProductReplyServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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; }