update

cmd/config-linux.yaml

@@ -10,5 +10,5 @@ database:
 mq:
   name: nats
   # host: nats://177.7.0.14:4222
-  host: nats://127.0.0.1:14301
+  host: nats://127.0.0.1:14223
 

config-linux.yaml

@@ -10,5 +10,5 @@ database:
 mq:
   name: nats
   # host: nats://177.7.0.14:4222
-  host: nats://127.0.0.1:14301
+  host: nats://127.0.0.1:14223
 

config/config.go

@@ -2,12 +2,13 @@ package config
 
 import (
 	"fmt"
+	"log"
+	"runtime"
+
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
 	"github.com/nats-io/nats.go"
 	"github.com/spf13/viper"
-	"log"
-	"runtime"
 )
 
 type Config struct {
@@ -33,9 +34,9 @@ var DB *sqlx.DB
 var JS nats.JetStreamContext
 
 func InitConf() {
-	if runtime.GOOS=="linux"{
+	if runtime.GOOS == "linux" {
 		viper.SetConfigFile("./config-linux.yaml")
-	}else{
+	} else {
 		viper.SetConfigFile("./config.yaml")
 	}
 
@@ -82,5 +83,5 @@ func init() {
 	InitDataBase()
 
 	// 3、初始化MQ
-	InitMQ()
+	// InitMQ()
 }

dao/dao-exam-record.go

@@ -30,7 +30,9 @@ func AddExamRecord(er *entity.ExamRecord) *result.Result {
 	if err != nil {
 		return result.UNKNOW_ERROR.SetData(err)
 	}
-
+	fmt.Println("--------------------ADDTOKEN--------------------------------")
+	fmt.Printf("ID:%d\n", er.Id)
+	fmt.Printf("TOKEN:%s\n", uuId)
 	return result.SuccessResult(gin.H{
 		"id":    er.Id,
 		"token": uuId,
@@ -176,7 +178,6 @@ where u.id = ? and e.delete_at is null and er.status!=0 `
 }
 
 func UpdateExamRecord(erv *vo.ExamRecordVo) *result.Result {
-
 	tx, err := config.DB.Beginx()
 	return utils.Transation(tx, err, func(tx *sqlx.Tx) *result.Result {
 		// 1、查询是否存在该记录
@@ -186,10 +187,13 @@ from exam_record er
 where er.id = ?
   and er.token = ?
 and er.update_at - er.create_at <= e.duration
-		and e.end_at < ?
+		and e.end_at > ?
 `
+		fmt.Println("--------------------UPDATETOKEN--------------------------------")
+		fmt.Printf("ID:%d\n", erv.Id)
+		fmt.Printf("TOKEN:%s\n", erv.Token)
 
-		err = tx.Get(erv, sqlStr, erv.Id, erv.Token)
+		err = tx.Get(erv, sqlStr, erv.Id, erv.Token, time.Now())
 		if err != nil {
 			if err == sql.ErrNoRows {
 				return result.DATA_NOT_FOUND.SetMsg("该场考试已过期")
@@ -237,6 +241,9 @@ and er.update_at - er.create_at <= e.duration
 				return result.UNKNOW_ERROR.SetMsg("不存在该试题")
 			}
 
+			fmt.Printf("answerId:%d\n", &answerVo.Id)
+			fmt.Printf("owner:%s\n", answerVo.OwnAnswer)
+
 			var score int
 			sqlStr = "select count(id) from subject where id=? and answer=?"
 			err = tx.Get(&score, sqlStr, answerVo.Id, utils.SubjectSort(answerVo.OwnAnswer))
@@ -254,9 +261,10 @@ and er.update_at - er.create_at <= e.duration
 		anwserData, err = json.Marshal(erv.AnswerVo)
 
 		// 插入记录表
-		sqlStr = "update  exam_record set score=?,answer=?,update_at=? where id=? and delete_at is null "
+		sqlStr = "update exam_record set score=?,answer=?,update_at=? where id=? and delete_at is null "
 
 		res, err = tx.Exec(sqlStr, toatalScore, string(anwserData), time.Now(), erv.Id)
+
 		if err != nil {
 			return result.UNKNOW_ERROR.SetData(err)
 		}
@@ -498,6 +506,7 @@ func UpdateExamRecordTask(examId int) *result.Result {
 	return utils.Transation(tx, err, func(tx *sqlx.Tx) *result.Result {
 		var ervs []*vo.ExamRecordVo
 		// 1、查询是否存在该记录
+		// 考试已结束
 		sqlStr := `select er.id, er.exam_id
 from exam_record er
          left join exam e on e.id = er.exam_id
@@ -552,16 +561,40 @@ where e.id = ? and e.end_at < ?
 				subIds = append(subIds, subIdsVo...)
 			}
 
+			// 2.1 构造一个key为id的 map
+			subIdMap := make(map[int]int, 0)
+			for _, subId := range subIds {
+				subIdMap[*subId.Id] = *subId.Score
+			}
+
 			// 2、 批量查询id
 			toatalScore := 0
-			avos := make([]*vo.AnswerVo, 0, len(subIds))
-			for _, subId := range subIds {
-				avo := vo.AnswerVo{Id: subId.Id, OwnAnswer: "-1"}
-				avos = append(avos, &avo)
+			for _, answerVo := range erv.AnswerVo {
+				// 判断提交的试题是否在考试范围内
+				// if _, ok := subIdMap[*answerVo.Id]; !ok {
+				// 	return result.UNKNOW_ERROR.SetMsg("不存在该试题")
+				// }
+
+				var score int
+				sqlStr = "select count(id) from subject where id=? and answer=?"
+				err = tx.Get(&score, sqlStr, answerVo.Id, utils.SubjectSort(answerVo.OwnAnswer))
+				if err != nil {
+					return result.UNKNOW_ERROR.SetMsg(err.Error())
+				}
+				toatalScore += score * subIdMap[*answerVo.Id]
+
+				fmt.Println("=========TASK==========================")
+				fmt.Println(toatalScore)
+				delete(subIdMap, *answerVo.Id)
 			}
+			// if len(subIdMap) != 0 {
+			// 	return result.UNKNOW_ERROR.SetMsg("试题提交不完整")
+			// }
 
 			var anwserData []byte
-			anwserData, err = json.Marshal(avos)
+			anwserData, err = json.Marshal(erv.AnswerVo)
+			fmt.Println("=========TASK-ANSER==========================")
+			fmt.Println(string(anwserData))
 
 			// 插入记录表
 			_, err = updateErScore.Exec(toatalScore, string(anwserData), time.Now(), erv.Id)

docker-compose.yml

@@ -1,48 +1,49 @@
-version: '3'
-networks:
-  network:
-    ipam:
-      driver: default
-      config:
-        - subnet: '177.7.0.0/16'
+version: '3.8'
+# networks:
+#   network:
+#     ipam:
+#       driver: default
+#       config:
+#         - subnet: '177.7.0.0/16'
 
 services:
-  exam:
-    restart: always
-    image: registry.cn-chengdu.aliyuncs.com/infish/exam:1.0.0
-    container_name: exam
-    ports:
-      - "3001:3000"
-    networks:
-      network:
-        # 在network网络下的容器内部的Ipv4地址
-        ipv4_address: 177.7.0.12
-  mysql:
-    restart: always
-    image: mysql:8.0
-    container_name: mysql_exam
-    environment:
-      - MYSQL_ROOT_PASSWORD=zyhd2022
-      - MYSQL_DATABASE=exam
-      - TZ=Asia/Shanghai
-    volumes:
-      - ./datadir:/var/lib/mysql
-      - ./conf/my.cnf:/etc/my.cnf
-      - ./olddata/:/docker-entrypoint-initdb.d
-    ports:
-      - 3306:3306
-    networks:
-      network:
-        # 在network网络下的容器内部的Ipv4地址
-        ipv4_address: 177.7.0.13
+  # exam:
+  #   restart: always
+  #   image: registry.cn-chengdu.aliyuncs.com/infish/exam:1.0.0
+  #   container_name: exam
+  #   ports:
+  #     - "3001:3000"
+  #   networks:
+  #     network:
+  #       # 在network网络下的容器内部的Ipv4地址
+  #       ipv4_address: 177.7.0.12
+  # mysql:
+  #   restart: always
+  #   image: mysql:8.0
+  #   container_name: mysql_exam
+  #   environment:
+  #     - MYSQL_ROOT_PASSWORD=zyhd2022
+  #     - MYSQL_DATABASE=exam
+  #     - TZ=Asia/Shanghai
+  #   volumes:
+  #     - ./datadir:/var/lib/mysql
+  #     - ./conf/my.cnf:/etc/my.cnf
+  #     - ./olddata/:/docker-entrypoint-initdb.d
+  #   ports:
+  #     - 3306:3306
+  #   networks:
+  #     network:
+  #       # 在network网络下的容器内部的Ipv4地址
+  #       ipv4_address: 177.7.0.13
   nats:
     restart: always
     image: nats:latest
     container_name: nats_exam
     ports:
-      -  4223:4222
+      # -  4223:4222
+      -  14223:4222
     command: "--js --http_port 8222"
-    networks:
-      network:
-        # 在network网络下的容器内部的Ipv4地址
-        ipv4_address: 177.7.0.14
+    # networks:
+    #   network:
+    #     # 在network网络下的容器内部的Ipv4地址
+    #     ipv4_address: 177.7.0.14

router/router-exam-record.go

@@ -48,7 +48,7 @@ func ExamRecord(router *RouterPlus) {
 
 	}
 
-	go UpdateExamRecordTask()
+	// go UpdateExamRecordTask()
 
 }
 func UpdateExamRecordTask() {