pulled from origin, fixed conflicts

Jihoon
Commit c44413420e589b9ecf8708345b22a2532f096dd1 c4441342 2 parents 567ebd9a 552b2293
Showing 5 changed files with 141 additions and 12 deletions
.vscode/launch.json
index.html
recommend_clothes.py
test.js
~$area_code.xlsx
--- a/.vscode/launch.json 0 → 100644
View file @c444134
+++ b/.vscode/launch.json 0 → 100644
View file @c444134
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}\\test.js"
+        }
+    ]
+}
\ No newline at end of file
--- a/index.html 0 → 100644
View file @c444134
+++ b/index.html 0 → 100644
View file @c444134
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title>OSW</title>
+    <link rel="stylesheet" href="/css/style.css" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
+        integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+    <link href="https://fonts.googleapis.com/css?family=Jua&display=swap" rel="stylesheet">
+</head>
+
+<body>
+    helloworld
+
+
+    <script src="https://code.jquery.com/jquery-3.3.1.min.js"
+        integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT"
+        crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
+        integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
+        crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
+        integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
+        crossorigin="anonymous"></script>
+</body>
+
+</html>
\ No newline at end of file
--- a/recommend_clothes.py
View file @c444134
+++ b/recommend_clothes.py
View file @c444134
@@ -2,30 +2,63 @@ from bs4 import BeautifulSoup
 from urllib.request import urlopen
 import openpyxl
 import datetime
+
 # coding = utf-8
-filename = "C://area_code.xlsx" # area_code.xlsx
+
+filename = "area_code.xlsx" # area_code.xlsx
 book = openpyxl.load_workbook(filename)
+
 sheet = book.worksheets[0]
 code = []
+
 for cell in sheet['E']:
     code.append(cell.value)
-area = input("읍/면/동을 입력(띄어쓰기 없이 입력 - 예:영통3동)\n")
+
+
+sys.stdin.reconfigure(encoding='utf-8')
+sys.stdout.reconfigure(encoding='utf-8')
+area = input()
+print(area)
 col = code.index(area)
 area_code_index = 'B' + str(col+1)
 area_code = sheet[area_code_index].value
 #print(area_code)
+
 now = datetime.datetime.now() 
 nowDate = now.strftime('%Y%m%d') #20191201형태로 연월일 받음
 #print(nowDate)
+
 url = "http://newsky2.kma.go.kr/iros/RetrieveLifeIndexService3/getSensorytemLifeList?serviceKey=UwTMv516Y0zIgZCDqzdPtf1jmbv287%2BOn1kqxcZizw8%2Be5OV5UmIc09icqMqSpEMbHOiCWoPK%2BZVD%2Bjbc%2BwgBg%3D%3D&areaNo=" + area_code + "&time=" + nowDate + "03"
+
 result = urlopen(url)
+
 html = result.read()
+
 soup = BeautifulSoup(html, 'html.parser')
+
+"""
+warm_url="http://newsky2.kma.go.kr/iros/RetrieveLifeIndexService3/getSensoryHeatLifeList?ServiceKey=UwTMv516Y0zIgZCDqzdPtf1jmbv287%2BOn1kqxcZizw8%2Be5OV5UmIc09icqMqSpEMbHOiCWoPK%2BZVD%2Bjbc%2BwgBg%3D%3D&areaNo" + area_code + "&requestCode=A20&time=" + nowDate + "06"
+
+warm_result = urlopen(url)
+
+warm_html=result.read()
+
+warm_soup=BeautifulSoup(warm_html,'html.parser')
+warm_hours=["h3","h6","h9","h12","h15","h18","h21"]
+sens_temper_warm=[]#더위 체감 지수
+warm_danger=0 #겨울 경우 위험도
+현재 12월 기준으로는 더위 체감 지수는 제공 되고 있지 않다.
+"""
 contents = soup.find("date")
 hours = ["h3","h6","h9","h12","h15","h18","h21","h24"] # date의 시간으로부터 n시간 이후의 예측온도
-sens_temper = []
+sens_temper = [] #체감온도
+
 # 2019120103: 19년 12월 1일 새벽 3시 기준이므로 리스트에는 6시, 9시, ..., 익일 3시까지의 예측 체감온도가 저장됨.
 #sens_temper[06시온도,09시온도,12시온도,15시온도,18시온도,21시온도,24시온도,익일03시온도]
+
+cold_danger=0 #추울 경우 위험도 숫자가 커질수록 증가
+
+
 for i in range(0, len(hours)):
     temper = soup.find(hours[i])
     sens_temper.append(int(temper.text))
@@ -35,40 +68,55 @@ for i in range(0, len(hours)):
         print("익일 03시:", temper.text+"°C")
     else:
         print(str(int(hours[i][1:])+3)+"시:", temper.text+"°C")
-if max(sens_temper) <= 5:
+
-    if min(sens_temper) >= -5 and min(sens_temper) <=0:
+if max(sens_temper) <= 8:
+    if min(sens_temper) >= -3 and min(sens_temper) <=2:
         print("패딩, 겨울야상, 양털자켓, 폴라티, 니트, 기모바지")
         print("쌀쌀한 날씨입니다. 생각보다 추워요!")
-    elif min(sens_temper) < -5:
+        cold_danger=1
+    elif min(sens_temper) < -3 and min(sens_temp)>=-10:
         print("패딩, 겨울야상, 양털자켓, 폴라티, 니트, 기모바지")
         print("마스크, 목도리, 장갑을 착용하세요!")
-        if min(sens_temper) < -10:
+        cold_danger=2
-            print("외출을 자제하는 것이 좋겠습니다!")
+        if min(sens_temper) < -10and min(sens_temper)>=-15:
-    elif min(sens_temper) > 0:
+            print("피부를 되도록 노출하지 마세요")
+            print("최대한 따뜻하게 입고 다니세요")
+            cold_danger=3
+        elif (min(sens_temper)<-15):
+            print("외출을 자제해 주세요")
+            print("외출시 내복 및 옷을 겹겹이 입어 주시고 많이 움직여 주세요")
+            cold_danger=4
+    elif min(sens_temper) > 2:
         print("패딩, 겨울야상, 양털자켓, 폴라티, 니트, 기모바지, 스타킹")
-        print("0도를 웃도는 날씨네요. 외투 안에는 가벼운 옷을 추천해요!")
+        print("외투 안에는 가벼운 옷을 추천해요!")
-if max(sens_temper) >= 6 and max(sens_temper) <= 9:
+if max(sens_temper) >= 8 and max(sens_temper) <= 13:
     print("코트, 가죽자켓, 맨투맨, 티셔츠(사계절), 바지(사계절)")
     if min(sens_temper) < 3:
         print("일교차에 유의하세요! 추위에 약한 분들은 외투 하나 더 챙기세요!")
-elif max(sens_temper) >= 10 and max(sens_temper) <= 11:
+
+elif max(sens_temper) >= 13 and max(sens_temper) <= 15:
     print("트렌치코트, 간절기 야상, 후드티, 여러겹 레이어드")
     if min(sens_temper) < 5:
         print("일교차에 유의하세요! 추위에 약한 분들은 외투 하나 더 챙기세요!")
+
 elif max(sens_temper) >= 12 and max(sens_temper) <= 16:
     print("자켓, 셔츠, 가디건, 후드(사계절)")
     if min(sens_temper) < 6:
         print("일교차에 유의하세요! 추위에 약한 분들은 외투 하나 더 챙기세요!")
+"""
 elif max(sens_temper) >= 17 and max(sens_temper) <= 19:
     print("가디건, 니트, 맨투맨, 후드티, 면바지, 슬랙스, 원피스")
     if min(sens_temper) < 9:
         print("일교차에 유의하세요! 얇은 외투 챙겨가세요!")
+
 elif max(sens_temper) >= 20 and max(sens_temper) <= 22:
     print("긴팔티, 후드티, 면바지, 슬랙스")
     if min(sens_temper) < 11:
         print("일교차에 유의하세요! 얇은 외투 챙겨가세요!")
+
 elif max(sens_temper) >= 23 and max(sens_temper) <= 26:
     print("반팔티, 얇은 셔츠, 얇은 긴팔티, 반바지, 면바지")
+"""
--- a/test.js 0 → 100644
View file @c444134
+++ b/test.js 0 → 100644
View file @c444134
+var http = require('http');
+var fs = require('fs');
+var app = http.createServer(function(request,response){
+    var url = request.url;
+    if(request.url == '/'){
+      url = '/index.html';
+    }
+    if(request.url == '/favicon.ico'){
+      response.writeHead(404);
+      response.end();
+      return;
+    }
+    response.writeHead(200);
+    response.end(fs.readFileSync(__dirname + url));
+ 
+});
+app.listen(3000);
+
+const {PythonShell} = require('python-shell');
+
+var options = {
+  mode: 'text',
+  pythonOptions: ['-u'],
+  scriptPath: '',
+  encoding: 'utf8',
+  args: ["영통1동"]
+};
+
+var arr;
+var test = new PythonShell('recommend_clothes.py', options);
+var data='영통1동';
+test.send(data);
+test.on('message',function(message){
+  arr = message.split(' ');
+})
+
--- a/~$area_code.xlsx 0 → 100644
View file @c444134
+++ b/~$area_code.xlsx 0 → 100644
View file @c444134