From 8b479fca0c79adb36190deffa42c523e32367010 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Sat, 16 Oct 2021 09:33:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add:=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?pcms=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/login/rest/LoginRestController.java | 2 +- .../java/com/adc/da/login/util/IDMUtil.java | 9 ++++--- .../SarStandProjectLibraryController.java | 3 +++ .../SarStandProjectLibraryServiceImpl.java | 25 ++++++++++--------- .../SarStandProjectTeamController.java | 21 ++++++++-------- .../impl/SarStandProjectTeamServiceImpl.java | 1 + .../sarUser/controller/TsUserController.java | 4 +-- .../slrs/sarUser/service/ITsUserService.java | 2 +- .../service/impl/TsUserServiceImpl.java | 15 ++++++++--- 9 files changed, 49 insertions(+), 33 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java index 58c5ca33..965a977c 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -89,7 +89,7 @@ public class LoginRestController { /** * TODO OA 用户不全 待同步 */ - UserEO userEO = userService.getUserByLoginNameNotDeleted("admin"); + UserEO userEO = userService.getUserByLoginNameNotDeleted(account); if (null == userEO) { return Result.error("r0011", "用户不存在"); } diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java index d005404c..735c958b 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/IDMUtil.java @@ -18,10 +18,10 @@ public class IDMUtil { private OkHttpUtil okHttpUtil; private final String app_key = "app_slrs"; - private final String app_secret = "wj5iDTqyguQCxnsoo5VU21BoRSZqevhI"; - private final String access_url = "http://testsso1.foton.com.cn/oauth2.0/accessTokenByJson"; - private final String profile_ur = "http://testsso1.foton.com.cn/oauth2.0/profileByJson"; - private final String redirect_url = "http://127.0.0.1:9090"; + private final String app_secret = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe"; + private final String access_url = "http://sso.foton.com.cn/oauth2.0/accessTokenByJson"; + private final String profile_ur = "http://sso.foton.com.cn/oauth2.0/profileByJson"; + private final String redirect_url = "https://slrs.foton.com.cn"; public String idmLogin(String code){ try{ @@ -66,6 +66,7 @@ public class IDMUtil { } }catch(Exception e){ log.error("单点登录获取用户信息失败"); + e.printStackTrace(); } return ""; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 86609ec3..fdc1a67a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -14,6 +14,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; @@ -34,6 +35,7 @@ import java.util.*; @RestController @Api(description = "|SarStandProjectLibrary|") @RequestMapping("/api/sarStandProjectLibrary") +@Slf4j public class SarStandProjectLibraryController extends BaseController { @Resource private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService; @@ -227,6 +229,7 @@ public class SarStandProjectLibraryController extends BaseController companies = new ArrayList<>(); ResponseDto responseDto = new ResponseDto(head,companies); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 001a2d7f..2632a25e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -75,25 +75,25 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl { @Autowired @@ -39,6 +39,7 @@ public class SarStandProjectTeamController extends BaseController companies = new ArrayList<>(); //todo 未确定返回内容 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java index 92232593..2b56d7a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java @@ -75,6 +75,7 @@ public class SarStandProjectTeamServiceImpl extends ServiceImpl { @ApiOperation("查询当前登录用户权限") @GetMapping("/menu") - public ResponseMessage> getMenu(){ - List menus=tsUserService.getMenu(); + public ResponseMessage> getMenu(@RequestParam("userId") String userId){ + List menus=tsUserService.getMenu(userId); return Result.success(menus); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 3703d472..bcadca3f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -48,7 +48,7 @@ public interface ITsUserService extends IService { * 查询当前登录的用户权限 * @return List */ - List getMenu(); + List getMenu(String userId); List getResource(TsResource tsResource); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 02e66521..45f8e607 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -148,10 +149,18 @@ public class TsUserServiceImpl extends ServiceImpl implements * @return List */ @Override - public List getMenu() { - UserEO userEO=UserUtils.getUser(); - String userId= userEO.getUsid(); + public List getMenu(String userId) { +/* UserEO userEO=UserUtils.getUser(); + String userId= userEO.getUsid();*/ List positionIds=tsUserDao.selectPositionIds(userId); + /** + * 当用户没有所属岗位，默认给一个other岗位，适用于特定权限外的其他用户 + * 用户同步时需要将用户配置的系统内的岗位保留 + */ + + if(positionIds == null || positionIds.isEmpty()){ + positionIds = Arrays.asList(new String[]{"other"}); + } List roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds); List menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds); return sarMenuService.getMenuByIds(menuIds); From a68d9c9e9d0dfc13cd5bfab562992de0edff54e4 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Sat, 16 Oct 2021 09:46:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add=EF=BC=9A=E4=BF=AE=E6=94=B9pcms=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8B=E5=8F=91=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E8=AE=BF=E9=97=AE=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 2 +- .../controller/SarStandProjectLibraryController.java | 2 +- .../controller/SarStandProjectTeamController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 2bd49730..0a3fae99 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -42,7 +42,7 @@ public class WebMvcConfig implements WebMvcConfigurer { addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel"); //pcms项目数据下发开放接口 addInterceptor.excludePathPatterns("/api/sarStandProjectLibrary/save"); - addInterceptor.excludePathPatterns("/slrs/sar-stand-project-team/save"); + addInterceptor.excludePathPatterns("/api/sar-stand-project-team/save"); //tc模块结构单元数据 addInterceptor.excludePathPatterns("/api/sarModelTree/save"); //同步用户数据 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index fdc1a67a..b82fafa3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -34,7 +34,7 @@ import java.util.*; */ @RestController @Api(description = "|SarStandProjectLibrary|") -@RequestMapping("/api/sarStandProjectLibrary") +@RequestMapping("/${restPath}/sarStandProjectLibrary") @Slf4j public class SarStandProjectLibraryController extends BaseController { @Resource diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java index f3706c2c..7017cc96 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java @@ -29,7 +29,7 @@ import java.util.ArrayList; */ @RestController @Api(description = "|SarStandProjectTeam|") -@RequestMapping("/slrs/sar-stand-project-team") +@RequestMapping("/${restPath}/sar-stand-project-team") @Slf4j public class SarStandProjectTeamController extends BaseController {