From 41d1064f3b2a1a5a317202963a4b9f2a394fa7ed Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Fri, 18 Jun 2021 10:38:30 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/ht/bean/dto/QuestionDto.java   |  2 +-
 .../ht/bean/dto/message/MessageDto.java       |  2 +
 .../com/ccsens/ht/bean/vo/QuestionShowVo.java |  9 ++-
 .../ccsens/ht/service/QuestionService.java    | 56 ++++++++++---------
 ht/src/main/resources/application.yml         |  4 +-
 .../mapper_dao/HtQuestionOptionDescDao.xml    |  4 +-
 .../util/bean/message/common/MessageRule.java |  8 +--
 7 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java
index 6a1ab2d1..606abaf7 100644
--- a/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java
+++ b/ht/src/main/java/com/ccsens/ht/bean/dto/QuestionDto.java
@@ -43,7 +43,7 @@ public class QuestionDto {
         @ApiModelProperty("选项集合")
         private List<Option> options;
         @ApiModelProperty("病友画图或录音")
-        private String path;
+        private List<String> paths;
     }
     @Data
     @ApiModel("QuestionDtoOption")
diff --git a/ht/src/main/java/com/ccsens/ht/bean/dto/message/MessageDto.java b/ht/src/main/java/com/ccsens/ht/bean/dto/message/MessageDto.java
index 58a96628..8e4f85b7 100644
--- a/ht/src/main/java/com/ccsens/ht/bean/dto/message/MessageDto.java
+++ b/ht/src/main/java/com/ccsens/ht/bean/dto/message/MessageDto.java
@@ -28,6 +28,8 @@ public class MessageDto<T> {
     @ApiModel("通知跳转到指定题目")
     @Data
     public static final class QuestionInform{
+        @ApiModelProperty("taskId")
+        private Long taskId;
         @ApiModelProperty("提醒文案")
         private String content;
         @ApiModelProperty("量表")
diff --git a/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionShowVo.java b/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionShowVo.java
index 0cf23701..dcf1d750 100644
--- a/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionShowVo.java
+++ b/ht/src/main/java/com/ccsens/ht/bean/vo/QuestionShowVo.java
@@ -18,7 +18,7 @@ public class QuestionShowVo {
     @Data
     @ApiModel("显示信息")
     public static class Show{
-        @ApiModelProperty("类型 0：倒计时 1：限制选项数量 2：选中某些指定选项执行操作 3:显示内容")
+        @ApiModelProperty("类型 0：倒计时 1：限制选项数量 2：不是选中指定选项执行操作 3:显示内容")
         private byte showType;
     }
 
@@ -66,10 +66,13 @@ public class QuestionShowVo {
     @ApiModel("倒计时配置")
     @Data
     public static class MesTimer {
-        @ApiModelProperty("提醒文案")
-        private String content;
+
         @ApiModelProperty("限制类型 0:跳转指定题目")
         private byte type;
+        @ApiModelProperty("taskId")
+        private Long taskId;
+        @ApiModelProperty("提醒文案")
+        private String content;
         @ApiModelProperty("量表")
         private String code;
         @ApiModelProperty("序号")
diff --git a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
index ea498a0b..3797ae20 100644
--- a/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
+++ b/ht/src/main/java/com/ccsens/ht/service/QuestionService.java
@@ -365,41 +365,43 @@ public class QuestionService implements IQuestionService {
     }
 
     private void saveAnswerRecord(QuestionDto.Score score, HtQuestion question) {
-        if (StrUtil.isNotBlank(score.getPath())) {
-            HtPatientQuestionRecordExample example = new HtPatientQuestionRecordExample();
-            String type;
-            switch (question.getOperateType()) {
-                //语音
-                case Constant.Ht.Operation.VOICE:
+        if (CollectionUtil.isEmpty(score.getPaths())) {
+            return;
+        }
+        String type;
+        switch (question.getOperateType()) {
+            //语音
+            case Constant.Ht.Operation.VOICE:
                 //敲击
-                case Constant.Ht.Operation.KNOCK:
-                    type = Constant.Ht.Record.ANSWER_AUDIO;
-                    break;
-                //画图
-                case Constant.Ht.Operation.PAINT:
-                case Constant.Ht.Operation.PAINT_HALF:
-                case Constant.Ht.Operation.PAINT_HALF_IMG:
-                case Constant.Ht.Operation.PAINT_NO_IMG:
-                    type = Constant.Ht.Record.ANSWER_IMG;
-                    break;
-                default:
-                    type = Constant.Ht.Record.ANSWER_TEXT;
-                    break;
-            }
-            example.createCriteria().andPatientReportIdEqualTo(score.getPatientReportId()).andQuestionIdEqualTo(score.getQuestionId()).andRecordTypeEqualTo(type);
-            HtPatientQuestionRecord delRecord = new HtPatientQuestionRecord();
-            delRecord.setIsDel(Constant.Ht.IS_DEL);
-            htPatientQuestionRecordMapper.updateByExampleSelective(delRecord, example);
-
+            case Constant.Ht.Operation.KNOCK:
+                type = Constant.Ht.Record.ANSWER_AUDIO;
+                break;
+            //画图
+            case Constant.Ht.Operation.PAINT:
+            case Constant.Ht.Operation.PAINT_HALF:
+            case Constant.Ht.Operation.PAINT_HALF_IMG:
+            case Constant.Ht.Operation.PAINT_NO_IMG:
+                type = Constant.Ht.Record.ANSWER_IMG;
+                break;
+            default:
+                type = Constant.Ht.Record.ANSWER_TEXT;
+                break;
+        }
+        HtPatientQuestionRecordExample example = new HtPatientQuestionRecordExample();
+        example.createCriteria().andPatientReportIdEqualTo(score.getPatientReportId()).andQuestionIdEqualTo(score.getQuestionId()).andRecordTypeEqualTo(type);
+        HtPatientQuestionRecord delRecord = new HtPatientQuestionRecord();
+        delRecord.setIsDel(Constant.Ht.IS_DEL);
+        htPatientQuestionRecordMapper.updateByExampleSelective(delRecord, example);
+        score.getPaths().forEach(path->{
             HtPatientQuestionRecord record = new HtPatientQuestionRecord();
             record.setId(snowflake.nextId());
             record.setPatientReportId(score.getPatientReportId());
             record.setQuestionId(score.getQuestionId());
             record.setRecordTime(System.currentTimeMillis());
             record.setRecordType(type);
-            record.setRecordValue(score.getPath());
+            record.setRecordValue(path);
             htPatientQuestionRecordMapper.insertSelective(record);
-        }
+        });
     }
 
     private void countScore(QuestionDto.Score score, String parentCode, HtPatientReport report, List<HtPatientScore> scores, HtQuestionScoringRule rule) {
diff --git a/ht/src/main/resources/application.yml b/ht/src/main/resources/application.yml
index b9b264a7..f59084b0 100644
--- a/ht/src/main/resources/application.yml
+++ b/ht/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: test
+    include: common, util-test
 
diff --git a/ht/src/main/resources/mapper_dao/HtQuestionOptionDescDao.xml b/ht/src/main/resources/mapper_dao/HtQuestionOptionDescDao.xml
index 01d349a6..2f1a5405 100644
--- a/ht/src/main/resources/mapper_dao/HtQuestionOptionDescDao.xml
+++ b/ht/src/main/resources/mapper_dao/HtQuestionOptionDescDao.xml
@@ -6,14 +6,14 @@
   <insert id="insertBatch">
     replace into t_ht_question_option_desc (id, option_id, type,
     sort, content, remark)
-    values
+    valuesrec_status
     <foreach collection="list" item="item" separator=",">
       (#{item.id}, #{item.optionId}, #{item.type}, #{item.sort},
       #{item.content}, #{item.remark})
     </foreach>
   </insert>
   <delete id="delete">
-    update t_ht_question_option_desc set rec_status = 0 where option_id in
+    update t_ht_question_option_desc set is_del = 1 where option_id in
     <foreach collection="list" item="item" open="(" close=")" separator=",">
       #{item}
     </foreach>
diff --git a/util/src/main/java/com/ccsens/util/bean/message/common/MessageRule.java b/util/src/main/java/com/ccsens/util/bean/message/common/MessageRule.java
index 7624fb2f..e994c479 100644
--- a/util/src/main/java/com/ccsens/util/bean/message/common/MessageRule.java
+++ b/util/src/main/java/com/ccsens/util/bean/message/common/MessageRule.java
@@ -64,11 +64,7 @@ public class MessageRule {
                 messageRule = new MessageRule((byte) 0, AckRule.ALWAYS, 10, (byte) 1,0L);
                 break;
             case Queue:
-                messageRule = new MessageRule((byte) 1, AckRule.ALWAYS, 10,  (byte) 1,0L);
-                break;
             case Rest:
-                messageRule = new MessageRule((byte) 1, AckRule.ALWAYS, 10,  (byte) 1,0L);
-                break;
             case Server:
                 messageRule = new MessageRule((byte) 1, AckRule.ALWAYS, 10,  (byte) 1,0L);
                 break;
@@ -80,13 +76,13 @@ public class MessageRule {
 
     /**
      * 不需要回复ACK，离线状态直接丢弃
-     * @return
+     * @return messageRule
      */
     public static MessageRule noAck(){
         MessageRule rule = new MessageRule();
         rule.setAckRule(MessageRule.AckRule.NONE);
         rule.setOfflineDiscard((byte) 1);
-        rule.setNoAckRetryTimes(3);
+        rule.setNoAckRetryTimes(1);
         return rule;
     }
 }