From e86f54183fc897ed10b931104b8e92d4c8398dba Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Fri, 19 Apr 2024 20:53:36 +0800 Subject: [PATCH] bugfix --- .../cn/lihongjie/coal/aop/ControllerAop.java | 2 +- .../cn/lihongjie/coal/base/dto/SimpleDto.java | 18 +++++ .../java/cn/lihongjie/coal/common/Ctx.java | 2 +- .../lihongjie/coal/device/dto/DeviceDto.java | 9 ++- .../dto/DeviceWorkOrderDto.java | 4 +- .../cn/lihongjie/coal/filter/AuthFilter.java | 2 +- .../coal/json/IdCodeNameSerializer.java | 67 +++++++++++++++++++ .../loginUser/service/LoginUserService.java | 2 +- .../lihongjie/coal/runner/InitDataRunner.java | 2 +- .../{ => controller}/LoginController.java | 8 ++- .../coal/session/{ => dto}/CaptchaDto.java | 2 +- .../coal/session/{ => dto}/LoginDto.java | 2 +- .../session/{ => service}/SessionService.java | 4 +- 13 files changed, 107 insertions(+), 17 deletions(-) create mode 100644 src/main/java/cn/lihongjie/coal/base/dto/SimpleDto.java create mode 100644 src/main/java/cn/lihongjie/coal/json/IdCodeNameSerializer.java rename src/main/java/cn/lihongjie/coal/session/{ => controller}/LoginController.java (87%) rename src/main/java/cn/lihongjie/coal/session/{ => dto}/CaptchaDto.java (84%) rename src/main/java/cn/lihongjie/coal/session/{ => dto}/LoginDto.java (91%) rename src/main/java/cn/lihongjie/coal/session/{ => service}/SessionService.java (99%) diff --git a/src/main/java/cn/lihongjie/coal/aop/ControllerAop.java b/src/main/java/cn/lihongjie/coal/aop/ControllerAop.java index 49624364..81ae3c42 100644 --- a/src/main/java/cn/lihongjie/coal/aop/ControllerAop.java +++ b/src/main/java/cn/lihongjie/coal/aop/ControllerAop.java @@ -6,7 +6,7 @@ import cn.lihongjie.coal.base.entity.CommonEntity; import cn.lihongjie.coal.common.RequestUtils; import cn.lihongjie.coal.ip.IpQueryService; import cn.lihongjie.coal.pojoProcessor.PojoProcessor; -import cn.lihongjie.coal.session.SessionService; +import cn.lihongjie.coal.session.service.SessionService; import cn.lihongjie.coal.syslog.entity.SysLogEntity; import cn.lihongjie.coal.syslog.service.SysLogService; diff --git a/src/main/java/cn/lihongjie/coal/base/dto/SimpleDto.java b/src/main/java/cn/lihongjie/coal/base/dto/SimpleDto.java new file mode 100644 index 00000000..92be54fe --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/base/dto/SimpleDto.java @@ -0,0 +1,18 @@ +package cn.lihongjie.coal.base.dto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +import java.util.*; + +@Data +public class SimpleDto { + private String id; + @Comment("名称") + private String name; + + @Comment("编码") + private String code; + +} diff --git a/src/main/java/cn/lihongjie/coal/common/Ctx.java b/src/main/java/cn/lihongjie/coal/common/Ctx.java index 112b4f97..15694ea6 100644 --- a/src/main/java/cn/lihongjie/coal/common/Ctx.java +++ b/src/main/java/cn/lihongjie/coal/common/Ctx.java @@ -1,6 +1,6 @@ package cn.lihongjie.coal.common; -import cn.lihongjie.coal.session.SessionService; +import cn.lihongjie.coal.session.service.SessionService; import cn.lihongjie.coal.user.dto.UserDto; import lombok.Getter; diff --git a/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java b/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java index c6f7f9e0..1a10b38d 100644 --- a/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java +++ b/src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java @@ -1,10 +1,9 @@ package cn.lihongjie.coal.device.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.base.dto.SimpleDto; import cn.lihongjie.coal.common.DictCode; -import cn.lihongjie.coal.deviceCategory.dto.DeviceCategoryDto; import cn.lihongjie.coal.pojoProcessor.DictTranslate; -import cn.lihongjie.coal.user.dto.UserDto; import jakarta.persistence.ManyToOne; @@ -26,11 +25,11 @@ public class DeviceDto extends OrgCommonDto { @ManyToOne - private DeviceCategoryDto supplier; + private SimpleDto supplier; @ManyToOne - private DeviceCategoryDto category; + private SimpleDto category; @@ -40,7 +39,7 @@ public class DeviceDto extends OrgCommonDto { @ManyToOne - private UserDto manager; + private SimpleDto manager; diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java index 4f454eac..f0a7d6fc 100644 --- a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java +++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java @@ -1,8 +1,8 @@ package cn.lihongjie.coal.deviceWorkOrder.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.base.dto.SimpleDto; import cn.lihongjie.coal.common.DictCode; -import cn.lihongjie.coal.device.entity.DeviceEntity; import cn.lihongjie.coal.deviceWorkOrderDetail.dto.DeviceWorkOrderDetailDto; import cn.lihongjie.coal.pojoProcessor.DictTranslate; import cn.lihongjie.coal.user.entity.UserEntity; @@ -29,7 +29,7 @@ public class DeviceWorkOrderDto extends OrgCommonDto { @ManyToOne - private DeviceEntity device; + private SimpleDto device; @Comment("工单时间") private LocalDateTime time; diff --git a/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java b/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java index e34ed6d8..be266cd7 100644 --- a/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java +++ b/src/main/java/cn/lihongjie/coal/filter/AuthFilter.java @@ -8,7 +8,7 @@ import cn.lihongjie.coal.permission.service.PermissionService; import cn.lihongjie.coal.resource.dto.ResourceDto; import cn.lihongjie.coal.resource.service.ResourceService; import cn.lihongjie.coal.role.service.RoleService; -import cn.lihongjie.coal.session.SessionService; +import cn.lihongjie.coal.session.service.SessionService; import cn.lihongjie.coal.spring.config.SystemConfig; import cn.lihongjie.coal.user.dto.UserDto; import cn.lihongjie.coal.user.service.UserService; diff --git a/src/main/java/cn/lihongjie/coal/json/IdCodeNameSerializer.java b/src/main/java/cn/lihongjie/coal/json/IdCodeNameSerializer.java new file mode 100644 index 00000000..e7a89ac3 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/json/IdCodeNameSerializer.java @@ -0,0 +1,67 @@ +package cn.lihongjie.coal.json; + +import cn.lihongjie.coal.base.dto.BaseDto; +import cn.lihongjie.coal.base.dto.CommonDto; +import cn.lihongjie.coal.base.entity.BaseEntity; +import cn.lihongjie.coal.base.entity.CommonEntity; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; + +import java.io.IOException; +import java.util.*; + +public class IdCodeNameSerializer extends StdSerializer { + protected IdCodeNameSerializer(Class t) { + super(t); + } + + protected IdCodeNameSerializer(JavaType type) { + super(type); + } + + protected IdCodeNameSerializer(Class t, boolean dummy) { + super(t, dummy); + } + + protected IdCodeNameSerializer(StdSerializer src) { + super(src); + } + + @Override + public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + + if (value instanceof BaseEntity) { + gen.writeStartObject(); + + gen.writeStringField("id", ((BaseEntity) value).getId()); + + if (value instanceof CommonEntity) { + + gen.writeStringField("code", ((CommonEntity) value).getCode()); + gen.writeStringField("name", ((CommonEntity) value).getName()); + } + + gen.writeEndObject(); + }else if (value instanceof BaseDto){ + + gen.writeStartObject(); + + gen.writeStringField("id", ((BaseDto) value).getId()); + + if (value instanceof CommonDto) { + + gen.writeStringField("code", ((CommonDto) value).getCode()); + gen.writeStringField("name", ((CommonDto) value).getName()); + } + + gen.writeEndObject(); + }else { + + gen.writeObject(value); + } + } +} diff --git a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java index 141aee39..e0009355 100644 --- a/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java +++ b/src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java @@ -13,7 +13,7 @@ import cn.lihongjie.coal.loginUser.mapper.LoginUserMapper; import cn.lihongjie.coal.loginUser.repository.LoginUserRepository; import cn.lihongjie.coal.loginUserHis.service.LoginUserHisService; import cn.lihongjie.coal.ratelimit.RateLimiterService; -import cn.lihongjie.coal.session.SessionService; +import cn.lihongjie.coal.session.service.SessionService; import cn.lihongjie.coal.sysconfig.service.SysConfigService; import cn.lihongjie.coal.user.service.UserService; diff --git a/src/main/java/cn/lihongjie/coal/runner/InitDataRunner.java b/src/main/java/cn/lihongjie/coal/runner/InitDataRunner.java index ab04c68d..c147a05f 100644 --- a/src/main/java/cn/lihongjie/coal/runner/InitDataRunner.java +++ b/src/main/java/cn/lihongjie/coal/runner/InitDataRunner.java @@ -9,7 +9,7 @@ import cn.lihongjie.coal.passwordDict.service.PasswordDictService; import cn.lihongjie.coal.permission.service.PermissionService; import cn.lihongjie.coal.resource.service.ResourceService; import cn.lihongjie.coal.script.service.ScriptService; -import cn.lihongjie.coal.session.SessionService; +import cn.lihongjie.coal.session.service.SessionService; import cn.lihongjie.coal.sysconfig.service.SysConfigService; import cn.lihongjie.coal.user.entity.UserEntity; import cn.lihongjie.coal.user.mapper.UserMapper; diff --git a/src/main/java/cn/lihongjie/coal/session/LoginController.java b/src/main/java/cn/lihongjie/coal/session/controller/LoginController.java similarity index 87% rename from src/main/java/cn/lihongjie/coal/session/LoginController.java rename to src/main/java/cn/lihongjie/coal/session/controller/LoginController.java index f793fceb..29d1c9ce 100644 --- a/src/main/java/cn/lihongjie/coal/session/LoginController.java +++ b/src/main/java/cn/lihongjie/coal/session/controller/LoginController.java @@ -1,4 +1,4 @@ -package cn.lihongjie.coal.session; +package cn.lihongjie.coal.session.controller; import cn.lihongjie.coal.annotation.Anonymous; import cn.lihongjie.coal.annotation.SysLog; @@ -6,6 +6,9 @@ import cn.lihongjie.coal.base.controller.BaseController; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.common.Ctx; import cn.lihongjie.coal.rabbitmq.RabbitMQService; +import cn.lihongjie.coal.session.dto.CaptchaDto; +import cn.lihongjie.coal.session.dto.LoginDto; +import cn.lihongjie.coal.session.service.SessionService; import cn.lihongjie.coal.user.dto.UserDto; import cn.lihongjie.coal.user.service.UserService; @@ -19,7 +22,8 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping public class LoginController extends BaseController { - @Autowired SessionService service; + @Autowired + SessionService service; @Autowired UserService userService; diff --git a/src/main/java/cn/lihongjie/coal/session/CaptchaDto.java b/src/main/java/cn/lihongjie/coal/session/dto/CaptchaDto.java similarity index 84% rename from src/main/java/cn/lihongjie/coal/session/CaptchaDto.java rename to src/main/java/cn/lihongjie/coal/session/dto/CaptchaDto.java index d5fb62af..04742fe4 100644 --- a/src/main/java/cn/lihongjie/coal/session/CaptchaDto.java +++ b/src/main/java/cn/lihongjie/coal/session/dto/CaptchaDto.java @@ -1,4 +1,4 @@ -package cn.lihongjie.coal.session; +package cn.lihongjie.coal.session.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cn/lihongjie/coal/session/LoginDto.java b/src/main/java/cn/lihongjie/coal/session/dto/LoginDto.java similarity index 91% rename from src/main/java/cn/lihongjie/coal/session/LoginDto.java rename to src/main/java/cn/lihongjie/coal/session/dto/LoginDto.java index b93205cb..8354813d 100644 --- a/src/main/java/cn/lihongjie/coal/session/LoginDto.java +++ b/src/main/java/cn/lihongjie/coal/session/dto/LoginDto.java @@ -1,4 +1,4 @@ -package cn.lihongjie.coal.session; +package cn.lihongjie.coal.session.dto; import lombok.Data; diff --git a/src/main/java/cn/lihongjie/coal/session/SessionService.java b/src/main/java/cn/lihongjie/coal/session/service/SessionService.java similarity index 99% rename from src/main/java/cn/lihongjie/coal/session/SessionService.java rename to src/main/java/cn/lihongjie/coal/session/service/SessionService.java index 948cb429..8cda53d7 100644 --- a/src/main/java/cn/lihongjie/coal/session/SessionService.java +++ b/src/main/java/cn/lihongjie/coal/session/service/SessionService.java @@ -1,4 +1,4 @@ -package cn.lihongjie.coal.session; +package cn.lihongjie.coal.session.service; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.common.Constants; @@ -13,6 +13,8 @@ import cn.lihongjie.coal.loginUserHis.service.LoginUserHisService; import cn.lihongjie.coal.organization.entity.OrganizationEntity; import cn.lihongjie.coal.organization.service.OrganizationService; import cn.lihongjie.coal.ratelimit.RateLimiterService; +import cn.lihongjie.coal.session.dto.CaptchaDto; +import cn.lihongjie.coal.session.dto.LoginDto; import cn.lihongjie.coal.sms.service.SmsService; import cn.lihongjie.coal.smsTemplate.entity.SmsTemplateEntity; import cn.lihongjie.coal.smsTemplate.service.SmsTemplateService;