From bdb17806db5ad7f4f11b8a58b2931dea3f4081cc Mon Sep 17 00:00:00 2001 From: Burce Date: Sun, 29 Sep 2019 17:15:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invest/InvestOperateRecordController.java | 20 +++++++-- .../invest/InvestRemindController.java | 20 +++++++-- .../domain/po/InvestRemindEntity.java | 12 ------ .../invest/InvestOperateRecordService.java | 5 +-- .../service/invest/InvestRemindService.java | 6 +-- .../invest/impl/InvestDemandServiceImpl.java | 10 ++--- .../impl/InvestFollowRecordServiceImpl.java | 37 ++++++++++++----- .../impl/InvestOperateRecordServiceImpl.java | 31 +++++++++++--- .../invest/impl/InvestRemindServiceImpl.java | 41 +++++++++++++++++-- .../invest/impl/InvestTaskServiceImpl.java | 6 --- 10 files changed, 128 insertions(+), 60 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index ddcb17f87..959348c57 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -3,9 +3,14 @@ package com.iformall.controller.invest; import java.util.Arrays; import java.util.List; +import com.iformall.common.ErrorCode; +import com.iformall.common.InvestResultData; import com.iformall.common.ResultData; import com.iformall.domain.po.InvestOperateRecordEntity; +import com.iformall.domain.vo.invest.InvestDemandVo; import com.iformall.domain.vo.invest.InvestPageQuery; +import com.iformall.domain.vo.invest.InvestPageResult; +import com.iformall.exception.MallinkException; import com.iformall.service.invest.InvestOperateRecordService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -35,10 +40,17 @@ public class InvestOperateRecordController { */ @ApiOperation("分页列表接口") @GetMapping("/list") - public ResultData list(InvestPageQuery params){ - List page = investOperateRecordService.queryPage(params); - - return new ResultData(page); + public InvestResultData> list(InvestPageQuery params) { + try { + InvestPageResult page = investOperateRecordService.queryPage(params); + return new InvestResultData(page); + } catch (MallinkException e) { + log.error("list error", e); + return new InvestResultData(e.getErrorCode(), e.getMessage()); + } catch (Exception e) { + log.error("list error", e); + return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index ee2198e5d..763d2ea0d 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -3,9 +3,14 @@ package com.iformall.controller.invest; import java.util.Arrays; import java.util.List; +import com.iformall.common.ErrorCode; +import com.iformall.common.InvestResultData; import com.iformall.common.ResultData; +import com.iformall.domain.po.InvestOperateRecordEntity; import com.iformall.domain.po.InvestRemindEntity; import com.iformall.domain.vo.invest.InvestPageQuery; +import com.iformall.domain.vo.invest.InvestPageResult; +import com.iformall.exception.MallinkException; import com.iformall.service.invest.InvestRemindService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -36,10 +41,17 @@ public class InvestRemindController { */ @ApiOperation("分页列表接口") @GetMapping("/list") - public ResultData list(InvestPageQuery params){ - List page = investRemindService.queryPage(params); - - return new ResultData(page); + public InvestResultData> list(InvestPageQuery params) { + try { + InvestPageResult page = investRemindService.queryPage(params); + return new InvestResultData(page); + } catch (MallinkException e) { + log.error("list error", e); + return new InvestResultData(e.getErrorCode(), e.getMessage()); + } catch (Exception e) { + log.error("list error", e); + return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java index 67e285793..3c3c2a42d 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java @@ -33,16 +33,4 @@ public class InvestRemindEntity extends InvestBaseEntity { */ @io.swagger.annotations.ApiModelProperty(value = "提醒时间", name = "minute") private Long minute; - /** - * 开始时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "beginDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date beginDate; - /** - * 结束时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endDate", example = "2018-10-01 12:18:48") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endDate; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java index 19e3efa94..0f8c0c7c8 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java @@ -3,8 +3,7 @@ package com.iformall.service.invest; import com.baomidou.mybatisplus.extension.service.IService; import com.iformall.domain.po.InvestOperateRecordEntity; import com.iformall.domain.vo.invest.InvestPageQuery; - -import java.util.List; +import com.iformall.domain.vo.invest.InvestPageResult; /** * 操作记录 @@ -15,6 +14,6 @@ import java.util.List; */ public interface InvestOperateRecordService extends IService { - List queryPage(InvestPageQuery params); + InvestPageResult queryPage(InvestPageQuery params); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java index 084348246..1dd7476f7 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java @@ -3,9 +3,7 @@ package com.iformall.service.invest; import com.baomidou.mybatisplus.extension.service.IService; import com.iformall.domain.po.InvestRemindEntity; import com.iformall.domain.vo.invest.InvestPageQuery; - -import java.util.List; -import java.util.Map; +import com.iformall.domain.vo.invest.InvestPageResult; /** * 招商提醒 @@ -16,6 +14,6 @@ import java.util.Map; */ public interface InvestRemindService extends IService { - List queryPage(InvestPageQuery params); + InvestPageResult queryPage(InvestPageQuery params); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java index 19e3b7330..344094d18 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java @@ -85,18 +85,16 @@ public class InvestDemandServiceImpl extends ServiceImpl queryPage(InvestPageQuery params) { InvestHelper.checkAllNotNull(params); Page page = InvestHelper.buildQueryPage(params); - InvestPageResult investPage = new InvestPageResult<>(); InvestFollowRecordEntity queryTask = params.getQueryData(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(queryTask); - IPage records = this.page(page,queryWrapper) ; + IPage records = this.page(page, queryWrapper); + + InvestPageResult investPage = new InvestPageResult<>(); + if (CollectionUtils.isEmpty(records.getRecords())) { + return investPage; + } BeanUtils.copyProperties(records, investPage); return investPage; } @@ -55,25 +60,31 @@ public class InvestFollowRecordServiceImpl extends ServiceImpl updateWrapper) { - checkBeforeSaveOrUpdate(entity); - return super.update(entity, updateWrapper); + //checkBeforeSaveOrUpdate(entity); + //return super.update(entity, updateWrapper); + notSupport(); + return false; } - @TableLog + @Deprecated @Override public boolean saveOrUpdate(InvestFollowRecordEntity entity) { - checkBeforeSaveOrUpdate(entity); - return super.saveOrUpdate(entity); + //checkBeforeSaveOrUpdate(entity); + //return super.saveOrUpdate(entity); + notSupport(); + return false; } - @TableLog + @Deprecated @Override public boolean updateById(InvestFollowRecordEntity entity) { - checkBeforeSaveOrUpdate(entity); - return super.updateById(entity); + //checkBeforeSaveOrUpdate(entity); + //return super.updateById(entity); + notSupport(); + return false; } private void checkBeforeSaveOrUpdate(InvestFollowRecordEntity entity) { @@ -90,4 +101,8 @@ public class InvestFollowRecordServiceImpl extends ServiceImpl implements InvestOperateRecordService { @Override - public List queryPage(InvestPageQuery params) { - return this.list() ; + public InvestPageResult queryPage(InvestPageQuery params) { + InvestHelper.checkAllNotNull(params); + //1、分页信息 + Page queryPage = InvestHelper.buildQueryPage(params); + //2、查询数据 + InvestOperateRecordEntity queryParams = params.getQueryData(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(queryParams); + IPage taskPage = this.page(queryPage, queryWrapper); + + InvestPageResult investPage = new InvestPageResult<>(); + if (CollectionUtils.isEmpty(taskPage.getRecords())) { + return investPage; + } + BeanUtils.copyProperties(taskPage, investPage); + return investPage; } @TableLog @@ -26,19 +45,19 @@ public class InvestOperateRecordServiceImpl extends ServiceImpl updateWrapper) { return super.update(entity, updateWrapper); } - @TableLog + @Deprecated @Override public boolean saveOrUpdate(InvestOperateRecordEntity entity) { return super.saveOrUpdate(entity); } - @TableLog + @Deprecated @Override public boolean updateById(InvestOperateRecordEntity entity) { return super.updateById(entity); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java index b84df6fa0..d870c3ad6 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java @@ -1,46 +1,79 @@ package com.iformall.service.invest.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iformall.common.TableLog; import com.iformall.domain.po.InvestRemindEntity; import com.iformall.domain.vo.invest.InvestPageQuery; +import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.mapper.InvestRemindDao; +import com.iformall.service.MallUserInfoService; +import com.iformall.service.invest.InvestHelper; import com.iformall.service.invest.InvestRemindService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class InvestRemindServiceImpl extends ServiceImpl implements InvestRemindService { + @Autowired + private MallUserInfoService userInfoService; + @Override - public List queryPage(InvestPageQuery params) { - return this.list() ; + public InvestPageResult queryPage(InvestPageQuery params) { + InvestHelper.checkAllNotNull(params); + //1、分页信息 + Page queryPage = InvestHelper.buildQueryPage(params); + //2、查询数据 + InvestRemindEntity queryParams = params.getQueryData(); + InvestHelper.checkUserExit(userInfoService, queryParams.getOwner()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(queryParams); + IPage taskPage = this.page(queryPage, queryWrapper); + + InvestPageResult investPage = new InvestPageResult<>(); + if (CollectionUtils.isEmpty(taskPage.getRecords())) { + return investPage; + } + BeanUtils.copyProperties(taskPage, investPage); + return investPage; } @TableLog @Override public boolean save(InvestRemindEntity entity) { + checkBeforeSaveOrUpdate(entity); return super.save(entity); } @TableLog @Override public boolean update(InvestRemindEntity entity, Wrapper updateWrapper) { + checkBeforeSaveOrUpdate(entity); return super.update(entity, updateWrapper); } @TableLog @Override public boolean saveOrUpdate(InvestRemindEntity entity) { + checkBeforeSaveOrUpdate(entity); return super.saveOrUpdate(entity); } @TableLog @Override public boolean updateById(InvestRemindEntity entity) { + checkBeforeSaveOrUpdate(entity); return super.updateById(entity); } + + private void checkBeforeSaveOrUpdate(InvestRemindEntity input) { + InvestHelper.checkAllNotNull(input); + InvestHelper.checkUserExit(userInfoService, input.getOwner()); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java index bc68cf07e..7f3bf786b 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java @@ -2,9 +2,7 @@ package com.iformall.service.invest.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.LambdaUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iformall.common.TableLog; import com.iformall.domain.po.*; @@ -80,14 +78,12 @@ public class InvestTaskServiceImpl extends ServiceImpl updateWrapper) { - // 1 check shop 状态 checkBeforeSaveOrUpdate(entity); return super.update(entity, updateWrapper); } @@ -95,7 +91,6 @@ public class InvestTaskServiceImpl extends ServiceImpl