index.js 수정

 var express = require('express');
 var express = require('express');
 var router = express.Router();
 var router = express.Router();
-var db = require('../lib/db');
+var db = require('../lib/db_total');
 
 
 /* GET home page. */
 /* GET home page. */
 
 
 router.post('/starting' , (req,res) => {
 router.post('/starting' , (req,res) => {
    res.redirect(`/name/${req.body.name}/birth/${req.body.birth}`);
    res.redirect(`/name/${req.body.name}/birth/${req.body.birth}`);
 })
 })
-router.get('/name/:name/birth/:birth', (req,res) => {
+router.get('/name/:name/birth/:birth', (req, res) => {
 
 
     // 렌더링 변수
     // 렌더링 변수
     var time = new Array(); // 타임스탬프
     var time = new Array(); // 타임스탬프
@@ -21,32 +21,40 @@ router.get('/name/:name/birth/:birth', (req,res) => {
     var count = 0;
     var count = 0;
     const name = req.params.name;
     const name = req.params.name;
     const birth = req.params.birth;
     const birth = req.params.birth;
+    //const address = req.params.address;
+    ////////////////////////////////////////
+    var deathArr = new Array();
+    var mhurtArr = new Array();
+    var lhurtArr = new Array();
+    var occurArr = new Array();
+    ////////////////////////////////////////
+
 
 
     // 이전 10분간 데이터 찾기
     // 이전 10분간 데이터 찾기
-  sql = "SELECT * FROM weatherInfo WHERE time >= DATE_FORMAT(DATE_ADD(now(), INTERVAL -20 MINUTE), '%Y-%m-%d %H:%i:%s')";
-  db.query(sql, function(err, rows, fields){
-    if(err)
-    {
+    sql = "SELECT * FROM apisInfo WHERE time >= DATE_FORMAT(DATE_ADD(now(), INTERVAL -20 MINUTE), '%Y-%m-%d %H:%i:%s')";
+    db.query(sql, function (err, rows, fields) {
+        if (err) {
             console.log(err);
             console.log(err);
         }
         }
-    else
-    {
-      if (rows.length == 0)
-      {
+        else {
+            if (rows.length == 0) {
                 empty = 1;
                 empty = 1;
             }
             }
-      else
-      {
-        for(var i = rows.length - 1; i >= 0; i--)
-        {
+            else {
+                for (var i = rows.length - 1; i >= 0; i--) {
                     probArr.unshift(rows[i].prob);
                     probArr.unshift(rows[i].prob);
                     time.unshift(rows[i].time);
                     time.unshift(rows[i].time);
                     ptArr.unshift(rows[i].temperature);
                     ptArr.unshift(rows[i].temperature);
                     wsArr.unshift(rows[i].wind);
                     wsArr.unshift(rows[i].wind);
                     rainArr.unshift(rows[i].rain);
                     rainArr.unshift(rows[i].rain);
+                    ////
+                    deathArr.unshift(rows[i].tdeath);
+                    mhurtArr.unshift(rows[i].mhurt);
+                    lhurtArr.unshift(rows[i].lhurt);
+                    occurArr.unshift(rows[i].occurence);
                     count = count + 1;
                     count = count + 1;
 
 
-          if (count == 10){
+                    if (count == 10) {
                         break;
                         break;
                     }
                     }
                 }
                 }
@@ -62,13 +70,17 @@ router.get('/name/:name/birth/:birth', (req,res) => {
                 probArr,
                 probArr,
                 dataLen,
                 dataLen,
                 name,
                 name,
-        birth
+                birth,
+                deathArr,
+                mhurtArr,
+                lhurtArr,
+                occurArr
             });
             });
         }
         }
     });
     });
-} )
-router.get('/', function(req, res, next) {
-  res.render( 'main' );
+})
+router.get('/', function (req, res, next) {
+    res.render('main');
 });
 });
 
 
 module.exports = router;
 module.exports = router;