diff --git a/bonus-common-biz/src/main/java/com/bonus/api/SmsCodeApi.java b/bonus-common-biz/src/main/java/com/bonus/api/SmsCodeApi.java deleted file mode 100644 index bf5f67fd..00000000 --- a/bonus-common-biz/src/main/java/com/bonus/api/SmsCodeApi.java +++ /dev/null @@ -1,33 +0,0 @@ -//package net.xnzn.api; -// -//import cn.hutool.core.util.ObjectUtil; -//import com.alibaba.fastjson2.JSON; -//import com.bonus.common.core.exception.ServiceException; -//import com.bonus.common.redis.service.RedisService; -//import net.xnzn.domain.SmsCodeVerifyDTO; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import java.time.Duration; -//import java.time.LocalDateTime; -//import java.time.LocalTime; -//import java.util.HashMap; -//import java.util.Map; -//import java.util.concurrent.TimeUnit; -// -//@Service -//public class SmsCodeApi { -// private static final Logger log = LoggerFactory.getLogger(SmsCodeApi.class); -// -// @Autowired -// private RedisService redisService; -// -// public boolean verifySmsCode(SmsCodeVerifyDTO smsCodeVerifyDTO, String cacheKey) { -// String key = cacheKey + smsCodeVerifyDTO.getTelephoneNumber(); -// String code = redisService.getCacheObject(key); //RedisUtil.getString(key); -// log.info("redis缓存验证码code : {}", code); -// return ObjectUtil.isNotEmpty(code) && ObjectUtil.equal(code, smsCodeVerifyDTO.getCode()); -// } -//} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/page/PageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/page/PageDTO.java deleted file mode 100644 index 67e95468..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/page/PageDTO.java +++ /dev/null @@ -1,174 +0,0 @@ -//package net.xnzn.core.common.page; -// -//import cn.hutool.core.util.ObjectUtil; -//import cn.hutool.core.util.StrUtil; -//import com.fasterxml.jackson.annotation.JsonIgnore; -//import com.github.pagehelper.page.PageMethod; -//import io.swagger.annotations.ApiModelProperty; -//import net.xnzn.constant.LeConstants; -//import java.util.Collections; -//import java.util.List; -//import java.util.Objects; -//import java.util.stream.Collectors; -// -//public class PageDTO { -// @ApiModelProperty("当前页(默认1)") -// private Long current; -// @ApiModelProperty("每页显示条数(默认10) -1查询全部") -// private Long size; -// @ApiModelProperty("是否包含count查询 1是 2否 默认是") -// private Integer ifCount; -// @ApiModelProperty("size空(-1)时是否查询全部 1是 2否 默认是") -// private Integer ifPageSizeZero; -// @ApiModelProperty("排序，支持多个（仅支持PageHelper）") -// private List orders; -// -// public Long getCurrent() { -// return !ObjectUtil.isNull(this.current) && this.current > 0L ? this.current : 1L; -// } -// -// public Long getSize() { -// return !ObjectUtil.isNull(this.size) && this.size != 0L ? this.size : 10L; -// } -// -// public List getOrders() { -// return ObjectUtil.isNull(this.orders) ? Collections.emptyList() : this.orders; -// } -// -// @ApiModelProperty( -// value = "分页条件", -// hidden = true -// ) -// public String getOrderString() { -// return (String)this.getOrders().stream().map(OrderItem::orderString).collect(Collectors.joining(",")); -// } -// -// @ApiModelProperty( -// value = "PageHelper使用字段：pageNum", -// hidden = true -// ) -// public int getPageNum() { -// return this.getCurrent().intValue(); -// } -// -// @ApiModelProperty( -// value = "PageHelper使用字段：pageSize", -// hidden = true -// ) -// public int getPageSize() { -// int sizeValue = this.getSize().intValue(); -// return sizeValue == -1 ? 0 : sizeValue; -// } -// -// @ApiModelProperty( -// value = "PageHelper使用字段：orderBy", -// hidden = true -// ) -// public String getOrderBy() { -// return this.getOrderString(); -// } -// -// @ApiModelProperty( -// value = "PageHelper使用字段：countSql（是否包含count查询）", -// hidden = true -// ) -// public Boolean getCountSql() { -// return LeConstants.COMMON_YES.equals(this.ifCount); -// } -// -// @ApiModelProperty( -// value = "PageHelper使用字段：pageSizeZero（size 0是否查询全部）", -// hidden = true -// ) -// public Boolean getPageSizeZero() { -// return LeConstants.COMMON_YES.equals(this.ifPageSizeZero); -// } -// -// public void startPage() { -// PageMethod.startPage(this); -// } -// -// public static PageDTO of(Long current, Long size) { -// PageDTO pageDTO = new PageDTO(); -// pageDTO.setCurrent(current); -// pageDTO.setSize(size); -// return pageDTO; -// } -// -// public static PageDTO countOnly() { -// PageDTO pageDTO = new PageDTO(); -// pageDTO.setCurrent(1L); -// pageDTO.setSize(-1L); -// pageDTO.setIfCount(LeConstants.COMMON_YES); -// pageDTO.setIfPageSizeZero(LeConstants.COMMON_NO); -// return pageDTO; -// } -// -// public static void startPage(PageDTO page) { -// if (!Objects.isNull(page)) { -// page.startPage(); -// } -// } -// -// public PageDTO() { -// this.ifCount = LeConstants.COMMON_YES; -// this.ifPageSizeZero = LeConstants.COMMON_YES; -// } -// -// public Integer getIfCount() { -// return this.ifCount; -// } -// -// public Integer getIfPageSizeZero() { -// return this.ifPageSizeZero; -// } -// -// public void setCurrent(final Long current) { -// this.current = current; -// } -// -// public void setSize(final Long size) { -// this.size = size; -// } -// -// public void setIfCount(final Integer ifCount) { -// this.ifCount = ifCount; -// } -// -// public void setIfPageSizeZero(final Integer ifPageSizeZero) { -// this.ifPageSizeZero = ifPageSizeZero; -// } -// -// public void setOrders(final List orders) { -// this.orders = orders; -// } -// -// public static class OrderItem { -// @ApiModelProperty("字段名") -// private String column; -// @ApiModelProperty("true增序 false降序") -// private Boolean asc = true; -// -// @JsonIgnore -// public String orderString() { -// String var10000 = StrUtil.toUnderlineCase(this.column); -// return var10000 + " " + (this.asc ? "ASC" : "DESC"); -// } -// -// public String getColumn() { -// return this.column; -// } -// -// public Boolean getAsc() { -// return this.asc; -// } -// -// public void setColumn(final String column) { -// this.column = column; -// } -// -// public void setAsc(final Boolean asc) { -// this.asc = asc; -// } -// } -//} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/page/PageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/page/PageVO.java deleted file mode 100644 index 8d23f347..00000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/page/PageVO.java +++ /dev/null @@ -1,197 +0,0 @@ -//package net.xnzn.core.common.page; -// -//import com.github.pagehelper.Page; -//import java.util.Collections; -//import java.util.List; -// -//public class PageVO { -// protected List records; -// protected long total; -// protected long size; -// protected long current; -// protected boolean searchCount; -// private String orderBy; -// -// public PageVO() { -// this.records = Collections.emptyList(); -// this.total = 0L; -// this.size = 10L; -// this.current = 1L; -// this.searchCount = true; -// } -// -// public PageVO(long current, long size) { -// this(current, size, 0L); -// } -// -// public PageVO(long current, long size, long total) { -// this(current, size, total, true); -// } -// -// public PageVO(long current, long size, boolean searchCount) { -// this(current, size, 0L, searchCount); -// } -// -// public PageVO(long current, long size, long total, boolean searchCount) { -// this.records = Collections.emptyList(); -// this.total = 0L; -// this.size = 10L; -// this.current = 1L; -// this.searchCount = true; -// if (current > 1L) { -// this.current = current; -// } -// -// this.size = size; -// this.total = total; -// this.searchCount = searchCount; -// } -// -// public static PageVO empty() { -// return new PageVO(); -// } -// -// public static PageVO of(long current, long size, long total, boolean searchCount) { -// return new PageVO(current, size, total, searchCount); -// } -// -// public static PageVO of(long current, long size) { -// return of(current, size, 0L); -// } -// -// public static PageVO of(long current, long size, long total) { -// return of(current, size, total, true); -// } -// -// public static PageVO of(long current, long size, boolean searchCount) { -// return of(current, size, 0L, searchCount); -// } -// -//// public static PageVO of(List page, List records) { -//// if (page instanceof Page) { -//// PageVO vo = of((long)((Page)page).getPageNum(), (long)((Page)page).getPageSize(), ((Page)page).getTotal(), ((Page)page).isCount()); -//// vo.setOrderBy(((Page)page).getOrderBy()); -//// vo.setRecords(records); -//// return vo; -//// } else { -//// return of(records); -//// } -//// } -// -//// public static PageVO of(List records) { -//// PageVO vo = new PageVO(); -//// vo.setRecords(records); -//// if (records instanceof Page ghRecords) { -//// vo.setCurrent((long)ghRecords.getPageNum()).setSize((long)ghRecords.getPageSize()).setTotal(ghRecords.getTotal()).setSearchCount(ghRecords.isCount()).setOrderBy(vo.getOrderBy()); -//// } -//// -//// return vo; -//// } -// -//// public static PageVO of(PageDTO pageDTO, List records) { -//// PageVO vo = new PageVO(); -//// vo.setRecords(records); -//// if (records instanceof Page ghRecords) { -//// vo.setCurrent((long)ghRecords.getPageNum()).setSize((long)ghRecords.getPageSize()).setTotal(ghRecords.getTotal()).setSearchCount(ghRecords.isCount()).setOrderBy(vo.getOrderBy()); -//// } else if (records != null) { -//// vo.setCurrent(pageDTO.getCurrent()).setSize(pageDTO.getSize()).setTotal((long)records.size()).setOrderBy(pageDTO.getOrderBy()); -//// } -//// -//// return vo; -//// } -// -// public static PageVO of(com.baomidou.mybatisplus.extension.plugins.pagination.Page page) { -// if (page == null) { -// return new PageVO(); -// } else { -// PageVO vo = of(page.getCurrent(), page.getSize(), page.getTotal(), page.searchCount()); -// vo.setRecords(page.getRecords()); -// return vo; -// } -// } -// -// public static PageVO of(com.baomidou.mybatisplus.extension.plugins.pagination.Page page, List records) { -// if (page == null) { -// return new PageVO(); -// } else { -// PageVO vo = of(page.getCurrent(), page.getSize(), page.getTotal(), page.searchCount()); -// vo.setRecords(records); -// return vo; -// } -// } -// -// public boolean hasPrevious() { -// return this.current > 1L; -// } -// -// public boolean hasNext() { -// return this.current < this.getPages(); -// } -// -// public List getRecords() { -// return this.records; -// } -// -// public PageVO setRecords(List records) { -// this.records = records; -// return this; -// } -// -// public long getTotal() { -// return this.total; -// } -// -// public PageVO setTotal(long total) { -// this.total = total; -// return this; -// } -// -// public long getSize() { -// return this.size; -// } -// -// public PageVO setSize(long size) { -// this.size = size; -// return this; -// } -// -// public long getCurrent() { -// return this.current; -// } -// -// public PageVO setCurrent(long current) { -// this.current = current; -// return this; -// } -// -// public PageVO setSearchCount(boolean searchCount) { -// this.searchCount = searchCount; -// return this; -// } -// -// public String getOrderBy() { -// return this.orderBy; -// } -// -// public PageVO setOrderBy(String orderBy) { -// this.orderBy = orderBy; -// return this; -// } -// -// public long getPages() { -// if (this.getSize() == 0L) { -// return 0L; -// } else { -// long pages = this.getTotal() / this.getSize(); -// if (this.getTotal() % this.getSize() != 0L) { -// ++pages; -// } -// -// return pages; -// } -// } -// -// public boolean searchCount() { -// return this.total < 0L ? false : this.searchCount; -// } -//}