From 5d56dd4151855b27bbe3195c7b74fbc9be0bc10c Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Tue, 7 Sep 2021 09:29:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../controller/TsPositionController.java | 5 +++-- .../adc/da/slrs/sarPosition/dao/TsPositionDao.java | 2 ++ .../adc/da/slrs/sarPosition/entity/TsPosition.java | 7 +++++++ .../sarPosition/service/ITsPositionService.java | 3 ++- .../service/impl/TsPositionServiceImpl.java | 13 +++++++++++-- .../mybatis/mapper/sarPosition/TsPositionMapper.xml | 5 +++++ 7 files changed, 31 insertions(+), 6 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ccd200f7..3bc4c0fe 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-zyh7") //@FeignClient(value = "shan6") public interface workFlowFeignClient { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java index 9f08a298..27a9477f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/controller/TsPositionController.java @@ -6,6 +6,7 @@ import com.adc.da.http.Result; import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarRole.entity.TsRole; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -38,8 +39,8 @@ public class TsPositionController extends BaseController { */ @ApiOperation("查询岗位") @GetMapping - public ResponseMessage> getPosition(TsPosition tsPosition){ - List positions=tsPositionService.getPosition(tsPosition); + public ResponseMessage> getPosition(TsPosition tsPosition){ + IPage positions=tsPositionService.getPosition(tsPosition); return Result.success(positions); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java index d5989e46..df811c59 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java @@ -64,6 +64,8 @@ public interface TsPositionDao extends BaseMapper { */ List getRoleIdsByPositionIds(List positionIds); + long pageTotal(); + /** * 通过roleId查询岗位ID列表 * @param roleId：角色ID diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java index f6f7bab0..e408f1b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java @@ -76,5 +76,12 @@ public class TsPosition extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createTime; + @TableField(exist = false) + private Integer current; + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private Integer total; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java index 79565b95..cf4a653c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java @@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarPosition.entity.TsPosition; import com.adc.da.slrs.sarPosition.entity.TsPositionRoleVO; import com.adc.da.slrs.sarRole.entity.TsRole; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -23,7 +24,7 @@ public interface ITsPositionService extends IService { * @param tsPosition：查询信息 * @return List */ - List getPosition(TsPosition tsPosition); + IPage getPosition(TsPosition tsPosition); /** * 配置角色 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 9e9be8c7..0c57e382 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -9,6 +9,8 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService; import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.utils.util.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,9 +42,16 @@ public class TsPositionServiceImpl extends ServiceImpl */ @Override - public List getPosition(TsPosition tsPosition) { + public IPage getPosition(TsPosition tsPosition) { + IPage page=new Page(); - return tsPositionDao.selectPositionAndRole(tsPosition); + page.setTotal(tsPositionDao.pageTotal()); + page.setRecords(tsPositionDao.selectPositionAndRole(tsPosition)); + page.setCurrent(tsPosition.getCurrent()); + page.setSize(tsPosition.getPageSize()); + System.out.println(page.getTotal()); + + return page; } /** diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml index 123c3630..2c1b947f 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml @@ -32,6 +32,11 @@ p.name like concat(concat('%',#{name}),'%') + limit ${(current-1) * pageSize},${pageSize} + + +