Merge branch 'master' of D:\项目\正元安全生产\zhengyuan-danger-chemistry-manage with conflicts.

danger-manage-admin/src/main/java/com/zehong/web/controller/train/TTrainCourseController.java

@@ -65,7 +65,6 @@ public class TTrainCourseController extends BaseController
     @ApiOperation("用户课程考试")
     @GetMapping("/examination")
     public AjaxResult examination(Long userCourseId,String answers){
-
         Map<String,Object> map = tTrainCourseService.examination(userCourseId, answers.split(","));
         return AjaxResult.success(map);
     }

danger-manage-admin/src/main/resources/application-dev.yml

@@ -21,7 +21,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://36.138.181.113:33060/danger_manage_area_a?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://36.138.181.113:33060/danger_manage_area_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: zehong_/sjz!D
             # 从库数据源
@@ -75,11 +75,11 @@ spring:
       # 地址
       host: 127.0.0.1
       # 端口，默认为6379
-      port: 6378
+      port: 6379
       # 数据库索引
       database: 1
       # 密码
-      password: Redis@2021
+      password:
       # 连接超时时间
       timeout: 10s
       lettuce:

danger-manage-admin/src/main/resources/application-prd.yml

@@ -73,7 +73,7 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: localhost
+      host: 127.0.0.1
       # 端口，默认为6379
       port: 6379
       # 数据库索引

danger-manage-admin/src/main/resources/application-test.yml

@@ -21,7 +21,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://36.138.181.113:3306/danger_manage_area_b?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://36.138.181.113:3306/danger_manage_area_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: root@123
             # 从库数据源
@@ -75,11 +75,11 @@ spring:
       # 地址
       host: 127.0.0.1
       # 端口，默认为6379
-      port: 6378
+      port: 6379
       # 数据库索引
       database: 0
       # 密码
-      password: Redis@2021
+      password:
       # 连接超时时间
       timeout: 10s
       lettuce:

danger-manage-system/src/main/java/com/zehong/system/domain/TTrainCourse.java

@@ -54,7 +54,7 @@ public class TTrainCourse extends BaseEntity
     private String video;
 
     /** 答题合格数 */
-    @Excel(name = "答题合格数")
+    @Excel(name = "答题合格分数")
     private Integer qualifiedNum;
 
     /** 录入题数量 */
@@ -91,6 +91,43 @@ public class TTrainCourse extends BaseEntity
 
     private Integer duration;
 
+    /** 多选题分数*/
+    private Integer multipleChoiceScore;
+
+    /**单选题分数*/
+    private Integer singleChoiceScore;
+
+    /**判断题分数*/
+    private Integer judgmentScore;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Integer getMultipleChoiceScore() {
+        return multipleChoiceScore;
+    }
+
+    public void setMultipleChoiceScore(Integer multipleChoiceScore) {
+        this.multipleChoiceScore = multipleChoiceScore;
+    }
+
+    public Integer getSingleChoiceScore() {
+        return singleChoiceScore;
+    }
+
+    public void setSingleChoiceScore(Integer singleChoiceScore) {
+        this.singleChoiceScore = singleChoiceScore;
+    }
+
+    public Integer getJudgmentScore() {
+        return judgmentScore;
+    }
+
+    public void setJudgmentScore(Integer judgmentScore) {
+        this.judgmentScore = judgmentScore;
+    }
+
     public Integer getDuration() {
         return duration;
     }

danger-manage-system/src/main/java/com/zehong/system/domain/TTrainCourseTopic.java

@@ -5,6 +5,8 @@ import com.zehong.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 培训课程题库对象 t_train_course_topic
  *
@@ -31,8 +33,37 @@ public class TTrainCourseTopic extends BaseEntity
     private String topicOption;
 
     /** 答案 */
+//    @Excel(name = "答案")
+//    private Integer answer;
+    /** 答案 */
     @Excel(name = "答案")
-    private Integer answer;
+    private String  answer;
+
+    /** 题目类型  1单选  2多选   3判断 */
+    private Integer topicType;
+
+    /** 答题合格分数*/
+    private Integer qualifiedNum;
+
+    public Integer getQualifiedNum() {
+        return qualifiedNum;
+    }
+
+    public void setQualifiedNum(Integer qualifiedNum) {
+        this.qualifiedNum = qualifiedNum;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Integer getTopicType() {
+        return topicType;
+    }
+
+    public void setTopicType(Integer topicType) {
+        this.topicType = topicType;
+    }
 
     public void setTopicId(Long topicId)
     {
@@ -70,16 +101,16 @@ public class TTrainCourseTopic extends BaseEntity
     {
         return topicOption;
     }
-    public void setAnswer(Integer answer) 
-    {
-        this.answer = answer;
-    }
 
-    public Integer getAnswer() 
-    {
+
+    public String getAnswer() {
         return answer;
     }
 
+    public void setAnswer(String answer) {
+        this.answer = answer;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java

@@ -184,16 +184,18 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String,Object> examination (Long userCourseId,String[] answers){
+        System.out.println(answers[0]);
         TTrainUserCourse userCourse = tTrainUserCourseMapper.selectTTrainUserCourseById(userCourseId);
         TTrainCourseTopic topic = new TTrainCourseTopic();
         topic.setCourseId(userCourse.getCourseId());
         List<TTrainCourseTopic> list = tTrainCourseTopicMapper.selectTTrainCourseTopicList(topic);
         int num = 0;
-        for(Integer i=0;i<answers.length;i++){
-            if(Integer.parseInt(answers[i])==list.get(i).getAnswer()){
-                num++;
-            }
-        }
+//        for(Integer i=0;i<answers.length;i++){
+//            String demosub = list.get(i).getAnswer().substring(1,list.get(i).getAnswer().length()-1);
+//            if(Integer.parseInt(answers[i])==demosub){
+//                num++;
+//            }
+//        }
         userCourse.setExaminationResult(num);
         userCourse.setExaminationTime(new Date());
         TTrainCourse c = tTrainCourseMapper.selectTTrainCourseById(userCourse.getCourseId());

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseTopicServiceImpl.java

@@ -156,7 +156,7 @@ public class TTrainCourseTopicServiceImpl implements ITTrainCourseTopicService
                 courseTopic.setCourseId(batchTopicVo.getCourseId());
                 courseTopic.setTopicTitle(bankSubjects.get(i).getTopicTitle());
                 courseTopic.setTopicOption(bankSubjects.get(i).getTopicOption());
-                courseTopic.setAnswer(bankSubjects.get(i).getAnswer());
+                courseTopic.setAnswer(String.valueOf(bankSubjects.get(i).getAnswer()));
                 courseTopic.setCreateTime(new Date());
                 topics.add(courseTopic);
             }

danger-manage-system/src/main/resources/mapper/system/TTrainCourseMapper.xml

@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="testEndTime"    column="test_end_time"    />
         <result property="testPersons"    column="test_persons"    />
         <result property="duration"  column="duration"    />
+        <result property="multipleChoiceScore"  column="multiple_choice_score"    />
+        <result property="singleChoiceScore"  column="single_choice_score"    />
+        <result property="judgmentScore"  column="judgment_score"    />
     </resultMap>
 
     <resultMap id="StatisticsTrainCourseResult" type="StatisticsTrainCourse">
@@ -39,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTrainCourseVo">
-        select course_id, course_name, course_type, course_conent, status,personnel_type, release_time, enclosure, video, qualified_num, topic_num, create_time, create_user, is_del, data_kind, test_start_time, test_end_time, test_persons,duration from t_train_course
+        select multiple_choice_score,single_choice_score,judgment_score,course_id, course_name, course_type, course_conent, status,personnel_type, release_time, enclosure, video, qualified_num, topic_num, create_time, create_user, is_del, data_kind, test_start_time, test_end_time, test_persons,duration from t_train_course
     </sql>
 
     <select id="selectTTrainCourseList" parameterType="TTrainCourse" resultMap="TTrainCourseResult">
@@ -90,7 +93,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="testEndTime != null">test_end_time,</if>
             <if test="testPersons != null">test_persons,</if>
             <if test="duration != null">duration,</if>
-
+            <if test="multipleChoiceScore != null">multiple_choice_score,</if>
+            <if test="singleChoiceScore != null">single_choice_score,</if>
+            <if test="judgmentScore != null">judgment_score,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="courseName != null">#{courseName},</if>
@@ -111,7 +116,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="testEndTime != null">#{testEndTime},</if>
             <if test="testPersons != null">#{testPersons},</if>
             <if test="duration != null">#{duration},</if>
-
+            <if test="multipleChoiceScore != null">#{multipleChoiceScore},</if>
+            <if test="singleChoiceScore != null">#{singleChoiceScore},</if>
+            <if test="judgmentScore != null">#{judgmentScore},</if>
          </trim>
     </insert>
 
@@ -136,6 +143,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="testEndTime != null">test_end_time = #{testEndTime},</if>
             <if test="testPersons != null">test_persons = #{testPersons},</if>
             <if test="duration != null">duration = #{duration},</if>
+            <if test="multipleChoiceScore != null">multiple_choice_score = #{multipleChoiceScore},</if>
+            <if test="singleChoiceScore != null">single_choice_score = #{singleChoiceScore},</if>
+            <if test="judgmentScore != null">judgment_score = #{judgmentScore},</if>
         </trim>
         where course_id = #{courseId}
     </update>

danger-manage-system/src/main/resources/mapper/system/TTrainCourseTopicMapper.xml

@@ -11,10 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="topicOption"    column="topic_option"    />
         <result property="answer"    column="answer"    />
         <result property="createTime"    column="create_time"    />
+        <result property="topicType"    column="topic_type"    />
     </resultMap>
 
     <sql id="selectTTrainCourseTopicVo">
-        select topic_id, course_id, topic_title, topic_option, answer, create_time from t_train_course_topic
+        select topic_id, course_id, topic_title, topic_option, answer, create_time,topic_type from t_train_course_topic
     </sql>
 
     <select id="selectTTrainCourseTopicList" parameterType="TTrainCourseTopic" resultMap="TTrainCourseTopicResult">
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     <select id="selectCourseTopicList" resultMap="TTrainCourseTopicResult">
-                select topic_id, course_id, topic_title, topic_option, answer, create_time from t_train_course_topic
+                select topic_id, course_id, topic_title, topic_option, answer, create_time,topic_type from t_train_course_topic
         WHERE course_id = #{courseId}
     </select>
     <select id="selectTTrainCourseTopicById" parameterType="Long" resultMap="TTrainCourseTopicResult">
@@ -44,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="topicOption != null">topic_option,</if>
             <if test="answer != null">answer,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="topicType != null">topic_type</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="topicId != null">#{topicId},</if>
@@ -52,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="topicOption != null">#{topicOption},</if>
             <if test="answer != null">#{answer},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="topicType != null">#{topicType},</if>
          </trim>
     </insert>
 
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="topicOption != null">topic_option = #{topicOption},</if>
             <if test="answer != null">answer = #{answer},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="topicType != null">topic_type= #{topicType}</if>
         </trim>
         where topic_id = #{topicId}
     </update>

danger-manage-web/package.json

@@ -46,6 +46,7 @@
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
+    "qrcodejs2": "^0.0.2",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
@@ -54,6 +55,7 @@
     "vue-cropper": "0.5.5",
     "vue-esign": "^1.1.4",
     "vue-print-nb": "^1.7.5",
+    "vue-qr": "^4.0.9",
     "vue-router": "3.4.9",
     "vue-video-player": "5.0.2",
     "vuedraggable": "2.24.3",

danger-manage-web/vue.config.js

@@ -35,7 +35,6 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: process.env.VUE_APP_TARGET,
-        target: `http://192.168.2.21:8908/dangerManage`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''