Merge remote-tracking branch 'origin/develop_master' into develop_3

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", "用户不存在");
         }

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");
     //同步用户数据

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 app_secret = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe";
-    private final String access_url = "http://testsso1.foton.com.cn/oauth2.0/accessTokenByJson";
+    private final String access_url = "http://sso.foton.com.cn/oauth2.0/accessTokenByJson";
-    private final String profile_ur = "http://testsso1.foton.com.cn/oauth2.0/profileByJson";
+    private final String profile_ur = "http://sso.foton.com.cn/oauth2.0/profileByJson";
-    private final String redirect_url = "http://127.0.0.1:9090";
+    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 "";
     }

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;
@@ -33,7 +34,8 @@ import java.util.*;
  */
 @RestController
 @Api(description = "|SarStandProjectLibrary|")
-@RequestMapping("/api/sarStandProjectLibrary")
+@RequestMapping("/${restPath}/sarStandProjectLibrary")
+@Slf4j
 public class SarStandProjectLibraryController extends BaseController<SarStandProjectLibrary> {
     @Resource
     private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService;
@@ -227,6 +229,7 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
     @PostMapping("/save")
     @ApiOperation("同步车型项目数据")
     public ResponseDto save(@RequestBody String jsonStr){
+        log.info(jsonStr);
         Head head = sarStandProjectLibraryService.AnalysisJsonAndStorage(jsonStr);
         ArrayList<Company> companies = new ArrayList<>();
         ResponseDto responseDto = new ResponseDto(head,companies);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -75,25 +75,25 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             //把刚刚拿到的值存到实体类里
             SarStandProjectLibrary projectInfo = new SarStandProjectLibrary();
             projectInfo
-                    .setProjectPlatfor(projectObject.get("eng_platform").getAsString())
+                    .setProjectPlatfor(projectObject.get("projectPlatfor").getAsString())
-                    .setProjectNumber(projectObject.get("code").getAsString())
+                    .setProjectNumber(projectObject.get("projectNumber").getAsString())
-                    .setProjectName(projectObject.get("name").getAsString())
+                    .setProjectName(projectObject.get("projectName").getAsString())
-                    .setProjectClassification(projectObject.get("catalog_name").getAsString())
+                    .setProjectClassification(projectObject.get("projectClassification").getAsString())
-                    .setProjectStatus(projectObject.get("project_status").getAsString())
+                    .setProjectStatus(projectObject.get("projectStatus").getAsString())
-                    .setProjectGroup(projectObject.get("project_group_name").getAsString())
+                    .setProjectGroup(projectObject.get("projectGroup").getAsString())
-                    .setCurrentNode(projectObject.get("project_current_milestone").getAsString())
+                    .setCurrentNode(projectObject.get("currentNode").getAsString())
-                    .setProjectLevel(projectObject.get("project_level").getAsString())
+                    .setProjectLevel(projectObject.get("projectLevel").getAsString())
-                    .setProductLine(projectObject.get("eng_product_line").getAsString());
+                    .setProductLine(projectObject.get("productLine").getAsString());
 
-            projectObject.get("target_end_on").getAsString();
+            projectObject.get("projectEndDate").getAsString();
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
 
             Date targetBeginOn = null;
             try {
-                targetBeginOn = simpleDateFormat.parse(projectObject.get("target_begin_on").getAsString());
+                targetBeginOn = simpleDateFormat.parse(projectObject.get("projectStartDate").getAsString());
 
-                Date targetEndOn = simpleDateFormat.parse(projectObject.get("target_end_on").getAsString());
+                Date targetEndOn = simpleDateFormat.parse(projectObject.get("projectEndDate").getAsString());
                 projectInfo
                         .setProjectStartDate(targetBeginOn)
                         .setProjectEndDate(targetEndOn);
@@ -113,6 +113,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
 
         }
         }catch (Exception e){
+            e.printStackTrace();
             head.setERRORCODE("2");
             head.setRESULT("业务失败需要重做");
             return head;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/controller/SarStandProjectTeamController.java

@@ -1,21 +1,20 @@
 package com.adc.da.slrs.sarStandProjectTeam.controller;
 
 
-import com.adc.da.http.ResponseMessage;
+import com.adc.da.base.web.BaseController;
-import com.adc.da.http.Result;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.Company;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.Head;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.ResponseDto;
-import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
-import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService;
-import com.google.gson.*;
-import io.swagger.annotations.ApiOperation;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.sarStandProjectTeam.entity.SarStandProjectTeam;
+import com.adc.da.slrs.sarStandProjectTeam.service.ISarStandProjectTeamService;
 import io.swagger.annotations.Api;
-import com.adc.da.base.web.BaseController;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 
@@ -30,7 +29,8 @@ 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<SarStandProjectTeam> {
 
     @Autowired
@@ -39,6 +39,7 @@ public class SarStandProjectTeamController extends BaseController<SarStandProjec
     @PostMapping("/save")
     @ApiOperation("同步PCMS组织信息")
     public ResponseDto save(@RequestBody String jsonStr){
+        log.info(jsonStr);
         Head head = sarStandProjectTeamService.AnalysisJsonAndStorage(jsonStr);
         ArrayList<Company> companies = new ArrayList<>();
         //todo 未确定返回内容

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectTeam/service/impl/SarStandProjectTeamServiceImpl.java

@@ -75,6 +75,7 @@ public class SarStandProjectTeamServiceImpl extends ServiceImpl<SarStandProjectT
         }catch (Exception e){
             responseHead.setERRORCODE("2");
             responseHead.setRESULT("业务失败需要重做");
+            e.printStackTrace();
             return responseHead;
         }
         responseHead.setERRORCODE("0")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java

@@ -62,8 +62,8 @@ public class TsUserController extends BaseController<TsUser> {
 
     @ApiOperation("查询当前登录用户权限")
     @GetMapping("/menu")
-    public ResponseMessage<List<SarMenu>> getMenu(){
+    public ResponseMessage<List<SarMenu>> getMenu(@RequestParam("userId") String userId){
-        List<SarMenu> menus=tsUserService.getMenu();
+        List<SarMenu> menus=tsUserService.getMenu(userId);
         return Result.success(menus);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

@@ -48,7 +48,7 @@ public interface ITsUserService extends IService<TsUser> {
      * 查询当前登录的用户权限
      * @return List<SarMenu>
      */
-    List<SarMenu> getMenu();
+    List<SarMenu> getMenu(String userId);
 
     List<TsResource> getResource(TsResource tsResource);
 

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<TsUserDao, TsUser> implements
      * @return List<SarMenu>
      */
     @Override
-    public List<SarMenu> getMenu() {
+    public List<SarMenu> getMenu(String userId) {
-        UserEO userEO=UserUtils.getUser();
+/*        UserEO userEO=UserUtils.getUser();
-        String userId= userEO.getUsid();
+        String userId= userEO.getUsid();*/
         List<String> positionIds=tsUserDao.selectPositionIds(userId);
+        /**
+         * 当用户没有所属岗位，默认给一个other岗位，适用于特定权限外的其他用户
+         * 用户同步时需要将用户配置的系统内的岗位保留
+         */
+
+        if(positionIds == null || positionIds.isEmpty()){
+            positionIds = Arrays.asList(new String[]{"other"});
+        }
         List<String> roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds);
         List<String> menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds);
         return sarMenuService.getMenuByIds(menuIds);