From cfe212aaef0604e81111f96012fc304ef000d6e0 Mon Sep 17 00:00:00 2001 From: jhbaik1501 Date: Sun, 4 Dec 2022 00:27:00 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20DB=EC=9D=98=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EB=A5=BC=20=EC=A0=95=EC=A0=9C=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ELTScript/changeOpenTimeFormat.py | 113 ++++++++++++++++++ .../odondong/config/SecurityConfig.java | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 src/ELTScript/changeOpenTimeFormat.py diff --git a/src/ELTScript/changeOpenTimeFormat.py b/src/ELTScript/changeOpenTimeFormat.py new file mode 100644 index 0000000..76ebffe --- /dev/null +++ b/src/ELTScript/changeOpenTimeFormat.py @@ -0,0 +1,113 @@ +import json +import pymysql + +exp = ['~', '-', '∼'] +hot_words = ['~', '-', '∼', "시", "시간"] +dirty_words = [',', '.', '평일', '공휴일', '주말', '휴무', '상시', '정시', '월', '년', '주', '(', ')', ';'] + + +def formatting(str): + global flag + + temp = str.replace(" ", "") + if (temp.isalpha()): + return str + + if (str.isdigit()): + str_num = int(str) + if (str_num >= 24): + flag = False + return str + else: + return str + "시간" + + if (len(str) > 14): + flag = False + return str + + for word in dirty_words: + if (word in str): + flag = False + return str + + for word in hot_words: + if (str.isdigit() == False and word in str): + break + + if (str.find(word)): + break + + flag = False + return str + + str = temp + for ex in exp: + if (ex in str and str.count(ex) == 1): + st, et = str.split(ex) + # st = st.strip() + # et = et.strip() + # if(len(st) != 4 or len(et) != 4 or len(st) != 5 or len(et) != 5): + # flag = False + # return str + + # if(len(st) == 5 and len(et) == 5): + # str = str.replace(ex, "~") + # flag = False + # return str + + if (":" in st): + if (":" in et): + st_hour, st_min = st.split(":") + et_hour, et_min = et.split(":") + + if (len(st_hour) > 2 or len(st_min) > 2 or len(et_hour) > 2 or len(et_min) > 2): + flag = False + return str + + return (st_hour.strip().zfill(2) + ":" + st_min.strip().zfill(2) + "~" + et_hour.strip().zfill( + 2) + ":" + et_min.strip().zfill(2)) + else: + flag = False + return str + elif ("시" in st): + if ("분" in st or "분" in et): + flag = False + return str + + st = st.replace("시", "") + et = et.replace("시", "") + return st.strip().zfill(2) + ":" + "00" + "~" + et.strip().zfill(2) + ":" + "00" + else: + return st.strip().zfill(2) + ":" + "00" + "~" + et.strip().zfill(2) + ":" + "00" + + cnt = 0 + for w in str: + for ex in exp: + if (ex == w): + cnt += 1 + + if (cnt == 1): + flag = True + else: + flag = False + + return str + + +if __name__ == "__main__": + flag = True + conn = pymysql.connect( + host='host', user='user', + password='password', db='dbName', charset='utf8') + cur = conn.cursor() + selectQuery = "SELECT * FROM bathroom LIMIT 2;" + cur.execute(selectQuery) + resultSet = cur.fetchall() + for result in resultSet : + formatTime = result[10] + formatTime = formatting(formatTime) + updateQuery = "UPDATE bathroom SET operation_time = %s WHERE bathroom_id = %s;" + vals = (formatTime, int(result[0]) ) + cur.execute(updateQuery, vals) + conn.commit() + conn.close() diff --git a/src/backend/src/main/java/com/graduate/odondong/config/SecurityConfig.java b/src/backend/src/main/java/com/graduate/odondong/config/SecurityConfig.java index 0d060f2..608512c 100644 --- a/src/backend/src/main/java/com/graduate/odondong/config/SecurityConfig.java +++ b/src/backend/src/main/java/com/graduate/odondong/config/SecurityConfig.java @@ -35,7 +35,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .logoutSuccessUrl("/") .and() .oauth2Login() - .defaultSuccessUrl("/api/user/test") + // .defaultSuccessUrl("/api/user/test") .failureUrl("/api/user/login/failure") .successHandler(oAuth2AuthenticationSuccessHandler) .userInfoEndpoint()