西安交通大学逻辑修改

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/bean/params/OpenParams.java

@@ -22,6 +22,40 @@ public class OpenParams implements Serializable {
     @ApiModelProperty("机构名")
     private String orgName;
 
+    @ApiModelProperty("部门名")
+    private String deptName;
+
+    @ApiModelProperty("结果")
+    private String result;
+
+    public OpenParams(String name, String roleName, String orgName, String deptName, String result) {
+        this.name = name;
+        this.roleName = roleName;
+        this.orgName = orgName;
+        this.deptName = deptName;
+        this.result = result;
+    }
+
+    public OpenParams() {
+
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+
     public String getName() {
         return name;
     }

xjtu-exchange/src/main/java/com/qmth/xjtu/api/OpenApiController.java

@@ -1,5 +1,6 @@
 package com.qmth.xjtu.api;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
@@ -73,18 +74,39 @@ public class OpenApiController {
             }
         }
 
+        OpenParams openParams = null;
         //获取用户信息
         if (Objects.nonNull(accessToken)) {
             String userInfoResult = HttpUtil.post(USER_INFO_URL, null, accessToken);
             if (Objects.nonNull(userInfoResult)) {
                 log.info("userInfoResult:{}", JacksonUtil.parseJson(userInfoResult));
+                openParams = new OpenParams();
+                openParams.setResult(JacksonUtil.parseJson(userInfoResult));
+                JSONObject jsonObject = JSONObject.parseObject(accessTokenResult);
+                JSONObject object = jsonObject.getJSONObject("data");
+                String message = jsonObject.getString("message");
+                JSONArray userTypeJsonArray = object.getJSONArray("userTypes");
+                JSONArray deptInfoJsonArray = object.getJSONArray("deptInfos");
+                if (Objects.nonNull(object) && Objects.equals(message, "成功")) {
+                    openParams.setOrgName(object.getString("orgName"));
+                    if (Objects.nonNull(userTypeJsonArray) && userTypeJsonArray.size() > 0) {
+                        JSONObject userTypeJsonObject = userTypeJsonArray.getJSONObject(0);
+                        openParams.setName(userTypeJsonObject.getString("memberName"));
+                        Integer userTypeRole = userTypeJsonObject.getInteger("userType");
+                        if (Objects.nonNull(userTypeRole) && userTypeRole.intValue() == 1) {
+                            openParams.setRoleName("学生");
+                        } else if (Objects.nonNull(userTypeRole) && userTypeRole.intValue() == 2) {
+                            openParams.setRoleName("教职工");
+                        }
+                    }
+                    if (Objects.nonNull(deptInfoJsonArray) && deptInfoJsonArray.size() > 0) {
+                        JSONObject deptInfoJsonArrayJsonObject = deptInfoJsonArray.getJSONObject(0);
+                        openParams.setDeptName(deptInfoJsonArrayJsonObject.getString("deptName"));
+                    }
+                }
             }
         }
 
-        //todo 学校业务逻辑待完善
-        OpenParams openParams = new OpenParams();
-        openParams.setName("test1");
-
         //登出
         if (Objects.nonNull(gsessionId)) {
             Map<String, Object> logoutParams = new LinkedHashMap<>();