binren před 5 roky
rodič
revize
13e3902e44

+ 3 - 1
.gitignore

@@ -1,7 +1,9 @@
 .idea/
+.gitignore
 /out/
 */__pycache__/
 /venv/
 /全部户型-镜像/*
 /algorithm/file/
-/resources/need_finish_files/*
+__pycache__/*
+/resources/need_finish_files/*

binární
__pycache__/excel_util.cpython-36.pyc


binární
__pycache__/excel_util.cpython-37.pyc


binární
__pycache__/flask_app.cpython-36.pyc


binární
__pycache__/mvp.cpython-36.pyc


binární
__pycache__/mvp.cpython-37.pyc


binární
__pycache__/mysql_db.cpython-36.pyc


binární
__pycache__/mysql_db.cpython-37.pyc


+ 5 - 8
entity.py

@@ -18,15 +18,12 @@ class PeopleInfo:
 
     def __init__(self, uuid, city, age, sex, crowd):
         self.uuid = uuid
-        if city is None:
-            self.city = '无城市'
+        if city == '上海市' or city == '一线':
+            self.city = '上海市'
+        elif city in ['无锡市', '杭州市', '苏州市', '宁波市']:
+            self.city = '上海周边'
         else:
-            if city == '上海市' or city == '一线':
-                self.city = '上海市'
-            elif city in ['无锡市', '杭州市', '苏州市', '宁波市']:
-                self.city = '上海周边'
-            else:
-                self.city = '其他'
+            self.city = '其他'
         age_1 = self.age_dict.get(age)
         if age_1:
             self.age = age_1

+ 2 - 2
mvp.py

@@ -255,10 +255,10 @@ class Mvp:
                         sub_option_ids = self.marketing_db.select(self.sql_17, [uuid])
                         for option in sub_option_ids:
                             crowd_type = self.crowd_info_1.get(option[1])
-                            if crowd:
+                            if crowd_type:
                                 crowd.append(crowd_type)
                     else:
-                        if str(sub_option_ids_1).strip():
+                        if str(sub_option_ids_1).find(',') != -1:
                             crowd.extend(self.get_people_uuid_by_sub_option_ids(sub_option_ids_1))
             if city is None:
                 city = '无城市'

+ 13 - 5
mysql_db.py

@@ -10,10 +10,10 @@ class MysqlDB:
 
     def __init__(self, db_name):
         self.db_name = db_name
-        self.con = ps.connect(host='172.19.189.136', port=3306, user='bi_etl', password='XPtpswuU5lwGo4kx',
-                              db=self.db_name, charset='utf8')
-        # self.con = ps.connect(host='192.168.0.13', port=3306, user='root', password='elab@123'
-        #                       , db=self.db_name, charset='utf8')
+        # self.con = ps.connect(host='172.19.189.136', port=3306, user='bi_etl', password='XPtpswuU5lwGo4kx',
+        #                       db=self.db_name, charset='utf8')
+        self.con = ps.connect(host='192.168.0.13', port=3306, user='root', password='elab@123'
+                              , db=self.db_name, charset='utf8')
         self.cursor = self.con.cursor()
 
     def show_tables(self):
@@ -50,4 +50,12 @@ class MysqlDB:
 
     def close(self):
         self.cursor.close()
-        self.con.close()
+        self.con.close()
+
+
+if __name__ == '__main__':
+    sql = 'select *from bq_testcase limit 10'
+    si = {
+        1: 1
+    }
+    print(si.get('1'))

binární
resources/mvp.xlsx