Merge branch 'dev_v3.4.4' into dev_v3.4.5

distributed-print/src/main/java/com/qmth/distributed/print/upgrade/DataUpgrade_3_4_2.java

@@ -31,7 +31,7 @@ import java.util.*;
 /**
  * 升级3.4.2后，3.4.1及以前历史数据的处理
  */
-@DataUpgradeVersion("3.4.2")
+//@DataUpgradeVersion("3.4.2")
 public class DataUpgrade_3_4_2 implements DataUpgradeService {
 
     private static final Logger log = LoggerFactory.getLogger(DataUpgrade_3_4_2.class);

distributed-print/src/main/java/com/qmth/distributed/print/upgrade/DataUpgrade_3_4_4.java

@@ -60,21 +60,21 @@ public class DataUpgrade_3_4_4 implements DataUpgradeService {
         String upgradePath = sj.toString();
         log.info("数据库脚本根目录：" + upgradePath);
         // 执行升级脚本
-//        log.info("开始处理3.4.3历史数据，更新脚本1；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
-//        String upgrade_sql1 = upgradePath + File.separator + "3.4.4-upgrade-1.sql";
-//        this.execUpgradeSql(jdbcTemplate, upgrade_sql1);
-//        log.info("结束处理3.4.3历史数据，更新脚本1；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
+        log.info("开始处理3.4.3历史数据，更新脚本1；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
+        String upgrade_sql1 = upgradePath + File.separator + "3.4.4-upgrade-1.sql";
+        this.execUpgradeSql(jdbcTemplate, upgrade_sql1);
+        log.info("结束处理3.4.3历史数据，更新脚本1；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
 
-//        log.info("开始处理3.4.3历史数据，数据归档；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
+        log.info("开始处理3.4.3历史数据，数据归档；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
 //         执行历史数据归档
         this.execDataArchive(jdbcTemplate);
-//        log.info("结束处理3.4.3历史数据，数据归档；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
+        log.info("结束处理3.4.3历史数据，数据归档；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
 
         // 归档后中间数据重命名，创建新表
-//        log.info("开始处理3.4.4升级脚本2；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
-//        String upgrade_sql2 = upgradePath + File.separator + "3.4.4-upgrade-2.sql";
-//        this.execUpgradeSql(jdbcTemplate, upgrade_sql2);
-//        log.info("结束处理3.4.4升级脚本2；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
+        log.info("开始处理3.4.4升级脚本2；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
+        String upgrade_sql2 = upgradePath + File.separator + "3.4.4-upgrade-2.sql";
+        this.execUpgradeSql(jdbcTemplate, upgrade_sql2);
+        log.info("结束处理3.4.4升级脚本2；时间：" + DateFormatUtils.format(new Date(), DATE_PATTERN));
 
     }
 

distributed-print/src/main/resources/application-base.properties

@@ -95,6 +95,9 @@ com.qmth.logging.file-path=/opt/logs/distributed-print.log
 #com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
 
 com.qmth.sms.server=https://solar.qmth.com.cn
+com.qmth.data.upgrade.run-mode=start
+com.qmth.solar.app-code=teachcloud
+com.qmth.solar.app-version=3.4.4
 
 #============================================================================
 # \u914D\u7F6EJobStore

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/SpecialTagDTO.java

@@ -1,10 +1,13 @@
 package com.qmth.teachcloud.mark.dto.mark;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.mark.entity.MarkArbitrateHistory;
 import com.qmth.teachcloud.mark.entity.MarkHeaderTag;
 import com.qmth.teachcloud.mark.entity.MarkSpecialTag;
 import com.qmth.teachcloud.mark.entity.MarkTask;
+import com.qmth.teachcloud.mark.enums.MarkTaskStatus;
 import com.qmth.teachcloud.mark.params.MarkHeaderGroupResult;
 
 import java.io.Serializable;
@@ -31,6 +34,12 @@ public class SpecialTagDTO implements Serializable {
 
     private Integer offsetY;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
+    private String userName;
+
+    private MarkTaskStatus headerType;
+
     public SpecialTagDTO() {
 
     }
@@ -179,4 +188,27 @@ public class SpecialTagDTO implements Serializable {
         this.tagType = tagType;
     }
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public MarkTaskStatus getHeaderType() {
+        return headerType;
+    }
+
+    public void setHeaderType(MarkTaskStatus headerType) {
+        this.headerType = headerType;
+    }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/dto/mark/manage/TaskQuestion.java

@@ -277,6 +277,10 @@ public class TaskQuestion implements Serializable {
         this.markerTagList = markerTagList;
     }
 
+    public void addMarkTag(SpecialTagDTO tagDTO) {
+        this.markerTagList.add(tagDTO);
+    }
+
     public List<SpecialTagDTO> getHeaderTagList() {
         return headerTagList;
     }
@@ -284,7 +288,9 @@ public class TaskQuestion implements Serializable {
     public void setHeaderTagList(List<SpecialTagDTO> headerTagList) {
         this.headerTagList = headerTagList;
     }
-
+    public void addHeadTag(SpecialTagDTO tagDTO) {
+        this.headerTagList.add(tagDTO);
+    }
     public Double getMarkerScore() {
         return markerScore;
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/TaskServiceImpl.java

@@ -10,6 +10,7 @@ import com.qmth.teachcloud.common.enums.mark.MarkProblemStatus;
 import com.qmth.teachcloud.common.service.SysUserService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.mark.dto.mark.MarkStudentVo;
+import com.qmth.teachcloud.mark.dto.mark.SpecialTagDTO;
 import com.qmth.teachcloud.mark.dto.mark.manage.*;
 import com.qmth.teachcloud.mark.dto.mark.score.SheetUrlDto;
 import com.qmth.teachcloud.mark.dto.mark.score.StudentObjectiveAnswerDto;
@@ -303,6 +304,13 @@ public class TaskServiceImpl implements TaskService {
                     step.addMarkTrack(track);
                 }
 
+                for (SpecialTagDTO tagDTO : markTask.listMarkerTag()) {
+                    SysUser user = sysUserService.getByUserId(markTask.getUserId());
+                    tagDTO.setUserId(markTask.getUserId());
+                    tagDTO.setUserName(user.getRealName() + "(" + user.getLoginName() + ")");
+                    step.addMarkTag(tagDTO);
+                }
+
                 if (CollectionUtils.isNotEmpty(markTask.listHeaderTrack()) && markTask.getTaskNumber() == 1) {
                     for (TrackDTO trackDTO : markTask.listHeaderTrack()) {
                         SysUser sysUser = sysUserService.getByUserId(markTask.getHeaderId());
@@ -313,6 +321,16 @@ public class TaskServiceImpl implements TaskService {
                         trackDTO.setHeaderType(markTask.getStatus());
                         step.addHeadTrack(trackDTO);
                     }
+
+                    for (SpecialTagDTO tagDTO : markTask.listHeaderTag()) {
+                        SysUser sysUser = sysUserService.getByUserId(markTask.getHeaderId());
+                        if (sysUser != null) {
+                            tagDTO.setUserId(sysUser.getId());
+                            tagDTO.setUserName(sysUser.getRealName() + "(" + sysUser.getLoginName() + ")");
+                        }
+                        tagDTO.setHeaderType(markTask.getStatus());
+                        step.addHeadTag(tagDTO);
+                    }
                 }
 
                 // 普通模式无轨迹数据。单独处理评卷员每题得分