Browse Source

✨ feat: 增强代码健壮性

Pchen. 8 months ago
parent
commit
3bfaa62403

+ 1 - 1
apis/Lepao/Record/Admin/GetLepaoRecords.js

@@ -60,7 +60,7 @@ class AdminGetLepaoRecords extends API {
                     a.user_avatar
                     a.user_avatar
                 FROM 
                 FROM 
                     lepao_record r
                     lepao_record r
-                JOIN 
+                LEFT JOIN 
                     lepao_account a
                     lepao_account a
                 ON 
                 ON 
                     r.lepao_account = a.student_num
                     r.lepao_account = a.student_num

+ 2 - 2
apis/Lepao/Record/Admin/GetRecordDetail.js

@@ -46,11 +46,11 @@ class AdminGetRecordDetail extends API {
                     p.data
                     p.data
                 FROM 
                 FROM 
                     lepao_record r
                     lepao_record r
-                JOIN 
+                LEFT JOIN 
                     lepao_account a
                     lepao_account a
                 ON 
                 ON 
                     r.lepao_account = a.student_num
                     r.lepao_account = a.student_num
-                JOIN
+                LEFT JOIN
                     path_data p
                     path_data p
                 ON 
                 ON 
                     r.path_id = p.id
                     r.path_id = p.id

+ 1 - 1
apis/Lepao/Record/GetLepaoRecords.js

@@ -53,7 +53,7 @@ class GetLepaoRecords extends API {
                     a.user_avatar
                     a.user_avatar
                 FROM 
                 FROM 
                     lepao_record r
                     lepao_record r
-                JOIN 
+                LEFT JOIN 
                     lepao_account a
                     lepao_account a
                 ON 
                 ON 
                     r.lepao_account = a.student_num
                     r.lepao_account = a.student_num

+ 2 - 2
apis/Lepao/Record/GetRecordDetail.js

@@ -38,11 +38,11 @@ class GetRecordDetail extends API {
                     p.data
                     p.data
                 FROM 
                 FROM 
                     lepao_record r
                     lepao_record r
-                JOIN 
+                LEFT JOIN 
                     lepao_account a
                     lepao_account a
                 ON 
                 ON 
                     r.lepao_account = a.student_num
                     r.lepao_account = a.student_num
-                JOIN
+                LEFT JOIN
                     path_data p
                     path_data p
                 ON 
                 ON 
                     r.path_id = p.id
                     r.path_id = p.id

+ 11 - 9
lib/Lepao/Lepao.js

@@ -100,7 +100,16 @@ class Lepao {
             // 更换跑区
             // 更换跑区
             this.logger.info(`${account}开始更换跑区,path_id=${path_id}`)
             this.logger.info(`${account}开始更换跑区,path_id=${path_id}`)
             const zoneUrl = this.runpy + '/set_zone'
             const zoneUrl = this.runpy + '/set_zone'
-            const ossData = { uid, token, school_id, student_id: account, random_id: path_id }
+
+            // 晚上10点后提前
+            let run_end_time = Math.floor(Date.now() / 1000) - 300 // 提前5分钟
+            let hour = new Date().getHours()
+            if (hour >= 22) {
+                this.logger.info(`${account}当前时间为${hour}点,调整run_end_time提前5小时`)
+                run_end_time -= 18000
+            }
+
+            const ossData = { uid, token, school_id, student_id: account, random_id: path_id, run_end_time }
 
 
             try {
             try {
                 const zoneRes = await axios.post(zoneUrl, ossData)
                 const zoneRes = await axios.post(zoneUrl, ossData)
@@ -124,6 +133,7 @@ class Lepao {
 
 
             try {
             try {
                 const ossRes = await axios.post(ossUrl, ossData)
                 const ossRes = await axios.post(ossUrl, ossData)
+
                 const { data } = ossRes
                 const { data } = ossRes
                 this.logger.info(`${account}上传OSS记录返回结果: ${JSON.stringify(data)}`)
                 this.logger.info(`${account}上传OSS记录返回结果: ${JSON.stringify(data)}`)
                 if (!data || data.code !== 200 || !data.oss_path) {
                 if (!data || data.code !== 200 || !data.oss_path) {
@@ -143,14 +153,6 @@ class Lepao {
             await db.query(useLepaoCountSql, [uuid])
             await db.query(useLepaoCountSql, [uuid])
             this.logger.info(`${account}扣减乐跑次数完成`)
             this.logger.info(`${account}扣减乐跑次数完成`)
 
 
-            // 晚上10点后提前
-            let run_end_time = Math.floor(Date.now() / 1000)
-            let hour = new Date().getHours()
-            if (hour >= 22) {
-                this.logger.info(`${account}当前时间为${hour}点,调整run_end_time提前5小时`)
-                run_end_time -= 18000
-            }
-
             const lepaoData = {
             const lepaoData = {
                 uid,
                 uid,
                 token,
                 token,