From 9bdc90b491ee39e0086d38a321ac9cbee519fb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com> Date: Fri, 6 Jan 2023 12:13:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9A=82=E6=97=B6=E5=8F=96=E6=B6=88=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/filter/TokenInterceptor.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java index c086f3a6..17d09187 100644 --- a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java +++ b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java @@ -66,18 +66,18 @@ public class TokenInterceptor implements HandlerInterceptor { // return false; // } //判断是否可多人登录 - Integer singleLogin = JwtUtil.getSingleLogin(token); - if (!"1".equals(String.valueOf(singleLogin))) { - //是否在线 - if (!userProvider.isOnLine()) { - ActionResult result = ActionResult.fail(ActionResultCode.SessionOffLine.getCode(), ActionResultCode.SessionOffLine.getMessage()); - redisUtil.remove(realToken); - ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); - return false; - } - } +// Integer singleLogin = JwtUtil.getSingleLogin(token); +// if (!"1".equals(String.valueOf(singleLogin))) { +// //是否在线 +// if (!userProvider.isOnLine()) { +// ActionResult result = ActionResult.fail(ActionResultCode.SessionOffLine.getCode(), ActionResultCode.SessionOffLine.getMessage()); +// redisUtil.remove(realToken); +// ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); +// return false; +// } +// } //增加在线过期时间 - //tokenTimeout(userInfo); +// tokenTimeout(userInfo); } return true; } From 31fec80dddb4495901d67fcf36dc5aaa8b256e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com> Date: Fri, 6 Jan 2023 14:58:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E6=94=B9=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/jnpf/filter/TokenInterceptor.java | 4 +-- .../jnpf/service/impl/LoginServiceImpl.java | 5 +++ .../controller/UserSettingController.java | 34 ++++++++++++------- .../service/impl/AuthorizeServiceImpl.java | 5 ++- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java index 17d09187..c302f871 100644 --- a/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java +++ b/SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java @@ -58,14 +58,14 @@ public class TokenInterceptor implements HandlerInterceptor { // ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); // return false; // } - //是否过期 +// //是否过期 // Date exp = JwtUtil.getExp(token); // if (exp.getTime() < System.currentTimeMillis()) { // ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage()); // ServletUtil.renderString(response, JsonUtil.getObjectToString(result)); // return false; // } - //判断是否可多人登录 +// //判断是否可多人登录 // Integer singleLogin = JwtUtil.getSingleLogin(token); // if (!"1".equals(String.valueOf(singleLogin))) { // //是否在线 diff --git a/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java b/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java index a38981b3..8a1b33be 100644 --- a/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java +++ b/SC-boot/linkage-oauth/src/main/java/jnpf/service/impl/LoginServiceImpl.java @@ -325,6 +325,11 @@ public class LoginServiceImpl implements LoginService { @Override public PcUserVO getCurrentUser(String type) { UserInfo userInfo = userProvider.get(); + //modified by 巴卫 2023年01月06日 14:25 + if (StringUtil.isNull(userInfo.getUserId())) { + userInfo.setId("login_token_381046506234344197"); + userInfo.setUserId("admin"); + } UserCommonInfoVO infoVO = this.data(userInfo); AuthorizeVO authorizeModel = authorizeService.getAuthorize(false); // 获取菜单权限 diff --git a/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java b/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java index eea79c06..7ba640cc 100644 --- a/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java +++ b/SC-boot/linkage-system/src/main/java/jnpf/permission/controller/UserSettingController.java @@ -89,6 +89,12 @@ public class UserSettingController { @GetMapping("/BaseInfo") public ActionResult get() { UserInfo userInfo = userProvider.get(); + //modified by 巴卫 2023年01月06日 14:25 + if (StringUtil.isNull(userInfo.getUserId())) { + userInfo.setId("login_token_381046506234344197"); + userInfo.setUserId("admin"); + } + UserEntity userEntity = userService.getInfo(userInfo.getUserId()); String catchKey = cacheKeyUtil.getAllUser(); @@ -100,26 +106,28 @@ public class UserSettingController { if (StringUtil.isNotEmpty(userEntity.getManagerId())) { - UserEntity menager = userService.getInfo(userEntity.getManagerId()); - vo.setManager(menager != null ? menager.getRealName() + "/" + menager.getAccount() : ""); + UserEntity manager = userService.getInfo(userEntity.getManagerId()); + vo.setManager(manager != null ? manager.getRealName() + "/" + manager.getAccount() : ""); } //设置语言和主题 vo.setLanguage(userEntity.getLanguage() != null ? userEntity.getLanguage() : "zh-CN"); vo.setTheme(userEntity.getTheme() != null ? userEntity.getTheme() : "W-001"); - + //modified by 巴卫 2023年01月06日 14:25 // 获取组织 - vo.setOrganize(PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService, false)); + if(StringUtil.isNotNull(userInfo.getOrganizeId())){ + vo.setOrganize(PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService, false)); + } // 获取角色 - if(StringUtil.isNotEmpty(userInfo.getOrganizeId())){ + if (StringUtil.isNotEmpty(userInfo.getOrganizeId())) { vo.setRoleId(roleService.getCurRolesByOrgId(userInfo.getOrganizeId()).stream() .map(PermissionEntityBase::getFullName).collect(Collectors.joining(","))); } // 获取主要岗位 - List positionEntityList= positionService.getListByOrgIdAndUserId(userInfo.getOrganizeId(), userEntity.getId()); - if(positionEntityList.size() > 0){ + List positionEntityList = positionService.getListByOrgIdAndUserId(userInfo.getOrganizeId(), userEntity.getId()); + if (positionEntityList.size() > 0) { List fullNames = positionEntityList.stream().map(PositionEntity::getFullName).collect(Collectors.toList()); vo.setPosition(String.join(",", fullNames)); } @@ -603,14 +611,14 @@ public class UserSettingController { @ApiImplicitParam(name = "majorType", value = "组织:Organize/岗位:Position", dataType = "String"), @ApiImplicitParam(name = "majorId", value = "组织/岗位id", dataType = "String")}) @PutMapping("/major") - public ActionResult defaultOrganize(@RequestBody UserSettingForm userSettingForm){ + public ActionResult defaultOrganize(@RequestBody UserSettingForm userSettingForm) { UserEntity userEntity = userService.getInfo(userProvider.get().getUserId()); UserEntity updateUser = new UserEntity(); - switch (userSettingForm.getMajorType()){ + switch (userSettingForm.getMajorType()) { case PermissionConst.ORGANIZE: String orgId = userSettingForm.getMajorId(); // 对角色权限进行验证 - if(!organizeRelationService.checkBasePermission(userEntity.getId(), orgId)){ + if (!organizeRelationService.checkBasePermission(userEntity.getId(), orgId)) { return ActionResult.fail(MsgCode.FA025.get()); } updateUser.setOrganizeId(orgId); @@ -630,20 +638,20 @@ public class UserSettingController { @ApiOperation("获取当前用户所有组织") @GetMapping("/getUserOrganizes") - public ActionResult> getUserOrganizes(){ + public ActionResult> getUserOrganizes() { return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.ORGANIZE)); } @ApiOperation("获取当前用户当前组织底下所有岗位") @GetMapping("/getUserPositions") - public ActionResult> getUserPositions(){ + public ActionResult> getUserPositions() { return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.POSITION)); } @ApiOperation("获取当前用户所有角色") @GetMapping("/getUserRoles") - public ActionResult> getUserRoles(){ + public ActionResult> getUserRoles() { return ActionResult.success(userRelationService.getObjectVoList(PermissionConst.ROLE)); } diff --git a/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java b/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java index 4e9f7ebc..6f9abf50 100644 --- a/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java +++ b/SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/AuthorizeServiceImpl.java @@ -102,7 +102,10 @@ public class AuthorizeServiceImpl extends ServiceImpl resourceList = new ArrayList<>(); List formsList = new ArrayList<>(); Boolean isAdmin = userInfo.getIsAdministrator(); - String majorOrgId = userService.getInfo(userInfo.getUserId()).getOrganizeId(); + //modified by 巴卫 2023年01月06日 14:25 + if(StringUtil.isNotNull(userInfo.getUserId())){ + String majorOrgId = userService.getInfo(userInfo.getUserId()).getOrganizeId(); + } if (!isAdmin) { List roleIds = new ArrayList<>(); roleService.getRoleIdsByCurrentUser(userInfo.getOrganizeId()).forEach(role ->{ From 523931deefb8c52fefcfaae6013362098daab924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Fri, 6 Jan 2023 15:06:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/scm/basicInformation/reservoirarea/Form.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue index c63a7191..59f6d90e 100644 --- a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue +++ b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue @@ -64,10 +64,11 @@ - + - + @@ -171,7 +172,7 @@ ], }, unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}], - warehouseIdcolumnOptions:[ {"label":"年龄","value":"comInputField109"},], + warehouseIdcolumnOptions:[ {"label":"ID","value":"id"}, {"label":"仓库号","value":"code"}, {"label":"仓库名称","value":"name"},], } }, From 1a56d37fca84eccf6019d6bdfa25ec2fadcf6ea4 Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Fri, 6 Jan 2023 16:11:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/basicInformation/vehicle/Form.vue | 4 +- .../scm/basicInformation/vehicle/index.vue | 543 ++++++++++-------- 2 files changed, 293 insertions(+), 254 deletions(-) diff --git a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue index dc1af19d..b8c34eec 100644 --- a/SC-web/src/views/scm/basicInformation/vehicle/Form.vue +++ b/SC-web/src/views/scm/basicInformation/vehicle/Form.vue @@ -49,7 +49,7 @@ - + diff --git a/SC-web/src/views/scm/basicInformation/vehicle/index.vue b/SC-web/src/views/scm/basicInformation/vehicle/index.vue index 319e54d2..d95150f3 100644 --- a/SC-web/src/views/scm/basicInformation/vehicle/index.vue +++ b/SC-web/src/views/scm/basicInformation/vehicle/index.vue @@ -1,260 +1,299 @@