添加训练类型

src/main/java/com/ccsens/yanyuan/api/tall/ProjectController.java

@@ -1,6 +1,5 @@
 package com.ccsens.yanyuan.api.tall;
 
-import com.ccsens.common.bean.dto.CProjectDto;
 import com.ccsens.common.bean.vo.CProjectVo;
 import com.ccsens.common.service.IProjectService;
 import com.ccsens.util.JsonResponse;
@@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @author 逗

src/main/java/com/ccsens/yanyuan/bean/vo/TaskVo.java

@@ -1,8 +1,8 @@
 package com.ccsens.yanyuan.bean.vo;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.common.bean.vo.CTaskVo;
 import com.ccsens.yanyuan.util.YanYuanConstant;
 import io.swagger.annotations.ApiModel;
@@ -11,7 +11,6 @@ import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -107,7 +106,9 @@ public class TaskVo {
     @Data
     @ApiModel("训练计划")
     public static class Train {
-        @ApiModelProperty("训练类型")
+        @ApiModelProperty("题目类型 0:训练 1:休息")
+        private Byte trainType;
+        @ApiModelProperty("工具类型")
         private String trainAidCode;
         @ApiModelProperty("训练计划ID")
         private Long recordId;
@@ -129,6 +130,13 @@ public class TaskVo {
         private List<TrainContentVo.TrainRecord> trains;
         @ApiModelProperty("工具箱")
         private List<TrainContentVo.ScanTool> tools;
+
+        public String getContent() {
+            if (StrUtil.isEmpty(content) && trainType == YanYuanConstant.Train.TYPE_RELAX) {
+                this.content = "休息";
+            }
+            return content;
+        }
     }
 
 

src/main/java/com/ccsens/yanyuan/service/TrainPlanService.java

@@ -12,6 +12,7 @@ import com.ccsens.yanyuan.persist.dao.*;
 import com.ccsens.yanyuan.persist.mapper.ToolEquipmentMapper;
 import com.ccsens.yanyuan.persist.mapper.TrainEquipmentMapper;
 import com.ccsens.yanyuan.util.YanYuanCodeError;
+import com.ccsens.yanyuan.util.YanYuanConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -55,6 +56,10 @@ public class TrainPlanService implements ITrainPlanService {
 
     @Override
     public void perfectTrain(TaskVo.Train train, Long userId) {
+        if(train.getTrainType() == null || train.getTrainType() == YanYuanConstant.Train.TYPE_RELAX) {
+            log.info("休息");
+            return;
+        }
         // 查询题目补充
         TrainContentVo.SupplementaryMessage supplementaryMessage = trainContentDao.querySupplementaries(train.getContentId());
         if (supplementaryMessage != null) {

src/main/java/com/ccsens/yanyuan/util/YanYuanConstant.java

@@ -45,10 +45,6 @@ public class YanYuanConstant {
         public final static byte TYPE_TRAIN = 0;
         public final static byte TYPE_RELAX = 1;
 
-        public final static byte CONTENT_TYPE_PURPOSE = 0;
-        public final static byte CONTENT_TYPE_ELEMENT = 1;
-        public final static byte CONTENT_TYPE_PRINCIPLE = 2;
-        public final static byte CONTENT_TYPE_STEP = 3;
 
 
     }

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test

src/main/resources/mapper_dao/TrainRecordDao.xml

@@ -9,7 +9,8 @@
         </foreach>
     </insert>
     <select id="queryByMental" resultType="com.ccsens.yanyuan.bean.vo.TaskVo$Train">
-        select a.`code` as trainAidCode, r.id as recordId, c.id as contentId, c.content, c.level, r.start_time as startTime, avg(tr.finish_result) as finishResult
+        select a.`code` as trainAidCode, r.id as recordId, r.train_type as trainType,
+        c.id as contentId, c.content, c.level, r.start_time as startTime, avg(tr.finish_result) as finishResult
         from u_train_record r
         left join t_train_content c on r.question_id = c.id and c.rec_status = 0
         left join t_train_aid a on c.aid_id = a.id and a.rec_status = 0
@@ -19,7 +20,8 @@
         order by r.start_time, r.id
     </select>
     <select id="queryById" resultType="com.ccsens.yanyuan.bean.vo.TaskVo$Train">
-        select a.`code` as trainAidCode, r.id as recordId, c.id as contentId, c.content, c.level, r.start_time as startTime, avg(tr.finish_result) as finishResult
+        select a.`code` as trainAidCode, r.id as recordId, r.train_type as trainType,
+        c.id as contentId, c.content, c.level, r.start_time as startTime, avg(tr.finish_result) as finishResult
         from u_train_record r
         left join t_train_content c on r.question_id = c.id and c.rec_status = 0
         left join t_train_aid a on c.aid_id = a.id and a.rec_status = 0