lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
lihongjie0209
2024-04-19 20:53:36 +08:00
parent 79d18cc245
commit e86f54183f
13 changed files with 107 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/lihongjie/coal/aop/ControllerAop.java
View File

@@ -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;

18
src/main/java/cn/lihongjie/coal/base/dto/SimpleDto.java Normal file
View File

@@ -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;
}

2
src/main/java/cn/lihongjie/coal/common/Ctx.java
View File

@@ -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;

9
src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
View File

@@ -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;

4
src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java
View File

@@ -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;

2
src/main/java/cn/lihongjie/coal/filter/AuthFilter.java
View File

@@ -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;

67
src/main/java/cn/lihongjie/coal/json/IdCodeNameSerializer.java Normal file
View File

@@ -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<Object> {
protected IdCodeNameSerializer(Class<Object> 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);
}
}
}

2
src/main/java/cn/lihongjie/coal/loginUser/service/LoginUserService.java
View File

@@ -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;

2
src/main/java/cn/lihongjie/coal/runner/InitDataRunner.java
View File

@@ -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;

8
src/main/java/cn/lihongjie/coal/session/LoginController.java → src/main/java/cn/lihongjie/coal/session/controller/LoginController.java
View File

@@ -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;

2
src/main/java/cn/lihongjie/coal/session/CaptchaDto.java → src/main/java/cn/lihongjie/coal/session/dto/CaptchaDto.java
View File

@@ -1,4 +1,4 @@
package cn.lihongjie.coal.session;
package cn.lihongjie.coal.session.dto;
import lombok.AllArgsConstructor;
import lombok.Data;

2
src/main/java/cn/lihongjie/coal/session/LoginDto.java → src/main/java/cn/lihongjie/coal/session/dto/LoginDto.java
View File

@@ -1,4 +1,4 @@
package cn.lihongjie.coal.session;
package cn.lihongjie.coal.session.dto;
import lombok.Data;

4
src/main/java/cn/lihongjie/coal/session/SessionService.java → src/main/java/cn/lihongjie/coal/session/service/SessionService.java
View File

@@ -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;