diff --git a/blade-auth/src/main/java/org/springblade/core/oauth2/exception/ExceptionCode.java b/blade-auth/src/main/java/org/springblade/core/oauth2/exception/ExceptionCode.java new file mode 100644 index 00000000..a59c2784 --- /dev/null +++ b/blade-auth/src/main/java/org/springblade/core/oauth2/exception/ExceptionCode.java @@ -0,0 +1,63 @@ +package org.springblade.core.oauth2.exception; + +import lombok.Generated; +/** + * @author 石玖洲 + * @Description + * @create 2026-04-18 10:22 + */ + +public enum ExceptionCode implements Oauth2ExceptionCode { + INVALID_REQUEST(2000, "无效请求"), + USER_NOT_FOUND(2001, "用户不存在"), + USER_TENANT_NOT_FOUND(2002, "用户租户不存在"), + USER_TOO_MANY_FAILS(2003, "用户登录失败次数过多"), + INVALID_USER(2004, "用户密码错误"), + INVALID_USER_PASSWORD(2004, "用户密码强度过低"), + UNAUTHORIZED_USER(2005, "认证信息错误或无效"), + UNAUTHORIZED_USER_TENANT(2006, "用户租户未授权"), + INVALID_REFRESH_TOKEN(2010, "令牌刷新错误或无效"), + CLIENT_NOT_FOUND(3000, "客户端不存在"), + INVALID_CLIENT(3001, "客户端认证失败"), + INVALID_CLIENT_REDIRECT_URI(3002, "客户端未授权"), + UNAUTHORIZED_CLIENT(3003, "客户端未授权"), + UNSUPPORTED_GRANT_TYPE(4000, "不支持的授权类型"), + INVALID_GRANTER(4001, "无效的授权类型"), + INVALID_SCOPE(4002, "授权范围"), + SERVER_ERROR(5000, "服务器错误"), + ACCESS_DENIED(5001, "访问被拒绝"), + TEMPORARILY_UNAVAILABLE(5002, "服务暂不可用"); + + final int code; + final String message; + + public static org.springblade.core.oauth2.exception.ExceptionCode of(int code) { + org.springblade.core.oauth2.exception.ExceptionCode[] var1 = values(); + int var2 = var1.length; + + for(int var3 = 0; var3 < var2; ++var3) { + org.springblade.core.oauth2.exception.ExceptionCode value = var1[var3]; + if (value.code == code) { + return value; + } + } + + throw new IllegalArgumentException(String.format("无效的错误代码: %s", code)); + } + + @Generated + public int getCode() { + return this.code; + } + + @Generated + public String getMessage() { + return this.message; + } + + @Generated + private ExceptionCode(final int code, final String message) { + this.code = code; + this.message = message; + } +} diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 301dc202..3ef40cfd 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -32,8 +32,8 @@ public interface LauncherConstant { * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.249.27:8848"; -// String NACOS_DEV_ADDR = "127.0.0.1:8848"; +// String NACOS_DEV_ADDR = "192.168.249.27:8848"; + String NACOS_DEV_ADDR = "127.0.0.1:8848"; /**R * nacos prod 地址 diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java index 6186a7fa..dd95027a 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java @@ -114,9 +114,5 @@ public class User extends TenantEntity { * 是否主管 */ private Integer isLeader; - /** - * 工号 - */ - private String workNo; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 2af179c5..7f3de468 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -446,33 +446,31 @@ public class DsPartServiceImpl extends BaseServiceImpl partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); - if(!CollectionUtils.isEmpty(partRelationEntityList)){ - List idList = partRelationEntityList.stream() - .map(DsPartRelationEntity::getChildPartId) - .collect(Collectors.toList()); + List partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); + if(!CollectionUtils.isEmpty(partRelationEntityList)){ + List idList = partRelationEntityList.stream() + .map(DsPartRelationEntity::getChildPartId) + .collect(Collectors.toList()); - List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); + List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); - List dsPartVOList = dsPartEntityList.stream() - .map(entity -> { - DsPartVO vo = new DsPartVO(); - BeanUtils.copyProperties(entity, vo); + List dsPartVOList = dsPartEntityList.stream() + .map(entity -> { + DsPartVO vo = new DsPartVO(); + BeanUtils.copyProperties(entity, vo); - if (vo.getUpdateUser() != null) { - String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) - .getData() - .getUser() - .getName(); - vo.setUpdateUserStr(userName); - } - return vo; - }) - .collect(Collectors.toList()); + if (vo.getUpdateUser() != null) { + String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) + .getData() + .getUser() + .getName(); + vo.setUpdateUserStr(userName); + } + return vo; + }) + .collect(Collectors.toList()); - dsPartSynthesisVO.setDsPartVOList(dsPartVOList); - } + dsPartSynthesisVO.setDsPartVOList(dsPartVOList); } dsPartSynthesisVO.setDsPartEntity(partEntity); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 733b4132..466a471a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -1851,28 +1851,19 @@ public class DsTaskingServiceImpl extends BaseServiceImpl and status = #{user.status} + + and code = #{user.code} + and id in ( SELECT