autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

后管sim卡页面添加字段

Browse Source
This commit is contained in:
Lemon
2023-06-01 10:39:48 +08:00
parent 6ccfd5f7cf
commit bc32bd8238
6 changed files with 133 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/dto/QuerySimInfoDTO.java
View File

@@ -29,4 +29,9 @@ public class QuerySimInfoDTO {
* sim卡商
*/
private String simSupplier;
/**
* 站点id
*/
private Long stationId;
}

27
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java
View File

@@ -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<SimCardInfoVO> 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<SimCardInfoVO> 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;
}
/**

15
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SimCardInfoVO.java
View File

@@ -60,4 +60,19 @@ public class SimCardInfoVO {
*/
private String simSupplier;
/**
* 站点id
*/
private Long stationId;
/**
* 站点名称
*/
private String stationName;
/**
* 剩余天数
*/
private String remainingDays;
}