3.4.3 update-增加机器人问答

distributed-print/install/mysql/init/teachcloud_db.sql

@@ -6018,6 +6018,10 @@ CREATE TABLE IF NOT EXISTS `t_sync_data_student`  (
         `teacher_code` varchar(50) NULL COMMENT '命题老师工号',
         `teacher_name` varchar(50) NULL COMMENT '命题老师姓名',
         `update_status` TINYINT(1) NULL DEFAULT 0 COMMENT '是否已同步到考生表中',
+        `jxb_id` VARCHAR(100) NULL COMMENT '教学班ID',
+        `jxbzc` VARCHAR(2000) NULL COMMENT '教学班组成',
+        `xnm` VARCHAR(45) NULL COMMENT '学年名',
+        `xqm` VARCHAR(45) NULL COMMENT '学期名',
         PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据同步考生' ROW_FORMAT = Dynamic;
 

distributed-print/install/mysql/upgrade/3.4.3.sql

@@ -59,6 +59,10 @@ CREATE TABLE `t_sync_data_student`  (
         `teacher_code` varchar(50) NULL COMMENT '命题老师工号',
         `teacher_name` varchar(50) NULL COMMENT '命题老师姓名',
         `update_status` TINYINT(1) NULL DEFAULT 0 COMMENT '是否已同步到考生表中',
+        `jxb_id` VARCHAR(100) NULL COMMENT '教学班ID',
+        `jxbzc` VARCHAR(2000) NULL COMMENT '教学班组成',
+        `xnm` VARCHAR(45) NULL COMMENT '学年名',
+        `xqm` VARCHAR(45) NULL COMMENT '学期名',
         PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据同步考生' ROW_FORMAT = Dynamic;
 

distributed-print/src/main/java/com/qmth/distributed/print/api/SysAdminSetController.java

@@ -637,10 +637,10 @@ public class SysAdminSetController {
         List<SysConfigResult> list = new ArrayList<>();
         // 是否开启机器人
         SysConfig aiRobotSwitch = commonCacheService.addSysConfigCache(schoolId, SystemConstant.AI_ROBOT_ENABLE);
-        list.add(aiRobotSwitch != null ? new SysConfigResult(aiRobotSwitch) : new SysConfigResult(null, SystemConstant.AI_ROBOT_ENABLE, "是否开启机器人", "", 1));
+        list.add(aiRobotSwitch != null ? new SysConfigResult(aiRobotSwitch) : new SysConfigResult(null, SystemConstant.AI_ROBOT_ENABLE, "是否启用机器人", "false", 1));
         // 机器人链接
         SysConfig aiRobotUrl = commonCacheService.addSysConfigCache(schoolId, SystemConstant.AI_ROBOT_URL);
-        list.add(aiRobotUrl != null ? new SysConfigResult(aiRobotUrl) : new SysConfigResult(null, SystemConstant.AI_ROBOT_URL, "机器人链接", "", 2));
+        list.add(aiRobotUrl != null ? new SysConfigResult(aiRobotUrl) : new SysConfigResult(null, SystemConstant.AI_ROBOT_URL, "机器人链接", "https://dify.qmth.com.cn/chat/O5OzUXL2hAOsr86c", 2));
         sysAdminSetResult.setResult(list);
         return ResultUtil.ok(sysAdminSetResult);
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/admin/DataController.java

@@ -82,6 +82,12 @@ public class DataController {
     @RequestMapping(value = "/start/sync", method = RequestMethod.POST)
     public Result startSync(@ApiParam(value = "学校ID") @RequestParam(value = "schoolId") Long schoolId,
                             @ApiParam(value = "考试ID") @RequestParam(value = "examId") Long examId) {
+        TSyncData tSyncData = tSyncDataService.selectByMultiId(new TSyncData(schoolId, examId));
+        if (tSyncData == null) {
+            throw ExceptionResultEnum.ERROR.exception("同步任务不存在");
+        } else if (tSyncData.getStatus()) {
+            throw ExceptionResultEnum.ERROR.exception("正在同步中，请稍后再试");
+        }
         quartzService.runAJobNow(JobEnum.DATA_SYNC.name() + "-" + schoolId + "-" + examId, JobEnum.DATA_SYNC.getGroupName());
         return ResultUtil.ok(true);
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/sync/TSyncDataStudent.java

@@ -84,6 +84,18 @@ public class TSyncDataStudent implements Serializable {
     @ApiModelProperty(value = "是否已同步到考生表中")
     private Boolean updateStatus;
 
+    @ApiModelProperty(value = "教学班ID")
+    private String jxbId;
+
+    @ApiModelProperty(value = "学年名")
+    private String xnm;
+
+    @ApiModelProperty(value = "学期名")
+    private String xqm;
+
+    @ApiModelProperty(value = "教学班组成")
+    private String jxbzc;
+
     @TableField(exist = false)
     private String examDate;
     @TableField(exist = false)
@@ -237,6 +249,38 @@ public class TSyncDataStudent implements Serializable {
         this.updateStatus = updateStatus;
     }
 
+    public String getJxbId() {
+        return jxbId;
+    }
+
+    public void setJxbId(String jxbId) {
+        this.jxbId = jxbId;
+    }
+
+    public String getXnm() {
+        return xnm;
+    }
+
+    public void setXnm(String xnm) {
+        this.xnm = xnm;
+    }
+
+    public String getXqm() {
+        return xqm;
+    }
+
+    public void setXqm(String xqm) {
+        this.xqm = xqm;
+    }
+
+    public String getJxbzc() {
+        return jxbzc;
+    }
+
+    public void setJxbzc(String jxbzc) {
+        this.jxbzc = jxbzc;
+    }
+
     public String getExamDate() {
         return examDate;
     }

teachcloud-data/src/main/java/com/qmth/teachcloud/data/service/impl/DataServiceImpl.java

@@ -213,7 +213,7 @@ public class DataServiceImpl implements DataService {
             }
             tSyncDataStudentService.remove(new UpdateWrapper<TSyncDataStudent>().lambda().eq(TSyncDataStudent::getSchoolId, schoolId).eq(TSyncDataStudent::getExamId, examId));
             tSyncDataStudentService.saveBatch(dataVoList, 2000);
-//            basicExamStudentService.saveBasicExamStudentFormSync(schoolId, examId, dataVoList);
+            basicExamStudentService.saveBasicExamStudentFormSync(schoolId, examId, dataVoList);
         } catch (Exception e) {
             count = 0;
             errorMsg = e.getMessage();