feat: license到期时间取一天的最后
This commit is contained in:
@@ -38,6 +38,7 @@ import org.springframework.validation.annotation.Validated;
|
|||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.LocalTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -89,6 +90,10 @@ public class LicenseServiceImpl implements LicenseService {
|
|||||||
if (!validateLicenseSnUnique(createReqVO.getSerialNo(), createReqVO.getId())) {
|
if (!validateLicenseSnUnique(createReqVO.getSerialNo(), createReqVO.getId())) {
|
||||||
throw exception(LICENSE_SN_DUPLICATE, createReqVO.getSerialNo());
|
throw exception(LICENSE_SN_DUPLICATE, createReqVO.getSerialNo());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (createReqVO.getExpiryDate() != null) {
|
||||||
|
createReqVO.setExpiryDate(LocalDateTime.of(createReqVO.getExpiryDate().toLocalDate(), LocalTime.of(23, 59, 59)));
|
||||||
|
}
|
||||||
// 插入
|
// 插入
|
||||||
LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class);
|
LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class);
|
||||||
license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode());
|
license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode());
|
||||||
@@ -116,6 +121,9 @@ public class LicenseServiceImpl implements LicenseService {
|
|||||||
}
|
}
|
||||||
// 校验存在
|
// 校验存在
|
||||||
validateLicenseExists(updateReqVO.getId());
|
validateLicenseExists(updateReqVO.getId());
|
||||||
|
if (updateReqVO.getExpiryDate() != null) {
|
||||||
|
updateReqVO.setExpiryDate(LocalDateTime.of(updateReqVO.getExpiryDate().toLocalDate(), LocalTime.of(23, 59, 59)));
|
||||||
|
}
|
||||||
// 更新
|
// 更新
|
||||||
LicenseDO updateObj = BeanUtils.toBean(updateReqVO, LicenseDO.class);
|
LicenseDO updateObj = BeanUtils.toBean(updateReqVO, LicenseDO.class);
|
||||||
licenseMapper.updateById(updateObj);
|
licenseMapper.updateById(updateObj);
|
||||||
|
|||||||
Reference in New Issue
Block a user