ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwUnitQuery.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/java/com/ycl/utils/DateUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ycl-pojo/src/main/java/com/ycl/platform/base/AbsVo.java
@@ -17,9 +17,9 @@ private Integer id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gmtCreate; private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date gmtUpdate; private Date updateTime; } ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwUnitQuery.java
@@ -1,9 +1,13 @@ package com.ycl.platform.domain.query; import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.base.AbsQuery; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.experimental.Accessors; import java.time.LocalDateTime; import java.util.Date; /** * 运维单位查询 @@ -15,5 +19,28 @@ @Accessors(chain = true) @ApiModel(value = "YwUnit查询", description = "运维单位查询") public class YwUnitQuery extends AbsQuery { /** * 单位编码 */ private String unitCode; /** * 单位名称 */ private String unitName; /** * 开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date start; /** * 结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date end; } ycl-server/src/main/java/com/ycl/platform/controller/YwUnitController.java
@@ -56,9 +56,9 @@ } @PreAuthorize("@ss.hasPermi('unit:list')") @GetMapping("/page") @PostMapping("/page") @ApiOperation(value = "分页", notes = "分页") public Result page(YwUnitQuery query) { public Result page(@RequestBody YwUnitQuery query) { return ywUnitService.page(query); } ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -12,12 +12,16 @@ import com.ycl.system.page.PageUtil; import com.ycl.platform.service.YwUnitService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ycl.utils.DateUtils; import org.springframework.stereotype.Service; import org.springframework.beans.BeanUtils; import org.springframework.util.Assert; import java.util.Objects; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.RequiredArgsConstructor; import org.springframework.util.StringUtils; /** * 运维单位 服务实现类 @@ -98,8 +102,14 @@ */ @Override public Result page(YwUnitQuery query) { // 分页条件查询你 IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper) .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode()) .eq(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName()) .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()), YwUnit::getCreateTime, DateUtils.getDayStart(query.getStart()), DateUtils.getDayEnd(query.getEnd())) .orderByDesc(YwUnit::getCreateTime) .page(PageUtil.getPage(query, YwUnit.class)); ycl-server/src/main/java/com/ycl/utils/DateUtils.java
@@ -2,15 +2,18 @@ import org.apache.commons.lang3.time.DateFormatUtils; import javax.annotation.Nullable; import java.lang.management.ManagementFactory; import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.*; import java.util.Date; import java.util.Objects; /** * 时间工具类 * * * @author ruoyi */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils @@ -26,13 +29,13 @@ public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; private static String[] parsePatterns = { "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; /** * 获取当前Date型日期 * * * @return Date() 当前日期 */ public static Date getNowDate() @@ -42,7 +45,7 @@ /** * 获取当前日期, 默认格式为yyyy-MM-dd * * * @return String */ public static String getDate() @@ -185,4 +188,35 @@ ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } /** * 获取某天的开始时间 * * @param date * @return 2023-01-01 00:00:00 */ public static Date getDayStart(@Nullable Date date) { if (Objects.isNull(date)) { date = new Date(); } LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.of("GMT+8")); LocalDateTime of = LocalDateTime.of(localDateTime.getYear(), localDateTime.getMonth(), localDateTime.getDayOfMonth(), 0, 0, 0); return Timestamp.valueOf(of); } /** * 获取某天的结束时间 * * @param date * @return 2023-01-01 23:59:59 */ public static Date getDayEnd(@Nullable Date date) { if (Objects.isNull(date)) { date = new Date(); } LocalDateTime localDateTime = LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()); LocalDateTime of = LocalDateTime.of(localDateTime.getYear(), localDateTime.getMonth(), localDateTime.getDayOfMonth(), 23, 59, 59); return Timestamp.valueOf(of); } } ycl-server/src/main/resources/mapper/zgyw/YwUnitMapper.xml
@@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ycl.platform.mapper.YwUnitMapper"> <resultMap type="YwUnit" id="YwUnitResult"> <resultMap type="YwUnitVo" id="YwUnitResult"> <result property="id" column="id" /> <result property="unitCode" column="unit_code" /> <result property="unitName" column="unit_name" /> @@ -13,8 +13,6 @@ <result property="unitAdminAccount" column="unit_admin_account" /> <result property="remark" column="remark" /> <result property="createTime" column="create_time" /> <result property="updateTime" column="update_time" /> <result property="deleted" column="deleted" /> </resultMap> <sql id="selectYwUnitVo">