From d98f62d25e8d13714cfec98bd8243e2ed271396c Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 17 May 2023 11:27:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E6=9D=82=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BF=BB=E9=A1=B5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/qs/serve/common/model/dto/R.java | 12 ++++ .../qs/serve/common/model/dto/RowParam.java | 25 +++++++ .../controller/BmsChannelPointController.java | 9 ++- .../my/BmsChannelPointMyController.java | 13 ++-- .../bms/mapper/BmsChannelPointMapper.java | 17 ++++- .../bms/service/BmsChannelPointService.java | 5 +- .../impl/BmsChannelPointServiceImpl.java | 9 ++- .../his/service/HisUserSupplierService.java | 5 +- .../impl/HisUserSupplierServiceImpl.java | 18 ++++- .../impl/VtbVerificationServiceImpl.java | 1 + .../mapper/bms/BmsChannelPointMapper.xml | 68 ++++++++++++++++--- 11 files changed, 159 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/qs/serve/common/model/dto/RowParam.java diff --git a/src/main/java/com/qs/serve/common/model/dto/R.java b/src/main/java/com/qs/serve/common/model/dto/R.java index ccbc9a04..14f3a14a 100644 --- a/src/main/java/com/qs/serve/common/model/dto/R.java +++ b/src/main/java/com/qs/serve/common/model/dto/R.java @@ -189,4 +189,16 @@ public class R implements Serializable { return R.ok(pageVo); } + public static R> byPageList(Long total,List data){ + Integer pageNum = PageUtil.getPageNum(); + Integer pageSize = PageUtil.getPageSize(); + PageVo pageVo = new PageVo<>(); + pageVo.setPageSize(pageSize); + pageVo.setPageNum(pageNum); + pageVo.setTotal(total); + pageVo.setList(data); + pageVo.setTotalPage(total%pageSize==0?total/pageSize:total/pageSize+1); + return R.ok(pageVo); + } + } diff --git a/src/main/java/com/qs/serve/common/model/dto/RowParam.java b/src/main/java/com/qs/serve/common/model/dto/RowParam.java new file mode 100644 index 00000000..b0f40732 --- /dev/null +++ b/src/main/java/com/qs/serve/common/model/dto/RowParam.java @@ -0,0 +1,25 @@ +package com.qs.serve.common.model.dto; + +import com.qs.serve.common.util.PageUtil; +import lombok.Data; + +/** + * @author YenHex + * @since 2023/5/17 + */ +@Data +public class RowParam { + + private Integer startIndex; + private Integer size; + + public RowParam(Integer startIndex, Integer size) { + + } + + public RowParam(boolean pageable) { + this.size = PageUtil.getPageSize(); + this.startIndex = (PageUtil.getPageNum()-1)*size; + } + +} diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java index 3c8b6cf4..242fd3b5 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java @@ -1,9 +1,11 @@ package com.qs.serve.modules.bms.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.dto.RowParam; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.AuthContextUtils; @@ -69,8 +71,9 @@ public class BmsChannelPointController { @GetMapping("/page4Visit") public R> getPage4Visit(BmsPointVisitSo param){ String sysUserId = AuthContextUtils.getSysUserId(); - PageUtil.startPage(); - List list = channelPointMapper.selectUserPointList4Visit(param, Arrays.asList(sysUserId)); + List userIds = Arrays.asList(sysUserId); + List list = channelPointMapper.selectUserPointList4Visit(param, userIds,new RowParam(true)); + Long count = channelPointMapper.selectCountUserPointList4Visit(param,userIds); for (BmsUserPoint4VisitVo visitVo : list) { LambdaQueryWrapper visitInfoLqw = new LambdaQueryWrapper<>(); visitInfoLqw.eq(BazVisitInfo::getTargetType, BazTargetTypeConsts.POINT); @@ -79,7 +82,7 @@ public class BmsChannelPointController { BazVisitInfo visitInfo = bazVisitInfoService.getOne(visitInfoLqw,false); visitVo.setVisitInfo(visitInfo); } - return R.byPageHelperList(list); + return R.byPageList(count,list); } /** diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java index 902021d6..9153396b 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.bms.controller.my; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; @@ -66,7 +67,6 @@ public class BmsChannelPointMyController { */ @GetMapping("/page") public R> getPage(BmsChannelPoint param){ - PageUtil.startPage(); /*param.setUserId(AuthContextUtils.getSysUserId()); param.setTenantId(AuthContextUtils.getTenant()); List list = bmsChannelPointService.selectChannelPointMyList(param); @@ -85,7 +85,8 @@ public class BmsChannelPointMyController { } }*/ List list = bmsChannelPointService.selectChannelPointMyList(param, Arrays.asList(AuthContextUtils.getSysUserId())); - return R.byPageHelperList(list); + Long count = bmsChannelPointService.selectCountChannelPointMyList(param, Arrays.asList(AuthContextUtils.getSysUserId())); + return R.byPageList(count,list); } @@ -114,8 +115,10 @@ public class BmsChannelPointMyController { // param.setTenantId(AuthContextUtils.getTenant()); // List list = bmsChannelPointService.selectChannelPointMyUnderList(param); //新版本加载方式 - List list = bmsChannelPointService.selectChannelPointMyList(param, userIds); - for (BmsChannelPoint channelPoint : list) { + List pageList = bmsChannelPointService.selectChannelPointMyList(param, userIds); + Long count = bmsChannelPointService.selectCountChannelPointMyList(param, userIds); + + for (BmsChannelPoint channelPoint : pageList) { if(StringUtils.hasText(channelPoint.getBizRegionPath())){ String[] bizRegions = channelPoint.getBizRegionPath().split("_"); if(bizRegions.length>0){ @@ -129,7 +132,7 @@ public class BmsChannelPointMyController { } } } - return R.byPageHelperList(list); + return R.byPageList(count,pageList); } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java index ab572e49..08926991 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java @@ -4,6 +4,8 @@ package com.qs.serve.modules.bms.mapper; import java.util.List; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.RowParam; import com.qs.serve.modules.bms.entity.BmsChannelPoint; import com.qs.serve.modules.bms.entity.so.BmsPointVisitSo; import com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo; @@ -31,7 +33,9 @@ public interface BmsChannelPointMapper extends BaseMapper { List selectChannelPointList(@Param("query") BmsChannelPoint channelPoint); - List selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List userIds); + List selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List userIds, @Param("rowInfo") RowParam rowParam); + + Long selectCountPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List userIds); /** * 直属管理人 @@ -39,7 +43,16 @@ public interface BmsChannelPointMapper extends BaseMapper { * @return */ @InterceptorIgnore(tenantLine = "1") - List selectUserPointList4Visit(@Param("query") BmsPointVisitSo param,@Param("userIds")List userIds); + List selectUserPointList4Visit(@Param("query") BmsPointVisitSo param, @Param("userIds")List userIds, @Param("rowInfo") RowParam rowParam); + + /** + * 直属管理人 + * @param param + * @return + */ + @InterceptorIgnore(tenantLine = "1") + Long selectCountUserPointList4Visit(@Param("query") BmsPointVisitSo param,@Param("userIds")List userIds); + /** * 直属管理人 diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java index 763a41d1..853cac98 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.bms.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.qs.serve.modules.bms.entity.BmsChannelPoint; import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo; @@ -19,7 +20,9 @@ public interface BmsChannelPointService extends IService { List selectChannelPointList(BmsChannelPoint channelPoint); - List selectChannelPointMyList(BmsChannelPoint channelPoint,List userIds); + List selectChannelPointMyList(BmsChannelPoint channelPoint, List userIds); + + Long selectCountChannelPointMyList(BmsChannelPoint channelPoint, List userIds); List selectChannelPointMyList(BmsChannelPoint channelPoint); List selectChannelPointMyUnderList(BmsChannelPoint channelPoint); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java index f0fe14ee..957994ab 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java @@ -1,7 +1,9 @@ package com.qs.serve.modules.bms.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.model.dto.RowParam; import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CopierUtil; @@ -114,7 +116,12 @@ public class BmsChannelPointServiceImpl extends ServiceImpl selectChannelPointMyList(BmsChannelPoint channelPoint, List userIds) { - return baseMapper.selectPointByUserIds(channelPoint, userIds); + return baseMapper.selectPointByUserIds(channelPoint, userIds,new RowParam(true)); + } + + @Override + public Long selectCountChannelPointMyList(BmsChannelPoint channelPoint, List userIds) { + return baseMapper.selectCountPointByUserIds(channelPoint, userIds); } @Override diff --git a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java index 24f4795b..bb7c67d7 100644 --- a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java +++ b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java @@ -15,12 +15,15 @@ public interface HisUserSupplierService extends IService { List selectSupplier(BmsSupplier param,boolean usePage); + + boolean initByUserId(String userId,boolean hasCheck); + /** * 初始化 * @param userId * @return */ - boolean initByUserId(String userId,boolean hasCheck); + boolean initByUserId(String userId,boolean hasCheck,List existUserIds); boolean checkInit(String userId); diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java index 598ac2f4..5a00a9b7 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java @@ -82,12 +82,26 @@ public class HisUserSupplierServiceImpl extends ServiceImpl existUserIds) { if(!hasCheck){ + if(existUserIds==null){ + existUserIds = new ArrayList<>(); + } + if(existUserIds.contains(userId)){ + return true; + }else { + existUserIds.add(userId); + } + existUserIds.add(userId); boolean checkInit = this.checkInit(userId); List childUserList = sysPostUserService.listByChildIds(userId); for (String childUserId : childUserList) { - this.initByUserId(childUserId,false); + this.initByUserId(childUserId,false,existUserIds); } if(checkInit){ return true; diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 1e70fddd..1f01e9a9 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -151,6 +151,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl + + + + + + +