diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/codeconst/ResponseCodeConst.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/codeconst/ResponseCodeConst.java index dae253a7..d2bc0438 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/codeconst/ResponseCodeConst.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/codeconst/ResponseCodeConst.java @@ -29,7 +29,7 @@ public class ResponseCodeConst { public static final ResponseCodeConst REQUEST_METHOD_ERROR = new ResponseCodeConst(114, "请求方式错误"); - public static final ResponseCodeConst JSON_FORMAT_ERROR = new ResponseCodeConst(115, "请求前端参数格式错误"); + public static final ResponseCodeConst JSON_FORMAT_ERROR = new ResponseCodeConst(115, "前端请求参数格式错误"); public static final ResponseCodeConst PERMISSION_DENIED = new ResponseCodeConst(116, "您没有权限修改数据"); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java index 8e351cbb..5276c75f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsController.java @@ -2,10 +2,10 @@ package net.lab1024.smartadmin.service.module.business.goods; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.common.controller.AdminBaseController; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst; import net.lab1024.smartadmin.service.module.business.goods.domain.*; import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginInfoDTO; import net.lab1024.smartadmin.service.util.SmartEmployeeTokenUtil; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsDao.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsDao.java index 3207255d..b206eec0 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsDao.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsDao.java @@ -2,10 +2,7 @@ package net.lab1024.smartadmin.service.module.business.goods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import net.lab1024.smartadmin.service.module.business.goods.domain.GoodsAdminVO; -import net.lab1024.smartadmin.service.module.business.goods.domain.GoodsBO; -import net.lab1024.smartadmin.service.module.business.goods.domain.GoodsEntity; -import net.lab1024.smartadmin.service.module.business.goods.domain.GoodsQueryDTO; +import net.lab1024.smartadmin.service.module.business.goods.domain.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java index 98d15a21..2a780388 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/GoodsService.java @@ -131,7 +131,7 @@ public class GoodsService { */ public ResponseDTO> query(GoodsQueryDTO queryDTO) { queryDTO.setDeletedFlag(false); - Page page = SmartPageUtil.convert2PageQuery(queryDTO); + Page page = SmartPageUtil.convert2PageQuery(queryDTO); List list = goodsDao.query(page, queryDTO); PageResultDTO pageResult = SmartPageUtil.convert2PageResult(page, list); if (pageResult.getEmptyFlag()) { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java index 3ec03daa..2906d676 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/domain/GoodsQueryDTO.java @@ -8,7 +8,7 @@ import net.lab1024.smartadmin.service.module.business.goods.constant.GoodsTypeEn import org.hibernate.validator.constraints.Length; /** - * 商品 添加 DTO + * 商品 分页查询 DTO * * @author 胡克 * @date 2021/8/5 14:42 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java index 75a282d8..2514bafd 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/file/domain/FileFolderTypeEnum.java @@ -1,5 +1,7 @@ package net.lab1024.smartadmin.service.module.support.file.domain; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -8,6 +10,8 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * @author listen * @date 2019年10月11日 15:34:47 */ +@AllArgsConstructor +@Getter public enum FileFolderTypeEnum implements BaseEnum { COMMON(1, FileFolderTypeEnum.FOLDER_PUBLIC + "/common/", "通用"), @@ -31,30 +35,10 @@ public enum FileFolderTypeEnum implements BaseEnum { public static final String INFO = "1:通用"; - private Integer value; + private final Integer value; - private String folder; + private final String folder; - private String desc; - - FileFolderTypeEnum(Integer value, String folder, String desc) { - this.value = value; - this.folder = folder; - this.desc = desc; - } - - public String getFolder() { - return folder; - } - - @Override - public Integer getValue() { - return this.value; - } - - @Override - public String getDesc() { - return this.desc; - } + private final String desc; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java index aaf8c08e..5fcd12f3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/operatelog/OperateLogService.java @@ -3,8 +3,8 @@ package net.lab1024.smartadmin.service.module.support.operatelog; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogDTO; import net.lab1024.smartadmin.service.module.support.operatelog.domain.OperateLogEntity; +import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogDTO; import net.lab1024.smartadmin.service.module.support.operatelog.domain.dto.OperateLogQueryDTO; import net.lab1024.smartadmin.service.util.SmartBeanUtil; import net.lab1024.smartadmin.service.util.SmartPageUtil; @@ -32,10 +32,8 @@ public class OperateLogService { */ public ResponseDTO> queryByPage(OperateLogQueryDTO queryDTO) { Page page = SmartPageUtil.convert2PageQuery(queryDTO); - List entities = operateLogDao.queryByPage(page, queryDTO); - List dtoList = SmartBeanUtil.copyList(entities, OperateLogDTO.class); - page.setRecords(dtoList); - PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page); + List logEntityList = operateLogDao.queryByPage(page, queryDTO); + PageResultDTO pageResultDTO = SmartPageUtil.convert2PageResult(page, logEntityList, OperateLogDTO.class); return ResponseDTO.succData(pageResultDTO); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartPageUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartPageUtil.java index 6ec1e64d..bee4103b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartPageUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/util/SmartPageUtil.java @@ -2,7 +2,6 @@ package net.lab1024.smartadmin.service.util; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.domain.PageBaseDTO; import net.lab1024.smartadmin.service.common.domain.PageResultDTO; import org.apache.commons.collections4.CollectionUtils; @@ -14,34 +13,27 @@ import java.util.stream.Collectors; * 分页工具类 * * @author 1024lab - * @date 2017-12-23 16:40 + * @date 2021年9月26日 20:51:40 */ - public class SmartPageUtil { - public static Page convert2PageQuery(PageBaseDTO baseDTO) { - Page page = new Page(baseDTO.getPageNum(), baseDTO.getPageSize()); - + /** + * 转换为查询参数 + * + * @param baseDTO + * @return + */ + public static Page convert2PageQuery(PageBaseDTO baseDTO) { + Page page = new Page<>(baseDTO.getPageNum(), baseDTO.getPageSize()); // 设置排序字段 List sortItemList = baseDTO.getSortItemList(); if (CollectionUtils.isNotEmpty(sortItemList)) { - List orderItemList = sortItemList.stream().map(e -> build(e.getColumn(), e.getIsAsc())).collect(Collectors.toList()); + List orderItemList = sortItemList.stream().map(e -> new OrderItem(e.getColumn(), e.getIsAsc())).collect(Collectors.toList()); page.setOrders(orderItemList); } return page; } - public static PageResultDTO convert2PageResult(Page page) { - PageResultDTO result = new PageResultDTO<>(); - result.setPageNum(page.getCurrent()); - result.setPageSize(page.getSize()); - result.setTotal(page.getTotal()); - result.setPages(page.getPages()); - result.setList(page.getRecords()); - result.setEmptyFlag(CollectionUtils.isEmpty(page.getRecords())); - return result; - } - /** * 转换为 PageResultDTO 对象 * @@ -49,16 +41,9 @@ public class SmartPageUtil { * @param sourceList 原list * @param targetClazz 目标类 * @return - * @author 罗伊 - * @date 2018年5月16日 下午6:05:28 */ - public static PageResultDTO convert2PageResult(Page page, List sourceList, Class targetClazz) { - PageResultDTO pageResultDTO = setPage(page); - List records = SmartBeanUtil.copyList(sourceList, targetClazz); - page.setRecords(records); - pageResultDTO.setList(records); - pageResultDTO.setEmptyFlag(CollectionUtils.isEmpty(records)); - return pageResultDTO; + public static PageResultDTO convert2PageResult(Page page, List sourceList, Class targetClazz) { + return convert2PageResult(page, SmartBeanUtil.copyList(sourceList, targetClazz)); } /** @@ -67,12 +52,13 @@ public class SmartPageUtil { * @param page * @param sourceList list * @return - * @author 罗伊 - * @date 2018年5月16日 下午6:05:28 */ - public static PageResultDTO convert2PageResult(Page page, List sourceList) { - PageResultDTO pageResultDTO = setPage(page); - page.setRecords(sourceList); + public static PageResultDTO convert2PageResult(Page page, List sourceList) { + PageResultDTO pageResultDTO = new PageResultDTO<>(); + pageResultDTO.setPageNum(page.getCurrent()); + pageResultDTO.setPageSize(page.getSize()); + pageResultDTO.setTotal(page.getTotal()); + pageResultDTO.setPages(page.getPages()); pageResultDTO.setList(sourceList); pageResultDTO.setEmptyFlag(CollectionUtils.isEmpty(sourceList)); return pageResultDTO; @@ -83,62 +69,16 @@ public class SmartPageUtil { * * @param pageResultDTO * @param targetClazz - * @param - * @param * @return */ public static PageResultDTO convert2PageResult(PageResultDTO pageResultDTO, Class targetClazz) { - - PageResultDTO newPageResultDTO = new PageResultDTO(); + PageResultDTO newPageResultDTO = new PageResultDTO<>(); newPageResultDTO.setPageNum(pageResultDTO.getPageNum()); newPageResultDTO.setPageSize(pageResultDTO.getPageSize()); newPageResultDTO.setTotal(pageResultDTO.getTotal()); newPageResultDTO.setPages(pageResultDTO.getPages()); - - List list = pageResultDTO.getList(); - List copyList = SmartBeanUtil.copyList(list, targetClazz); - newPageResultDTO.setList(copyList); - newPageResultDTO.setEmptyFlag(CollectionUtils.isEmpty(copyList)); + newPageResultDTO.setEmptyFlag(pageResultDTO.getEmptyFlag()); + newPageResultDTO.setList(SmartBeanUtil.copyList(pageResultDTO.getList(), targetClazz)); return newPageResultDTO; } - - private static PageResultDTO setPage(Page page) { - PageResultDTO pageResultDTO = new PageResultDTO(); - pageResultDTO.setPageNum(page.getCurrent()); - pageResultDTO.setPageSize(page.getSize()); - pageResultDTO.setTotal(page.getTotal()); - pageResultDTO.setPages(page.getPages()); - return pageResultDTO; - } - - private static OrderItem build(String column, boolean asc) { - OrderItem item = new OrderItem(); - item.setColumn(column); - item.setAsc(asc); - return item; - } - - - public static PageResultDTO subListPage(Integer pageNum, Integer pageSize, List list) { - PageResultDTO pageRet = new PageResultDTO(); - //总条数 - int count = list.size(); - int pages = count%pageSize == 0 ? count/pageSize:(count/pageSize +1); - int fromIndex = (pageNum-1)*pageSize; - int toIndex = pageNum*pageSize>count ? count : pageNum*pageSize; - - if(pageNum > pages) { - pageRet.setList(Lists.newLinkedList()); - pageRet.setPageNum(pageNum.longValue()); - pageRet.setPages(Long.valueOf(pages)); - pageRet.setTotal(Long.valueOf(count)); - return pageRet; - } - List pageList = list.subList(fromIndex, toIndex); - pageRet.setList(pageList); - pageRet.setPageNum(pageNum.longValue()); - pageRet.setPages(Long.valueOf(pages)); - pageRet.setTotal(Long.valueOf(count)); - return pageRet; - } }