Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/enums/SubsystemName.java

@@ -33,7 +33,8 @@ public enum SubsystemName {
     SECURITIES("证券/期货/基金/信托/资管公司"),
     SECURITIES_TRADING("证券交易"),
     CSRC("证监会、银保监会、行业协会"),
-    RISK_MANAGEMENT("风险管理");
+    RISK_MANAGEMENT("风险管理"),
+    BIG_DATA_STORAGE("大数据储存");
 
 
 

web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java

@@ -341,7 +341,7 @@ public class ApiStudentService {
     public StudentActiveInfo studentActiveInfo() {
         Student student = getStudent();
         Assert.notNull(student, "该接口只能学生查看！");
-        return studentDao.studentActiveInfo(student.getStudentId(), null);
+        return studentDao.studentActiveInfo(student.getStudentId(), student.getUserId());
     }
 
     public StudentUserCenterData userCenter() {

web/src/main/java/com/ibeetl/jlw/util/SubsystemUserUtil.java

@@ -3,16 +3,32 @@ package com.ibeetl.jlw.util;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ibeetl.admin.core.util.user.ZYUserInfo;
+import com.ibeetl.jlw.entity.SchoolClass;
+import com.ibeetl.jlw.entity.Student;
 import com.ibeetl.jlw.enums.SubsystemName;
+import com.ibeetl.jlw.service.StudentService;
+import com.ibeetl.jlw.web.query.SchoolClassQuery;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public  class SubsystemUserUtil {
+
+
+
+
+
     private static final String PEVC_USER_INSERT_API_URL="http://120.79.161.177:8029/account/saveNewUsersFromZhiyunPlatform";
     private static final String MNJY_USER_INSERT_API_URL="http://120.79.161.177:8091/account/saveNewUsersFromZhiyunPlatform";
     private static final String SZJJ_USER_INSERT_API_URL="http://112.74.160.81:9909/api/user/synchronizationStudentInfoByAuto";
     private static final String QKL_USER_INSERT_API_URL="http://120.79.54.255:8800/account/checkOrCreateForexSimulationUser";
+    private static final String JRDSJ_USER_INSERT_API_URL="http://120.78.220.29:8838/tea/user/checkOrCreateForexSimulationUser";
+
+
+
 
 
     public static void subsystemUserCreate(List<ZYUserInfo> zyUserInfos, List<String> applications) throws JsonProcessingException {
@@ -35,6 +51,10 @@ public  class SubsystemUserUtil {
                 //MNJY系统新增用户信息
                 HttpUtil.sendPostRequest(QKL_USER_INSERT_API_URL, json, "application/json");
             }
+            if (applications.contains(SubsystemName.BIG_DATA_STORAGE.getText())) {
+                //MNJY系统新增用户信息
+                HttpUtil.sendPostRequest(JRDSJ_USER_INSERT_API_URL, json, "application/json");
+            }
 
         }