Browse Source

完整数据

zfrr 2 months ago
parent
commit
f10a37d9d5

+ 1 - 1
.idea/data_to_json.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="VAE" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.9 (BJKG)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

+ 1 - 1
.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.9" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="VAE" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (BJKG)" project-jdk-type="Python SDK" />
 </project>

+ 8 - 0
Json/json_Schema/sjjy1_B01_Schema.json

@@ -0,0 +1,8 @@
+{
+  "attribute": ["年", "月", "同比", "省间结算电量", "省间交易电量"],
+  "name": "省间交易电量",
+  "prefix":"sjjy1_B01",
+  "alias":[],
+  "block": "1",
+  "scene": "省间交易"
+}

+ 8 - 0
Json/json_Schema/sjjy1_B02_Schema.json

@@ -0,0 +1,8 @@
+{
+  "attribute": ["年", "月", "省间购入均价", "省间送出均价"],
+  "name": "省间交易均价",
+  "prefix":"sjjy1_B02",
+  "alias":[],
+  "block": "2",
+  "scene": "省间交易"
+}

+ 50 - 0
Json/json_Schema/sjjy1_B03_Schema.json

@@ -0,0 +1,50 @@
+{
+  "attribute": {
+    "按交易周期划分": [
+      "年度",
+      "月度",
+      "月内",
+      "现货",
+      "应急",
+      "年",
+      "月",
+      "占比",
+      "总量"
+    ],
+    "按交易类型划分": [
+      "省间外送",
+      "电力直接交易",
+      "合同交易",
+      "绿电交易",
+      "非市场化",
+      "年",
+      "月",
+      "占比",
+      "总量"
+    ],
+    "按发电类型划分": [
+      "火电",
+      "水电",
+      "核电",
+      "新能源",
+      "年",
+      "月",
+      "占比",
+      "总量"
+    ],
+    "按交易方式划分": [
+      "双边",
+      "集中",
+      "挂牌",
+      "年",
+      "月",
+      "占比",
+      "总量"
+    ]
+  },
+  "name": "省间交易均价",
+  "prefix":"sjjy1_B03",
+  "alias":[],
+  "block": "3",
+  "scene": "省间交易"
+}

+ 2 - 2
Json/json_Schema/SCDL_Schema.json → Json/json_Schema/sjjy1_B04_Schema.json

@@ -1,8 +1,8 @@
 {
   "attribute": ["年", "月", "单位", "送出电量", "送出电量占售电量的比", "送出均价"],
   "name": "送出电量",
-  "prefix":"SRDL",
+  "prefix":"sjjy1_B04",
   "alias":["省间送出电量","省间交易送出电量"],
-  "block": "5",
+  "block": "4",
   "scene": "省间交易"
 }

+ 2 - 2
Json/json_Schema/SRDL_Schema.json → Json/json_Schema/sjjy1_B05_Schema.json

@@ -1,8 +1,8 @@
 {
   "attribute": ["年", "月", "单位", "受入电量", "受入电量占售电量的比", "受入均价"],
   "name": "受入电量",
-  "prefix":"SRDL",
+  "prefix":"sjjy1_B05",
   "alias":["省间受入电量","省间交易受入电量"],
-  "block": "4",
+  "block": "5",
   "scene": "省间交易"
 }

+ 8 - 0
Json/json_Schema/sjjy1_B06_Schema.json

@@ -0,0 +1,8 @@
+{
+  "attribute": ["正在组织", "当月完成", "当年完成", "当年达成电量", "参与交易家次","交易名称", "交易形式", "售电方", "购电方", "当前阶段","时间","排名"],
+  "name": "受入电量",
+  "prefix":"sjjy1_B06",
+  "alias":[],
+  "block": "6",
+  "scene": "省间交易"
+}

+ 8 - 0
Json/json_Schema/sjjy1_B08_Schema.json

@@ -0,0 +1,8 @@
+{
+  "attribute":  ["年份","同比","交易总量","年度累计省间交易电量"],
+  "name": "全年累计省间交易电量",
+  "prefix":"sjjy1_B08",
+  "alias":[],
+  "block": "8",
+  "scene": "省间交易"
+}

+ 0 - 0
Json/json_data/SCDL_output.json → Json/json_data/sjjy1_B04_output.json


+ 0 - 0
Json/json_data/SRDL_output.json → Json/json_data/sjjy1_B05_output.json


BIN
SJJY/__pycache__/sjjy.cpython-39.pyc


BIN
SJJY/__pycache__/sjjy1.cpython-39.pyc


BIN
SJJY/__pycache__/sjjy3.cpython-39.pyc


BIN
__pycache__/config.cpython-39.pyc


BIN
api/__pycache__/search_para_json.cpython-39.pyc


BIN
common/__pycache__/constants.cpython-39.pyc


+ 4 - 4
config.py

@@ -1,6 +1,6 @@
 # config.py
-# DB_PATH = r'D:\Study\postgraduate\project\BJ_screen\database\yq_dlp.db'
-# DB_PATH2 = r'D:\Study\postgraduate\project\BJ_screen\database\yq_dlp_02.db'
+DB_PATH = r'D:\Study\postgraduate\project\BJ_screen\database\yq_dlp.db'
+DB_PATH2 = r'D:\Study\postgraduate\project\BJ_screen\database\yq_dlp_02.db'
 
-DB_PATH = r'C:\dc数据库\20250427\newdlp\dc\yq_dlp.db'
-DB_PATH2 = r'C:\dc数据库\20250427\newdlp\dc\yq_dlp_02.db'
+# DB_PATH = r'C:\dc数据库\20250427\newdlp\dc\yq_dlp.db'
+# DB_PATH2 = r'C:\dc数据库\20250427\newdlp\dc\yq_dlp_02.db'

BIN
db/__pycache__/sqlite_handler.cpython-39.pyc


BIN
export/__pycache__/json_exporter.cpython-39.pyc


+ 4 - 4
main.py

@@ -2,11 +2,11 @@
 import os
 
 from SJJY.sjjy import scdl, srdl, xlxx
-from SJJY.sjjy1 import B06, B08, B03, B01, B02
+from SJJY.sjjy1 import B06, B08, B03, B01, B02, B04, B05
 from SJJY.sjjy3 import B07
 from api.search_para_json import app
 if __name__ == '__main__':
-    app.run(debug=True)
+    #app.run(debug=True)
     # scdl()
     # srdl()
     # xlxx()
@@ -17,8 +17,8 @@ if __name__ == '__main__':
     # B01()
     # B02()
     # B03()
-    # B04()
-    # B05()
+    B04()
+    B05()
     # B06()
     # B08()
 

BIN
utils/__pycache__/file_utils.cpython-39.pyc