tuling同步信息接口增加营期名称，注释掉线下测试接口以及线下的测试线上的代码。本地不执行任务

fs-admin/src/main/java/com/fs/task/SgTestController.java

@@ -1,27 +1,27 @@
-package com.fs.task;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * @description:
- * @author: Guos
- * @time: 2025/10/23 下午2:18
- */
-@RestController
-@RequestMapping("/sg/test")
-public class SgTestController {
-
-    @Resource
-    private SyncTuLinStudentInfoTask syncTuLinStudentInfoTask;
-
-
-    @RequestMapping("/execute")
-    public void execute(){
-        syncTuLinStudentInfoTask.execute();
-    }
-
-
-}
+//package com.fs.task;
+//
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//
+///**
+// * @description:
+// * @author: Guos
+// * @time: 2025/10/23 下午2:18
+// */
+//@RestController
+//@RequestMapping("/sg/test")
+//public class SgTestController {
+//
+//    @Resource
+//    private SyncTuLinStudentInfoTask syncTuLinStudentInfoTask;
+//
+//
+//    @RequestMapping("/execute")
+//    public void execute(){
+//        syncTuLinStudentInfoTask.execute();
+//    }
+//
+//
+//}

fs-admin/src/main/java/com/fs/task/SyncTuLinStudentInfoTask.java

@@ -1,10 +1,8 @@
 package com.fs.task;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fs.tulin.service.ITulinInfoSyncLogService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-
 import javax.annotation.Resource;
 
 /**

fs-service/src/main/java/com/fs/tulin/entity/PeriodInfo.java

@@ -0,0 +1,17 @@
+package com.fs.tulin.entity;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: Guos
+ * @time: 2025/10/24 上午10:32
+ */
+@Data
+public class PeriodInfo{
+
+    private Long courseId;
+
+    private String courseName;
+
+}

fs-service/src/main/java/com/fs/tulin/mapper/TulinInfoSyncLogMapper.java

@@ -1,7 +1,8 @@
 package com.fs.tulin.mapper;
 
+
+import com.fs.tulin.entity.PeriodInfo;
 import com.fs.tulin.entity.QwExUserInfo;
-import com.fs.tulin.entity.StudentInfo;
 import com.fs.tulin.entity.TulinInfoSyncLog;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -47,4 +48,11 @@ public interface TulinInfoSyncLogMapper {
      */
     List<QwExUserInfo> selectStudentInfo();
 
+    /**
+     * 根据用户id查询
+     * @param fsUserId
+     * @return
+     */
+    List<PeriodInfo> selectPeriodInfo(@Param("fsUserId") Long fsUserId);
+
 }

fs-service/src/main/java/com/fs/tulin/service/impl/TulinInfoSyncLogServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fs.tulin.service.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fs.tulin.entity.PeriodInfo;
 import com.fs.tulin.entity.QwExUserInfo;
 import com.fs.tulin.entity.StudentInfo;
 import com.fs.tulin.entity.TulinInfoSyncLog;
@@ -11,6 +12,7 @@ import com.fs.tulin.utils.PharmacyEnum;
 import com.fs.tulin.utils.SyncStudentInfoService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.env.Environment;
@@ -36,9 +38,10 @@ public class TulinInfoSyncLogServiceImpl implements ITulinInfoSyncLogService {
     private final Environment environment;
 
     private final String PROD_URL = "https://papi.xiangyue.life/api/v1/mp/sync/student?sign=%s&t=%d";
-    private final String DEV_URL = "https://api.xiangyue.life/api/v1/mp/sync/student?sign=%s&t=%d";
 
+    private final String DEV_URL = "https://api.xiangyue.life/api/v1/mp/sync/student?sign=%s&t=%d";
 
+    private final String PROD_CORPID = "lRz72QOIYBxJW2RBAp2UYe1ckjVpixHL";
     @Override
     public void syncInfo() {
         // 获取当前激活的profile
@@ -58,26 +61,12 @@ public class TulinInfoSyncLogServiceImpl implements ITulinInfoSyncLogService {
                 studentInfo.setColumn_name(ColumnNameEnum.GYBNX.getName());
                 studentInfo.setPharmacy_id(PharmacyEnum.YJKYSY.getPharmacyId());
                 studentInfo.setService_phone("15141712344");
-                try {
-                    TulinInfoSyncLog tulinInfoSyncLog = SyncStudentInfoService.send(PROD_URL,"lRz72QOIYBxJW2RBAp2UYe1ckjVpixHL", studentInfo);
-                    tulinInfoSyncLog.setFsUserId(qwExUserInfo.getFs_user_id());
-                    insert(tulinInfoSyncLog);
-                } catch (JsonProcessingException e) {
-                    throw new RuntimeException(e);
+                List<PeriodInfo> periodInfos = tulinInfoSyncLogMapper.selectPeriodInfo(qwExUserInfo.getFs_user_id());
+                if(CollectionUtils.isNotEmpty(periodInfos)){
+                    studentInfo.setPeriod_name(periodInfos.get(0).getCourseName());
                 }
-            }
-        }
-        if(activeProfile.equals("dev")) {
-            log.info("线下开始执行数据同步");
-            for (QwExUserInfo qwExUserInfo : qwExUserInfos) {
-                StudentInfo studentInfo = new StudentInfo();
-                BeanUtils.copyProperties(qwExUserInfo, studentInfo);
-                studentInfo.setAppid("wx6688e6b9b6fb8700");
-                studentInfo.setColumn_name(ColumnNameEnum.GYBNX.getName());
-                studentInfo.setPharmacy_id(PharmacyEnum.YJKYSY.getPharmacyId());
-                studentInfo.setService_phone("15141712344");
                 try {
-                    TulinInfoSyncLog tulinInfoSyncLog = SyncStudentInfoService.send(PROD_URL,"lRz72QOIYBxJW2RBAp2UYe1ckjVpixHL", studentInfo);
+                    TulinInfoSyncLog tulinInfoSyncLog = SyncStudentInfoService.send(PROD_URL,PROD_CORPID, studentInfo);
                     tulinInfoSyncLog.setFsUserId(qwExUserInfo.getFs_user_id());
                     insert(tulinInfoSyncLog);
                 } catch (JsonProcessingException e) {
@@ -85,6 +74,28 @@ public class TulinInfoSyncLogServiceImpl implements ITulinInfoSyncLogService {
                 }
             }
         }
+//        if(activeProfile.equals("dev")) {
+//            log.info("线下开始执行数据同步");
+//            for (QwExUserInfo qwExUserInfo : qwExUserInfos) {
+//                StudentInfo studentInfo = new StudentInfo();
+//                BeanUtils.copyProperties(qwExUserInfo, studentInfo);
+//                studentInfo.setAppid("wx6688e6b9b6fb8700");
+//                studentInfo.setColumn_name(ColumnNameEnum.GYBNX.getName());
+//                studentInfo.setPharmacy_id(PharmacyEnum.YJKYSY.getPharmacyId());
+//                studentInfo.setService_phone("15141712344");
+//                List<PeriodInfo> periodInfos = tulinInfoSyncLogMapper.selectPeriodInfo(qwExUserInfo.getFs_user_id());
+//                if(CollectionUtils.isNotEmpty(periodInfos)){
+//                    studentInfo.setPeriod_name(periodInfos.get(0).getCourseName());
+//                }
+//                try {
+//                    TulinInfoSyncLog tulinInfoSyncLog = SyncStudentInfoService.send(PROD_URL,PROD_CORPID, studentInfo);
+//                    tulinInfoSyncLog.setFsUserId(qwExUserInfo.getFs_user_id());
+//                    insert(tulinInfoSyncLog);
+//                } catch (JsonProcessingException e) {
+//                    throw new RuntimeException(e);
+//                }
+//            }
+//        }
     }
 
 

fs-service/src/main/resources/mapper/tulin/TulinInfoSyncLogMapper.xml

@@ -79,4 +79,19 @@
 
     </select>
 
+    <resultMap id="selectCourseInfoMap" type="com.fs.tulin.entity.PeriodInfo">
+        <id column="course_id" property="courseId" />
+        <result column="course_name" property="courseName" />
+    </resultMap>
+
+    <select id="selectPeriodInfo" resultMap="selectCourseInfoMap">
+        SELECT DISTINCT fcwl.course_id, fuc.course_name
+        FROM
+            fs_course_watch_log AS fcwl
+                INNER JOIN fs_user_course AS fuc ON fuc.course_id  = fcwl.course_id
+        WHERE
+            fcwl.user_id = #{fsUserId}
+          AND fcwl.sop_id IS NOT NULL
+    </select>
+
 </mapper>