From bc32bd82385c750e16f8a7acde6e990c32aed958 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 1 Jun 2023 10:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AE=A1sim=E5=8D=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/common/util/DateUtils.java | 26 ++++++++- .../com/jsowell/pile/dto/QuerySimInfoDTO.java | 5 ++ .../service/impl/PileSimInfoServiceImpl.java | 27 ++++++++- .../jsowell/pile/vo/web/SimCardInfoVO.java | 15 +++++ .../mapper/pile/PileSimInfoMapper.xml | 13 ++++- jsowell-ui/src/views/pile/sim/index.vue | 56 ++++++++++++++++++- 6 files changed, 133 insertions(+), 9 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java index 028e4bef8..6783a10b2 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java @@ -196,6 +196,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date()); System.out.println(dateToStr); + + String poorDays = getPoorDays(addDay(new Date(), -7), new Date()); + System.out.println(poorDays); } /** @@ -207,10 +210,27 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { } /** - * 计算相差天数 + * 计算相差天数（不会显示负值） */ - public static int differentDaysByMillisecond(Date date1, Date date2) { - return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24))); + public static int differentDaysByMillisecond(Date beginDate, Date endDate) { + return Math.abs((int) ((endDate.getTime() - beginDate.getTime()) / (1000 * 3600 * 24))); + } + + /** + * 计算相差天数 (会显示负值) + * @param endDate + * @param nowDate + * @return + */ + public static String getPoorDays(Date endDate, Date nowDate) { + long nd = 1000 * 24 * 60 * 60; + long diff = endDate.getTime() - nowDate.getTime(); + long day = diff / nd; + StringBuilder sb = new StringBuilder(); + if (day != 0) { + sb.append(day); + } + return sb.toString(); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QuerySimInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QuerySimInfoDTO.java index dd86fd349..10c91af0c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QuerySimInfoDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QuerySimInfoDTO.java @@ -29,4 +29,9 @@ public class QuerySimInfoDTO { * sim卡商 */ private String simSupplier; + + /** + * 站点id + */ + private Long stationId; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java index a45bd2b9f..fcd6b5c67 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java @@ -2,15 +2,19 @@ package com.jsowell.pile.service.impl; import com.alibaba.fastjson2.JSON; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileSimInfo; import com.jsowell.pile.dto.QuerySimInfoDTO; import com.jsowell.pile.mapper.PileSimInfoMapper; import com.jsowell.pile.service.IPileSimInfoService; import com.jsowell.pile.vo.web.SimCardInfoVO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -53,7 +57,28 @@ public class PileSimInfoServiceImpl implements IPileSimInfoService { */ @Override public List getSimInfoList(QuerySimInfoDTO dto) { - return pileSimInfoMapper.getSimInfoList(dto); + String expiredTime = dto.getExpiredTime(); + if (StringUtils.equals("1", expiredTime)) { + // 小于7天 + expiredTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addDays(new Date(), 7)); + }else if (StringUtils.equals("2", expiredTime)) { + // 小于30天 + expiredTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.addDays(new Date(), 30)); + } + dto.setExpiredTime(expiredTime); + List simInfoList = pileSimInfoMapper.getSimInfoList(dto); + if (CollectionUtils.isEmpty(simInfoList)) { + return new ArrayList<>(); + } + for (SimCardInfoVO simCardInfoVO : simInfoList) { + String expireTime = simCardInfoVO.getExpireTime(); + if (StringUtils.isBlank(expireTime)) { + continue; + } + String poorDays = DateUtils.getPoorDays(DateUtils.parseDate(expireTime), new Date()); + simCardInfoVO.setRemainingDays(poorDays); + } + return simInfoList; } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java index 8c05ca13d..c48d22e20 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java @@ -60,4 +60,19 @@ public class SimCardInfoVO { */ private String simSupplier; + /** + * 站点id + */ + private Long stationId; + + /** + * 站点名称 + */ + private String stationName; + + /** + * 剩余天数 + */ + private String remainingDays; + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml index 8eb36457f..b0bc82bae 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml @@ -39,6 +39,8 @@ + + diff --git a/jsowell-ui/src/views/pile/sim/index.vue b/jsowell-ui/src/views/pile/sim/index.vue index 0982f7d89..34f5b243a 100644 --- a/jsowell-ui/src/views/pile/sim/index.vue +++ b/jsowell-ui/src/views/pile/sim/index.vue @@ -49,7 +49,16 @@ - + + + + + + + + + + + + 搜索 重置 @@ -116,7 +142,8 @@ - + + + + +