From 4a5b00e8aac1c38907506c7dd9fda6b9731b7b7f Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Mon, 31 Aug 2020 11:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=92=AD=E9=97=B4?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-prod.yml | 6 +++--- .../rest/controller/WechatLiveController.java | 3 ++- .../src/main/resources/config/application-prod.yml | 6 +++--- .../wechat/service/YxWechatLiveService.java | 3 ++- .../service/impl/YxWechatLiveServiceImpl.java | 11 ++++++----- .../co/yixiang/modules/wechat/vo/WechatLiveVo.java | 14 ++++++++++++++ 6 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/WechatLiveVo.java diff --git a/yshop-admin/src/main/resources/config/application-prod.yml b/yshop-admin/src/main/resources/config/application-prod.yml index 0fc664df..dc297bf2 100644 --- a/yshop-admin/src/main/resources/config/application-prod.yml +++ b/yshop-admin/src/main/resources/config/application-prod.yml @@ -6,9 +6,9 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://localhost:3306/yshop3?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull - username: yshop3 - password: + url: jdbc:log4jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + username: root + password: xxcs@!2019 # 初始化配置 initial-size: 3 diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java index 9eb226ce..c523cdf9 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java @@ -15,6 +15,7 @@ import co.yixiang.modules.wechat.domain.YxWechatLive; import co.yixiang.modules.wechat.service.YxWechatLiveService; import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto; import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria; +import co.yixiang.modules.wechat.vo.WechatLiveVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -44,7 +45,7 @@ public class WechatLiveController { @GetMapping("yxWechatLive") @ApiOperation("查询所有直播间") - public ApiResult> getYxWechatLives(YxWechatLiveQueryCriteria criteria, Pageable pageable){ + public ApiResult getYxWechatLives(YxWechatLiveQueryCriteria criteria, Pageable pageable){ return ApiResult.ok(yxWechatLiveService.queryAll(criteria,pageable)); } diff --git a/yshop-app/src/main/resources/config/application-prod.yml b/yshop-app/src/main/resources/config/application-prod.yml index 5759f2a1..5c73b9d5 100644 --- a/yshop-app/src/main/resources/config/application-prod.yml +++ b/yshop-app/src/main/resources/config/application-prod.yml @@ -5,9 +5,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/yshop3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: yshop3 - password: + url: jdbc:mysql://localhost:3306/yshopb2c?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: xxcs@!2019 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java index c3c74688..eeb3e2a2 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java @@ -12,6 +12,7 @@ import co.yixiang.common.service.BaseService; import co.yixiang.modules.wechat.domain.YxWechatLive; import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto; import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria; +import co.yixiang.modules.wechat.vo.WechatLiveVo; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -40,7 +41,7 @@ public interface YxWechatLiveService extends BaseService{ * @param pageable 分页参数 * @return Map */ - Map queryAll(YxWechatLiveQueryCriteria criteria, Pageable pageable); + WechatLiveVo queryAll(YxWechatLiveQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java index 311c0375..33bebe13 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java @@ -25,6 +25,7 @@ import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto; import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria; import co.yixiang.modules.wechat.service.mapper.YxWechatLiveMapper; +import co.yixiang.modules.wechat.vo.WechatLiveVo; import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.utils.FileUtil; import co.yixiang.utils.OrderUtil; @@ -88,10 +89,10 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl queryAll(YxWechatLiveQueryCriteria criteria, Pageable pageable) { + public WechatLiveVo queryAll(YxWechatLiveQueryCriteria criteria, Pageable pageable) { getPage(pageable); PageInfo page = new PageInfo<>(queryAll(criteria)); - Map map = new LinkedHashMap<>(2); + WechatLiveVo wechatLiveVo = new WechatLiveVo(); // List liveInfos = wxMaLiveService.getLiveInfos(); List liveDtos = generator.convert(page.getList(), YxWechatLiveDto.class); //获取所有商品 @@ -104,9 +105,9 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl content; + + private Long totalElements; +}