From afabf64e399a55d88329c280ab03236a07cb37e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 25 Mar 2025 10:26:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(appuser):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 AppUserMapper.xml 中修改了用户状态查询条件，避免当 state 为 0 时返回空数据 - 在 AppUserController 中添加了 @RefreshScope 注解，以支持配置刷新 --- .../nflg/mobilebroken/admin/controller/AppUserController.java | 2 ++ .../src/main/resources/mapper/AppUserMapper.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java index a243d598..96635910 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java @@ -23,6 +23,7 @@ import com.nflg.mobilebroken.starter.annotation.MethodInfoMark; import com.nflg.mobilebroken.starter.service.EmailService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -45,6 +46,7 @@ import java.util.stream.Collectors; * @author 曹鹏飞 */ @Slf4j +@RefreshScope @RestController @RequestMapping("/appuser") public class AppUserController extends ControllerBase { diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml index f4bdc51d..f2ae0a80 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml @@ -143,7 +143,7 @@ AND 0=#{userState} - + AND 1=2 From 91dbceb80f1063e0eda1b9d98c0a03df8e5a0358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 25 Mar 2025 16:36:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=9A=84=E6=98=AFUTC=E6=97=B6=E9=97=B4=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E6=97=B6=E9=97=B4=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/AppUserController.java | 1 + .../admin/pojo/dto/DeviceDTO.java | 54 ++++++++++++------- .../admin/service/AdminDeviceService.java | 4 +- .../common/util/DateTimeUtil.java | 22 ++++++++ .../service/impl/AppUserServiceImpl.java | 4 +- 5 files changed, 61 insertions(+), 24 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java index 96635910..90f1bdaf 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java @@ -159,6 +159,7 @@ public class AppUserController extends ControllerBase { @ApiMark(moduleName = "代理商管理", apiName = "更新代理商账号") public ApiResult updateAppUser(@Valid @RequestBody AppUserUpdateRequest request) throws MessagingException { AppUser user=appUserService.getById(request.getId()); + user.setExpireTime(user.getExpireTime().plusDays(1)); if (user.getIsPrimary()){ updatePrimaryAppUser(user,request); }else { diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceDTO.java index 16f3c701..14ef7e92 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/DeviceDTO.java @@ -7,7 +7,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.time.LocalDate; -import java.time.LocalDateTime; +import java.util.Objects; /** * 设备管理编辑参数 @@ -88,6 +88,13 @@ public class DeviceDTO { @NotNull(message = "发货日期 不能为空") private LocalDate shipmentDate; + public LocalDate getShipmentDate() { + if (Objects.isNull(shipmentDate)){ + return null; + } + return shipmentDate.plusDays(1); + } + /** * 质保状态-来自字典 */ @@ -100,6 +107,13 @@ public class DeviceDTO { @NotNull(message = "开始质保日期不能为空") private LocalDate startWarrantyDate; + public LocalDate getStartWarrantyDate() { + if (Objects.isNull(startWarrantyDate)){ + return null; + } + return startWarrantyDate.plusDays(1); + } + /** * 质保期（月） */ @@ -121,25 +135,25 @@ public class DeviceDTO { */ private Integer sourceFrom= DeviceSourceFromEnum.MANUAL_ADD.getSourceKey(); - /** - * 创建人 - */ - private String createBy; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 最后更新人 - */ - private String updateBy; - - /** - * 最后更新时间 - */ - private LocalDateTime updateTime; +// /** +// * 创建人 +// */ +// private String createBy; +// +// /** +// * 创建时间 +// */ +// private LocalDateTime createTime; +// +// /** +// * 最后更新人 +// */ +// private String updateBy; +// +// /** +// * 最后更新时间 +// */ +// private LocalDateTime updateTime; } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java index cd9fc13e..28ed3c21 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java @@ -45,8 +45,8 @@ public class AdminDeviceService { device.setSourceFrom(DeviceSourceFromEnum.MANUAL_ADD.getSourceKey()); device.setCreateBy(AdminUserUtil.getUserName()); device.setCreateTime(LocalDateTime.now()); - device.setUpdateBy(AdminUserUtil.getUserName()); - device.setUpdateTime(LocalDateTime.now()); +// device.setUpdateBy(AdminUserUtil.getUserName()); +// device.setUpdateTime(LocalDateTime.now()); deviceService.save(device); //将设备类型放入-设备类型表维护客户质量管理人 diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java index ff16a1dd..8fd64766 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/util/DateTimeUtil.java @@ -2,8 +2,12 @@ package com.nflg.mobilebroken.common.util; import cn.hutool.core.date.DatePattern; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; +import java.util.Objects; public class DateTimeUtil { @@ -12,4 +16,22 @@ public class DateTimeUtil { public static String format(LocalDateTime dateTime){ return dateTime.format(FORMATTER); } + + public static LocalDate asSystemDate(LocalDate date){ + if (Objects.isNull(date)){ + return null; + } + return date.atStartOfDay(ZoneOffset.UTC) + .withZoneSameInstant(ZoneId.systemDefault()) + .toLocalDate(); + } + + public static LocalDateTime asSystemDateTime(LocalDateTime datetime){ + if (Objects.isNull(datetime)){ + return null; + } + return datetime.atZone(ZoneOffset.UTC) + .withZoneSameInstant(ZoneId.systemDefault()) + .toLocalDateTime(); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index c6a53ae4..4f6f7d94 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -171,7 +171,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .setUpdateBy(AdminUserUtil.getUserName()) .setUpdateTime(LocalDateTime.now()) .setState(UserState.ToBeActivated.getState()) - .setExpireTime(LocalDateTime.of(LocalDateTime.now().getYear(), 12, 31, 8, 0, 0).toLocalDate()); + .setExpireTime(LocalDate.of(LocalDateTime.now().getYear() + 1, 1, 1)); updateById(user); }else { user = new AppUser() @@ -189,7 +189,7 @@ public class AppUserServiceImpl extends ServiceImpl impl .setCreateBy(AdminUserUtil.getUserName()) .setCreateTime(LocalDateTime.now()) .setState(UserState.ToBeActivated.getState()) - .setExpireTime(LocalDateTime.of(LocalDateTime.now().getYear(), 12, 31, 8, 0, 0).toLocalDate()); + .setExpireTime(LocalDate.of(LocalDateTime.now().getYear() + 1, 1, 1)); save(user); } return user;