Procházet zdrojové kódy

武大考务数据对接-自动同步bug

xiaof před 3 roky
rodič
revize
a439b42505

+ 1 - 1
src/main/java/com/qmth/eds/service/AsyncTaskService.java

@@ -23,7 +23,7 @@ public class AsyncTaskService {
      */
     public void syncExamData(ExamScheduleTask examScheduleTask,boolean isAuto) {
         // 记录日志
-        TBSyncTask tbSyncTask = tbSyncTaskService.saveTask(examScheduleTask);
+        TBSyncTask tbSyncTask = tbSyncTaskService.saveTask(examScheduleTask, isAuto);
         dataSyncService.syncWuhanUniversityExamData(examScheduleTask, tbSyncTask, isAuto);
     }
 }

+ 1 - 1
src/main/java/com/qmth/eds/service/TBSyncTaskService.java

@@ -13,7 +13,7 @@ import com.qmth.eds.enums.TaskStatusEnum;
  */
 public interface TBSyncTaskService extends IService<TBSyncTask> {
 
-    TBSyncTask saveTask(ExamScheduleTask examScheduleTask);
+    TBSyncTask saveTask(ExamScheduleTask examScheduleTask, boolean isAuto);
 
     void updateStatusAndResultById(Long id,TaskStatusEnum status, TaskResultEnum result, String errorMessage);
 }

+ 2 - 3
src/main/java/com/qmth/eds/service/impl/TBSyncTaskServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.eds.contant.SystemConstant;
 import com.qmth.eds.entity.ExamScheduleTask;
-import com.qmth.eds.entity.SysUser;
 import com.qmth.eds.entity.TBSyncTask;
 import com.qmth.eds.enums.ExceptionResultEnum;
 import com.qmth.eds.enums.TaskResultEnum;
@@ -24,8 +23,8 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
 
     @Transactional
     @Override
-    public TBSyncTask saveTask(ExamScheduleTask examScheduleTask) {
-        Long userId = ServletUtil.getRequestUserId();
+    public TBSyncTask saveTask(ExamScheduleTask examScheduleTask, boolean isAuto) {
+        Long userId = isAuto ? 0L : ServletUtil.getRequestUserId();
         QueryWrapper<TBSyncTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TBSyncTask::getSchoolId, examScheduleTask.getSchoolId())
                 .eq(TBSyncTask::getSemesterId, examScheduleTask.getSemesterId())

+ 2 - 2
src/main/resources/application-test.properties

@@ -11,7 +11,7 @@ spring.application.name=eds
 
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=192.168.10.136
-db.port=3306
+db.port=3307
 db.name=eds-test
 db.username=eds-test
 db.password=eds-test
@@ -20,7 +20,7 @@ db.password=eds-test
 com.qmth.redis.host=${db.host}
 com.qmth.redis.db=3
 com.qmth.redis.port=6379
-#com.qmth.redis.password=
+com.qmth.redis.password=123456
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true