新增配时方案接口

Signed-off-by: yinzijian <yinzijian@haomozhixing.onaliyun.com>

.gitignore

@@ -0,0 +1,242 @@
+# ---> C++
+# Prerequisites
+*.d
+common_roadnet.ini
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# ---> Python
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+.DS_Store
+.idea/
+temp/
+data/
+log/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+# ---> ExtJs
+.architect
+bootstrap.css
+bootstrap.js
+bootstrap.json
+bootstrap.jsonp
+build/
+classic.json
+classic.jsonp
+ext/
+modern.json
+modern.jsonp
+resources/sass/.sass-cache/
+resources/.arch-internal-preview.css
+.arch-internal-preview.css
+

proto/phase_grpc.py

@@ -116,7 +116,7 @@ def QueryGreenWaveCrossPhaseTpCheck(waveid: str, citycode: int):
 def QueryCrossRunningPhase(citycode: int, crossids: [], date_list:[], tp=''):
     stub, channel = channel_stub()
     try:
-        request_params = phase_server_pb2.CrossRunningPhaseRequest(citycode=citycode, crossids=crossids, dateList=date_list, tp=tp)
+        request_params = phase_server_pb2.CrossRunningPhaseRequest(citycode=citycode, crossids=crossids, date_list=date_list, tp=tp)
         return stub.CrossRunningPhase(request_params, timeout=30), None
     except Exception as e:
         return None, e

proto/phase_server.proto

@@ -247,36 +247,36 @@ message CrossRunningPhaseRequest {
 message CrossRunningPhaseResponse {
   int32 code = 1;
   string msg = 2;
-  repeated List data = 3; //数据列表
+  repeated List data = 3;
   message List {
-    int32 citycode = 1;   //城市编码
+    int32 citycode = 1;
-    string crossid = 2;   //路口ID
+    string crossid = 2;
-    string jj_crossid = 3;    
+    string jj_crossid = 3;
-    int32 scheduleid = 4;   //日计划号
+    int32 scheduleid = 4;
-    string schedule_week = 5; //周，1,2,3
+    string schedule_week = 5;
-    string schedule_name = 6; //周的名称，全周或工作日
+    string schedule_name = 6;
     repeated tps_list tps = 7;
   }
   message tps_list {
-    string tp_start = 1;  //时段开始时间
+    string tp_start = 1;
-    string tp_end = 2;    //时段结束时间
+    string tp_end = 2;
-    int32 planid = 3;     //方案号
+    int32 planid = 3;
-    string plan_name = 4; //方案名称
+    string plan_name = 4;
-    string control_mode = 5;  //控制模式
+    string control_mode = 5;
-    int32 cycle = 6;      //周期
+    int32 cycle = 6;
-    int32 coord_phaseid = 7;    //协调相位ID
+    int32 coord_phaseid = 7;
-    int32 offset = 8;     //相位差
+    int32 offset = 8;
-    repeated stages stage_list = 9;   //阶段列表
+    repeated stages stage_list = 9;
   }
   message stages {
-    int32 stageid = 1;    //阶段ID
+    int32 stageid = 1;
-    int32 stage_duration = 2;   //阶段时长
+    int32 stage_duration = 2;
-    string stage_name = 3;    //阶段名称
+    string stage_name = 3;
-    int32 green = 4;      //绿灯时长
+    int32 green = 4;
-    int32 yellow = 5;     //黄灯时长
+    int32 yellow = 5;
-    int32 allred = 6;     //全红时长
+    int32 allred = 6;
-    string phases = 7;    //相位ID集合，1，3，4，5
+    string phases = 7;
-    string phases_name = 8; //相位名称，南直行,北直行,南行人,东北直行
+    string phases_name = 8;
     int32 min_green = 9;
     int32 max_green = 10;
   }
@@ -285,9 +285,8 @@ message CrossRunningPhaseResponse {
 message CrossPhaseDiagnosisRequest {
   int32 citycode = 1;
   string crossid = 2;
-  string start_tp = 3;
+  string tp = 3;
-  string end_tp = 4;
+  repeated string date_list = 4;
-  repeated string date_list = 5;
 }
 
 message CrossPhaseDiagnosisResponse {
@@ -307,13 +306,18 @@ message CrossPhaseDiagnosisResponse {
   }
   
   message item_detail {
+    repeated detail_value detail = 1;
+  }
+  
+  message item_suggestions {
+    repeated detail_value detail = 1;
+  }
+  
+  message detail_value {
     string text = 1;
     string color = 2;
     int32 scheduleid = 3;
     string crossid = 4;
-  }
+    string tp_start = 5;
-  
-  message item_suggestions {
-    string text = 1;
   }
 }