주석정리, 사망확률 수정

김주희
Commit c689c33f70b8daeaab402774121ae3d17e59298d c689c33f 1 parent 6e51260f
Showing 1 changed file with 2 additions and 25 deletions
lib/socketio.js
--- a/lib/socketio.js
View file @c689c33
+++ b/lib/socketio.js
View file @c689c33
-//const db = require('./db.js');
-//const db_traffic = require('./db_traffic.js');
 const db_total = require('./db_total.js'); //DB 합침
 const secret_key = require('../keys/api_option').key;
 const secret_key_traffic = require('../keys/api_option_traffic').key;
@@ -33,13 +31,6 @@ module.exports = (server, app) => {
     let info = {} //;?
     let Current_TrafficAcc = {};
-    //let sql_traffic;
-    //let DeathNum_index = {}; //사망자
-    //let M_HurtNum_index = {}; //중상자
-    //let L_HurtNum_index = {}; //경상자
-    //let LocalName_index = {}; //지역 이름
-    //let OccurNum_index = {}; //발생 건수
-    //afos_fid: 다발지역 FID, bjd_cd: 법정동 코드, spot_cd:지점코드
     //API 호출_Weather
     const req_API = (when, what) => {
@@ -57,7 +48,7 @@ module.exports = (server, app) => {
                     // api의 response이 있을경우 promise resolve 호출
                     if (api_res) {
-                        console.log("calling weather & trafffic api");
+                        console.log("calling weather api");
                         resolve(api_body);
                     }
                 });
@@ -104,11 +95,6 @@ module.exports = (server, app) => {
             Ultra_Violet_index = await req_API("index", "uv"); //자외선지수
             Current_TrafficAcc = await req_API_traffic("frequentzoneLg", "getRestFrequentzoneLg"); //cate1, cate2           
-            /*DeathNum_index = await req_API_traffic("frequentzoneLg", "getRestFrequentzoneLg");
-            M_HurtNum_index = await req_API_traffic("frequentzoneLg", "getRestFrequentzoneLg");
-            L_HurtNum_index = await req_API_traffic("frequentzoneLg", "getRestFrequentzoneLg");
-            LocalName_index = await req_API_traffic("frequentzoneLg", "getRestFrequentzoneLg");
-            OccurNum_index = await req_API_traffic("frequentzoneLg", "getRestFrequentzoneLg");*/
             info = {
                 heat: Heat_index.weather.wIndex.heatIndex[0].current.index, //열지수
@@ -147,7 +133,7 @@ module.exports = (server, app) => {
             info.death_prob = (
                 (info.heat / 50) + (Math.abs(info.sensible_temperature - 15) / 10) + (info.discomport / 10) + (info.UV / 10)
                 + info.windspd * 1 + (info.rain / 10) + (Math.abs(info.current_temperature - 15) / 10)
-                + (info.death_number / 50) + (info.midhurt_number / 80) + (info.lighthurt_number / 90) + (info.occur_number / 90)
+                + (info.death_number / 60) + (info.midhurt_number / 80) + (info.lighthurt_number / 90) + (info.occur_number / 90)
             );
             //이벤트 기반으로 일정 시간 간격으로 클라이언트에게 보낼 정보, 홈페이지 그래프에 나타날 정보
@@ -190,15 +176,6 @@ module.exports = (server, app) => {
             console.log("emit");
             //db에 저장
-            /*sql = "INSERT INTO weatherInfo (time,wind,temperature,rain,prob) VALUES (?,?,?,?,?)";
-            db.query(sql, [client_send.time, client_send.wind, client_send.temperature, client_send.rain, client_send.death], (err, result) => {
-                if (err) console.log(err);
-            })
-          
-            sql_traffic = "INSERT INTO trafficInfo (tdeath,mhurt,lhurt,occurence,prob) VALUES (?,?,?,?,?)";
-            db_traffic.query(sql_traffic, [client_send.trafficdeath, client_send.mhurt, client_send.lhurt, client_send.occurence, client_send.death], (err, result) => {
-                if (err) console.log(err);
-            })*/
             sql = "INSERT INTO apisInfo (time,wind,temperature,rain,prob,tdeath,mhurt,lhurt,occurence) VALUES (?,?,?,?,?,?,?,?,?)";
             db_total.query(sql, [client_send.time, client_send.wind, client_send.temperature, client_send.rain, client_send.death, client_send.trafficdeath, client_send.mhurt, client_send.lhurt, client_send.occurence], (err, result) => {
                 if (err) console.log(err);