jidechao 1 month ago
parent
commit
f7a8d57a7e
2 changed files with 9 additions and 6 deletions
  1. 1 1
      model/mysql.js
  2. 8 5
      routes/router.js

+ 1 - 1
model/mysql.js

@@ -15,7 +15,7 @@ us.mysqlconnection = function (host, database) {
             user: "root", //用户名
             user: "root", //用户名
             password: "cocorobo", //密码
             password: "cocorobo", //密码
             database: database, //数据库名称
             database: database, //数据库名称
-            port: 3306 //端口 20007
+            port: 20007 //端口 20007
         }); //连接超时和错误从连
         }); //连接超时和错误从连
     }
     }
     //connectionLimit: 1000, 
     //connectionLimit: 1000, 

+ 8 - 5
routes/router.js

@@ -1,9 +1,9 @@
 var express = require('express');
 var express = require('express');
 var router = express.Router();
 var router = express.Router();
 var mysql = require('../model/mysql');
 var mysql = require('../model/mysql');
-const _mysqluser = ["172.16.12.5", "registration"]; //用戶數據庫信息
+// const _mysqluser = ["172.16.12.5", "registration"]; //用戶數據庫信息
 
 
-// const _mysqluser = ["183.36.25.93", "registration"]; //本地测试用戶數據庫信息
+const _mysqluser = ["183.36.25.93", "registration"]; //本地测试用戶數據庫信息
 const crypto = require('crypto');
 const crypto = require('crypto');
 const XLSX = require('xlsx');
 const XLSX = require('xlsx');
 
 
@@ -13,8 +13,9 @@ router.route('/user').post(async function (req, res) {
     const uuid = crypto.randomUUID();
     const uuid = crypto.randomUUID();
 
 
     let userData = JSON.parse(reqData.user);
     let userData = JSON.parse(reqData.user);
-    await mysql.usselect([_mysqluser[0], _mysqluser[1], "select_registration_user", reqData.idCard,reqData.type], function (r) {
-        if (r[0] && r[0][0] && r[0][0]['count(id)'] != 0) {
+    await mysql.usselect([_mysqluser[0], _mysqluser[1], "select_registration_user", reqData.idCard], function (r) {
+        console.log(r[0] && r[0] ,r[0].some(item => item['type'] == Number(reqData.type)));
+        if (r[0] && r[0].some(item => item['type'] == Number(reqData.type))) {
             res.send({ status: 'error', message: '选手报名失败,选手身份证号已存在' });
             res.send({ status: 'error', message: '选手报名失败,选手身份证号已存在' });
         } else {
         } else {
             const insertUserPromises = userData.map(item => {
             const insertUserPromises = userData.map(item => {
@@ -23,6 +24,7 @@ router.route('/user').post(async function (req, res) {
                     userList.unshift(_mysqluser[0], _mysqluser[1], "insert_registration_users", item.name, item.gender, item.ethnicity, item.birthdate, item.email, item.id_number, item.group, item.grade, item.school, item.schoolRegion, item.phone, uuid);
                     userList.unshift(_mysqluser[0], _mysqluser[1], "insert_registration_users", item.name, item.gender, item.ethnicity, item.birthdate, item.email, item.id_number, item.group, item.grade, item.school, item.schoolRegion, item.phone, uuid);
                     mysql.usselect(userList, function (data) {
                     mysql.usselect(userList, function (data) {
                         // 可以根据 data 判断是否插入成功
                         // 可以根据 data 判断是否插入成功
+                        console.log("insert_registration_users",data);
                         if (data != 0) {
                         if (data != 0) {
                             resolve(data);
                             resolve(data);
                         } else {
                         } else {
@@ -93,7 +95,8 @@ router.route('/exportData').get(async function (req, res) {
                     学校: item.user_school,
                     学校: item.user_school,
                     学校地区: item.user_school_region,
                     学校地区: item.user_school_region,
                     电话: item.user_phone,
                     电话: item.user_phone,
-                    上传文件: item.registration_form_url,
+                    上传文件: item.registration_form_url.split(",")[0],
+                    上传视频: item.registration_form_url.split(",")[1],
                     报名时间: new Date(item.created_at).toLocaleString()
                     报名时间: new Date(item.created_at).toLocaleString()
                 }
                 }
             });
             });