From 59e07299ce2b318bf7fac5076c09a9e8794c9a63 Mon Sep 17 00:00:00 2001 From: ShiJiuZhou <15315423958@163.com> Date: Sat, 18 Apr 2026 11:41:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E9=99=86?= =?UTF-8?q?=E6=8A=A5=E9=94=99,=E7=94=A8=E6=88=B7=E5=8F=98=E6=9B=B4,?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/oauth2/exception/ExceptionCode.java | 63 +++++++++++++++++++ .../springblade/system/pojo/entity/User.java | 4 -- .../springblade/system/excel/UserExcel.java | 3 + .../springblade/system/mapper/UserMapper.xml | 3 + 4 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 blade-auth/src/main/java/org/springblade/core/oauth2/exception/ExceptionCode.java 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..a2a8d9ed --- /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-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-system/src/main/java/org/springblade/system/excel/UserExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java index 67d4e2d5..e6cc3505 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java @@ -53,6 +53,9 @@ public class UserExcel implements Serializable { @ExcelProperty("租户编号") private String tenantId; + @ExcelProperty("工号") + private String code; + @ExcelIgnore @ExcelProperty("用户平台") private String userType; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml index e8715ce0..464017d5 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml @@ -90,6 +90,9 @@ and status = #{user.status} + + and code = #{user.code} + and id in ( SELECT From b439068aa0c8d56aac500aa42487ed0d000c077f Mon Sep 17 00:00:00 2001 From: ShiJiuZhou <15315423958@163.com> Date: Sat, 18 Apr 2026 11:48:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/constant/LauncherConstant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 地址 From 0320e6b8c927dd58a3c96c30d9c353e5faa5af98 Mon Sep 17 00:00:00 2001 From: ShiJiuZhou <15315423958@163.com> Date: Sat, 18 Apr 2026 11:51:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/core/oauth2/exception/ExceptionCode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index a2a8d9ed..a59c2784 100644 --- 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 @@ -12,9 +12,9 @@ public enum ExceptionCode implements Oauth2ExceptionCode { USER_NOT_FOUND(2001, "用户不存在"), USER_TENANT_NOT_FOUND(2002, "用户租户不存在"), USER_TOO_MANY_FAILS(2003, "用户登录失败次数过多"), - INVALID_USER(2004, "认证信息错误或无效"), + INVALID_USER(2004, "用户密码错误"), INVALID_USER_PASSWORD(2004, "用户密码强度过低"), - UNAUTHORIZED_USER(2005, "用户密码错误"), + UNAUTHORIZED_USER(2005, "认证信息错误或无效"), UNAUTHORIZED_USER_TENANT(2006, "用户租户未授权"), INVALID_REFRESH_TOKEN(2010, "令牌刷新错误或无效"), CLIENT_NOT_FOUND(3000, "客户端不存在"), From 39f7f02f66cd96163572b8e4831a20f031715ff4 Mon Sep 17 00:00:00 2001 From: ShiJiuZhou <15315423958@163.com> Date: Sat, 18 Apr 2026 14:03:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/springblade/system/excel/UserExcel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java b/blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java index e6cc3505..96eec21d 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/excel/UserExcel.java @@ -53,7 +53,7 @@ public class UserExcel implements Serializable { @ExcelProperty("租户编号") private String tenantId; - @ExcelProperty("工号") + @ExcelProperty("用户工号") private String code; @ExcelIgnore From 0150c98bd89b64766cf3936db8ab76e7b7f64d1f Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Sat, 18 Apr 2026 14:11:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DsPartServiceImpl.java | 44 +++++++++---------- .../service/impl/DsTaskingServiceImpl.java | 35 ++++++--------- 2 files changed, 34 insertions(+), 45 deletions(-) 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