Merge remote-tracking branch 'origin/main'

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java

@@ -152,21 +152,12 @@ public class CphSqlServerDataController extends BaseController {
         return success(list);
     }
 
-//    //同步辅导员
-//    @RequestMapping("/synchronousEmployEEInfoList")
-//    public AjaxResult synchronousEmployEEInfoList(){
-//        //startPage();
-//        List<Map> list=sqlServerDataService.getEmployEEInfoList();
-//        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
-//        iCphTeacherService.Usertb();
-//        return success();
-//    }
-    //同步教职工
+    //同步辅导员
     @RequestMapping("/synchronousEmployEEInfoList")
     public AjaxResult synchronousEmployEEInfoList(){
         //startPage();
         List<Map> list=sqlServerDataService.getEmployEEInfoList();
-        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
+        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步辅导员
         iCphTeacherService.Usertb();
         return success();
     }

srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java

@@ -4,9 +4,11 @@ import com.srs.common.core.controller.BaseController;
 import com.srs.common.core.domain.AjaxResult;
 import com.srs.common.core.page.TableDataInfo;
 import com.srs.comprehensive.service.ICphTeacherService;
+import com.srs.comprehensive.service.ISrsMajorsService;
 import com.srs.comprehensive.service.SyncDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,9 +19,11 @@ import java.util.Map;
 @RequestMapping("/syncdata")
 public class SyncDataController extends BaseController {
     @Autowired
-    private SyncDataService syncDataService;
+    SyncDataService syncDataService;
     @Autowired
-    private ICphTeacherService iCphTeacherService;
+    ICphTeacherService iCphTeacherService;
+    @Autowired
+    ISrsMajorsService iSrsMajorsService;
     @RequestMapping("/getEmployEEInfoList")
     public TableDataInfo getEmployEEInfoList(){
         startPage();
@@ -30,8 +34,29 @@ public class SyncDataController extends BaseController {
     @RequestMapping("/synchronousEmployEEInfoList")
     public AjaxResult synchronousEmployEEInfoList(){
         List<Map> list=syncDataService.getEmployEEInfoList();
-        iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
-        //iCphTeacherService.Usertb();
+        iCphTeacherService.synchronousMYSQL(list);//同步教职工
+        iCphTeacherService.UsertbNew();
         return success();
     }
+    //中间表专业信息
+    @RequestMapping("/getSpecialtyInfoList")
+    public TableDataInfo getSpecialtyInfoList(String zydm){
+        startPage();
+        List<Map> list=syncDataService.getSpecialtyInfoList(zydm);
+        return getDataTable(list);
+    }
+    //同步专业
+    @RequestMapping("/synchronousSpecialtyInfoList")
+    public AjaxResult synchronousSpecialtyInfoList(){
+        List<Map> list=syncDataService.getSpecialtyALLInfo();
+        iSrsMajorsService.synchronousMYSQL(list);//同步专业
+        return success();
+    }
+    //中间表班级
+    @RequestMapping("/classInfoList")
+    public TableDataInfo classInfoList(){
+        startPage();
+        List<Map> list=syncDataService.getClassInfoList();
+        return getDataTable(list);
+    }
 }

srs-admin/src/main/resources/application.yml

@@ -8,7 +8,7 @@ srs:
   copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/srs/uploadPath，Linux配置 /home/srs/uploadPath）#D:/srs/uploadPath
+  # 文件路径 示例( Windows配置D:/srs/uploadPath,Linux配置 /home/srs/uploadPath)#D:/srs/uploadPath
   profile: /usr/local/java/srs/uploadPath  #/usr/local/java/srs/uploadPath
   #profile: D:/srs/uploadPath  #/srs/uploadPath
   # 获取ip地址开关
@@ -20,7 +20,7 @@ srs:
 
 # 开发环境配置
 server:
-  # 服务器的HTTP端口，默认为8080  正式：8085 测试：8088
+  # 服务器的HTTP端口,默认为8080  正式:8085 测试:8088
   port: 8085
   servlet:
     # 应用的访问路径
@@ -28,12 +28,12 @@ server:
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
+    # 连接数满后的排队数,默认为100
     accept-count: 1000
     threads:
-      # tomcat最大线程数，默认为200
+      # tomcat最大线程数,默认为200
       max: 800
-      # Tomcat启动初始化的线程数，默认值10
+      # Tomcat启动初始化的线程数,默认值10
       min-spare: 100
 
 # 日志配置
@@ -54,7 +54,7 @@ user:
   password:
     # 密码最大错误次数
     maxRetryCount: 5
-    # 密码锁定时间（默认10分钟）
+    # 密码锁定时间(默认10分钟)
     lockTime: 10
 
 # Spring配置
@@ -83,7 +83,7 @@ spring:
     # 地址
     host: localhost     #正式环境redis
 #   host: 47.112.118.149 #测试开发地址
-#     端口，默认为6379
+#     端口,默认为6379
     port: 6379
     # 数据库索引
     database: 0
@@ -100,7 +100,7 @@ spring:
         max-idle: 8
         # 连接池的最大数据库连接数
         max-active: 8
-        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        # #连接池最大阻塞等待时间(使用负值表示没有限制)
         max-wait: -1ms
 
 # token配置
@@ -109,14 +109,14 @@ token:
   header: Authorization
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期（默认30分钟）
+  # 令牌有效期(默认30分钟)
   expireTime: 43200
 
 # MyBatis配置
 #mybatis:
 #    # 搜索指定包别名
 #    typeAliasesPackage: com.srs.**.domain
-#    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+#    # 配置mapper的扫描,找到所有的mapper.xml映射文件
 #    mapperLocations: classpath*:mapper/**/*Mapper.xml
 #    # 加载全局的配置文件
 #    configLocation: classpath:mybatis/mybatis-config.xml
@@ -149,7 +149,7 @@ swagger:
 xss:
   # 过滤开关
   enabled: false
-  # 排除链接（多个用逗号分隔）
+  # 排除链接(多个用逗号分隔)
   excludes: /system/notify/*
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*,/stureg/intenetin/*