From ec012b7d2b915db24cd8b23f723bf18dfe75b7d6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 16 十二月 2024 11:13:31 +0800
Subject: [PATCH] 网页代码修改/结构调整

---
 utils/network_delegate_manager.py |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/network_delegate_manager.py b/utils/network_delegate_manager.py
similarity index 94%
rename from network_delegate_manager.py
rename to utils/network_delegate_manager.py
index d2ebdf1..9bda346 100644
--- a/network_delegate_manager.py
+++ b/utils/network_delegate_manager.py
@@ -115,12 +115,18 @@
             result = kpl_util.parseMarketIndustry(result)
         elif type_ == 2:
             # 绮鹃�夛紝涓诲姏鍑�棰濆�掑簭
-            result = kpl_api.getMarketJingXuanRealRankingInfo(True)
-            result = kpl_util.parseMarketJingXuan(result)
+            result = []
+            for p in range(2):
+                result_ = kpl_api.getMarketJingXuanRealRankingInfo(p + 1, True)
+                result_ = kpl_util.parseMarketJingXuan(result_)
+                result.extend(result_)
         elif type_ == 3:
             # 绮鹃�夛紝涓诲姏鍑�棰濋『搴�
-            result = kpl_api.getMarketJingXuanRealRankingInfo(False)
-            result = kpl_util.parseMarketJingXuan(result)
+            result = []
+            for p in range(2):
+                result_ = kpl_api.getMarketJingXuanRealRankingInfo(p + 1, False)
+                result_ = kpl_util.parseMarketJingXuan(result_)
+                result.extend(result_)
         fresult = []
         forbidden_plates = []
         for d in result:
@@ -288,6 +294,7 @@
     @classmethod
     def __get_kpl_market_feelings(cls):
         market_feelings = kpl_api.getMarketFelling()
+        market_strong = kpl_api.getMarketStrong()
         ps = [('娑ㄥ仠', market_feelings['ZT'], 'red')]
         ps.append(('>%7', int(market_feelings['8']) + int(market_feelings['9']) + int(
             market_feelings['10']), 'red'))
@@ -302,8 +309,9 @@
         ps.append(
             ('7%<', int(market_feelings['-8']) + int(market_feelings['-9']) + int(market_feelings['-10']), 'green'))
         ps.append(('璺屽仠', market_feelings['DT'], 'green'))
-        fdata = {"map": ps, "SJZT": market_feelings['SJZT'], "SJDT": market_feelings['SJDT'],
-                 "SZJS": market_feelings['SZJS'], "XDJS": market_feelings['XDJS'], "sign": market_feelings['sign']}
+        fdata = {"strong": market_strong, "map": ps, "SJZT": market_feelings['SJZT'], "SJDT": market_feelings['SJDT'],
+                 "SZJS": market_feelings['SZJS'], "XDJS": market_feelings['XDJS'], "sign": market_feelings['sign'],
+                 "qscln": market_feelings['qscln'] // 10000, "q_zrcs": market_feelings['q_zrcs'] // 10000}
         # 鑾峰彇甯傚満鎯呯华
         return json.dumps(
             {"code": 0, "data": fdata}), True
@@ -357,7 +365,7 @@
             d[1][2] = rate_dict[d[1][0]]
             d[0][0] = d[0][0].split('.')[1]
             d[1][0] = d[1][0].split('.')[1]
-        datas.sort(key=lambda x: int(x[2].replace(":","")), reverse=True)
+        datas.sort(key=lambda x: int(x[2].replace(":", "")), reverse=True)
 
         # 鑾峰彇浠婃棩姝h偂娑ㄥ仠鐨勫彲杞�哄垪琛�
         return json.dumps(
@@ -379,7 +387,6 @@
         else:
             return json.dumps(
                 {"code": 1, "msg": '鍚岃姳椤轰笉鑳戒拱鍏�'}), True
-
 
 
 if __name__ == "__main__":

--
Gitblit v1.8.0