diff --git a/pom.xml b/pom.xml index da11a40e..bacc3d9e 100644 --- a/pom.xml +++ b/pom.xml @@ -361,13 +361,6 @@ ifs-fnd-common 1.0 - - - - com.github.pagehelper - pagehelper-spring-boot-starter - 1.3.0 - diff --git a/src/main/java/com/spring/modules/base/controller/CommonController.java b/src/main/java/com/spring/modules/base/controller/CommonController.java deleted file mode 100644 index f603c93c..00000000 --- a/src/main/java/com/spring/modules/base/controller/CommonController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.spring.modules.base.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageRowBounds; -import com.spring.common.utils.PageUtils; -import com.spring.common.utils.R; -import com.spring.modules.sys.entity.SysUserEntity; -import org.apache.ibatis.session.SqlSession; -import org.apache.poi.ss.formula.functions.T; -import org.apache.shiro.SecurityUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.List; -import java.util.Map; - -/** - * 通用查询控制器,Controller直接调用mybatis的selectList方法,省去service层等 - */ -@Controller -public class CommonController { - @Autowired - SqlSession sqlSession; - - /** - * 通用查询分页,暂时有bug,如果当前页不在第一页时,加参数查询会有问题 - */ - @RequestMapping(value = "/select/{namespace}/{statement}/paging") - @ResponseBody - public R paging(@PathVariable("namespace") String namespace, - @PathVariable("statement") String statement, - @RequestBody Map paramMap) { - SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); - paramMap.put("site", currentUser.getSite()); - int page = 1; - if (paramMap.containsKey("page")) { - page = Integer.parseInt(paramMap.get("page").toString()); - } - int size = 20; - if (paramMap.containsKey("limit")) { - size = Integer.parseInt(paramMap.get("limit").toString()); - } - PageRowBounds rowBounds = new PageRowBounds((page - 1) * size, size); - List rows = sqlSession.selectList(namespace + "." + statement, paramMap, rowBounds); - IPage pageList = new Page<>(page, size,rowBounds.getTotal()); - pageList.setRecords(rows); - return R.ok().put("page", new PageUtils(pageList)); - } - - @RequestMapping(value = "/select/{namespace}/{statement}/list") - @ResponseBody - public R getList(@PathVariable("namespace") String namespace, - @PathVariable("statement") String statement, - @RequestBody Map paramMap) { - List rows = sqlSession.selectList(namespace + "." + statement, paramMap); - return R.ok().put("rows", rows); - } - -} diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index d426d1dc..c9cf1500 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -22,6 +22,7 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Map; @Mapper @Repository @@ -37,7 +38,7 @@ public interface TechnicalSpecificationMapper { * @return IPage * @throw */ - IPage technicalSpecificationListSearch(Page page, @Param("query") PlmTechnicalSpecificationSheetData inData); + IPage> technicalSpecificationListSearch(Page page, @Param("query") PlmTechnicalSpecificationSheetData inData); /** * @Description TODO diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index 18c4c4cf..b5f9e31b 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -83,11 +83,11 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification private Boolean dataUrlOa; //记录日志使用 - private static final Logger logger = LoggerFactory.getLogger(HttpClientUtil.class); + private static final Logger logger = LoggerFactory.getLogger(TechnicalSpecificationServiceImpl.class); @Override public PageUtils technicalSpecificationListSearch(PlmTechnicalSpecificationSheetData inData){ - IPage resultList = this.technicalSpecificationMapper.technicalSpecificationListSearch( + IPage> resultList = this.technicalSpecificationMapper.technicalSpecificationListSearch( new Page(inData.getPage(), inData.getLimit()), inData); return new PageUtils(resultList); }