Browse Source

0.1 version

liqudong 3 năm trước cách đây
mục cha
commit
bdc6810c02

+ 15 - 0
.idea/dataSources.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="datacollection@localhost" uuid="96280765-6c16-4e0d-9ee3-e86adb3d3d0d">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306/datacollection</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+      <driver-properties>
+        <property name="serverTimezone" value="UTC" />
+      </driver-properties>
+    </data-source>
+  </component>
+</project>

+ 23 - 0
.idea/sonarlint/issuestore/index.pb

@@ -0,0 +1,23 @@
+
+;
+dev/test.py,8\e\8e4df3e8916169a50f6184647d867119e04e97e4
+<
+gateway.spec,0\a\0a0a6599d371fc0a2ab420eddeb31f1660bcd2ea
+E
+apis/operate_mysql.py,7\6\7650dfbb5706fa0aa816128d145de01177587f91
+P
+ converters/nmea0183_converter.py,e\a\ea708822e0534bb247f965112965a8a2cf0b7f38
+N
+converters/wxt536_converter.py,1\5\157f30602595b9f3f08dd8669c2c62d1a7a1d3a1
+?
+abstract_api.py,9\9\99cec67f932c928292074c53e530b4776d1920c0
+8
+alarm.py,b\f\bf39ca75b26115f97cf5abed51afdaaed6288775
+>
+api_context.py,0\9\0996d10e6f2a7e57a26bb981145946ba4742cdf5
+@
+configuration.py,e\7\e7a71d767cea31efc8699be646ee073611f9426c
+<
+connector.py,4\9\49b66e8a3132c071fa86a7eea5f903cce311294b
+<
+converter.py,f\d\fdacfb8fe5c36387670897cdf49d7784e4c6aa12

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 8 - 5
apis/alarm_limit_from_database.py

@@ -1,16 +1,19 @@
 from abstract_api import AbstractApi
 from apis.operate_mysql import OperateMysql
 
+
 class Alarm_limit_from_database(AbstractApi):
 
     def operation(self, request):
         operate_mysql = OperateMysql()
         device_name = request['device']
-        if device_name is None:
+        if device_name == "all":
             sql = "SELECT id,io_point_name,alarm_low_limit,alarm_up_limit FROM data_point_tbl WHERE alarm_low_limit IS NOT Null AND alarm_up_limit IS NOT Null;"
             res = operate_mysql.execute_sql(sql)
-        else:
-            sql = "SELECT id,io_point_name,alarm_low_limit,alarm_up_limit FROM data_point_tbl WHERE alarm_low_limit IS NOT Null AND alarm_up_limit IS NOT Null AND device_name=\'%s\';" % (device_name)
+        elif isinstance(device_name, list) and device_name:
+            device_name = ','.join(["'%s'" % item for item in device_name])
+            sql = "SELECT id,io_point_name,alarm_low_limit,alarm_up_limit FROM data_point_tbl WHERE alarm_low_limit IS NOT Null AND alarm_up_limit IS NOT Null AND device_name= ( %s );" % device_name
             res = operate_mysql.execute_sql(sql)
-
-        return res
+        else:
+            res = "传入空列表或参数错误"
+        return res

+ 147 - 108
build/gateway/Analysis-00.toc

@@ -168,23 +168,8 @@
   ('distutils',
    'd:\\devtools\\python38\\lib\\distutils\\__init__.py',
    'PYMODULE'),
-  ('distutils.ccompiler',
-   'd:\\devtools\\python38\\lib\\distutils\\ccompiler.py',
-   'PYMODULE'),
-  ('distutils.fancy_getopt',
-   'd:\\devtools\\python38\\lib\\distutils\\fancy_getopt.py',
-   'PYMODULE'),
-  ('distutils.debug',
-   'd:\\devtools\\python38\\lib\\distutils\\debug.py',
-   'PYMODULE'),
-  ('distutils.util',
-   'd:\\devtools\\python38\\lib\\distutils\\util.py',
-   'PYMODULE'),
-  ('distutils.filelist',
-   'd:\\devtools\\python38\\lib\\distutils\\filelist.py',
-   'PYMODULE'),
-  ('distutils.dep_util',
-   'd:\\devtools\\python38\\lib\\distutils\\dep_util.py',
+  ('distutils.archive_util',
+   'd:\\devtools\\python38\\lib\\distutils\\archive_util.py',
    'PYMODULE'),
   ('distutils.dir_util',
    'd:\\devtools\\python38\\lib\\distutils\\dir_util.py',
@@ -192,12 +177,30 @@
   ('distutils.file_util',
    'd:\\devtools\\python38\\lib\\distutils\\file_util.py',
    'PYMODULE'),
+  ('distutils.dep_util',
+   'd:\\devtools\\python38\\lib\\distutils\\dep_util.py',
+   'PYMODULE'),
   ('distutils.spawn',
    'd:\\devtools\\python38\\lib\\distutils\\spawn.py',
    'PYMODULE'),
+  ('distutils.debug',
+   'd:\\devtools\\python38\\lib\\distutils\\debug.py',
+   'PYMODULE'),
   ('distutils.errors',
    'd:\\devtools\\python38\\lib\\distutils\\errors.py',
    'PYMODULE'),
+  ('distutils.ccompiler',
+   'd:\\devtools\\python38\\lib\\distutils\\ccompiler.py',
+   'PYMODULE'),
+  ('distutils.fancy_getopt',
+   'd:\\devtools\\python38\\lib\\distutils\\fancy_getopt.py',
+   'PYMODULE'),
+  ('distutils.util',
+   'd:\\devtools\\python38\\lib\\distutils\\util.py',
+   'PYMODULE'),
+  ('distutils.filelist',
+   'd:\\devtools\\python38\\lib\\distutils\\filelist.py',
+   'PYMODULE'),
   ('distutils.sysconfig',
    'd:\\devtools\\python38\\lib\\distutils\\sysconfig.py',
    'PYMODULE'),
@@ -396,51 +399,40 @@
   ('pkg_resources',
    'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\__init__.py',
    'PYMODULE'),
-  ('pkg_resources.py2_warn',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\py2_warn.py',
+  ('packaging.tags',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\tags.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__init__.py',
+  ('typing', 'd:\\devtools\\python38\\lib\\typing.py', 'PYMODULE'),
+  ('packaging',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\__init__.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.six',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\six.py',
+  ('packaging.version',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\version.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.markers',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\markers.py',
+  ('packaging._musllinux',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\_musllinux.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.__about__',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__about__.py',
+  ('packaging.__about__',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\__about__.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.appdirs',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\appdirs.py',
+  ('packaging._manylinux',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\_manylinux.py',
    'PYMODULE'),
   ('ctypes', 'd:\\devtools\\python38\\lib\\ctypes\\__init__.py', 'PYMODULE'),
   ('ctypes._endian',
    'd:\\devtools\\python38\\lib\\ctypes\\_endian.py',
    'PYMODULE'),
-  ('win32com.shell.shellcon',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shellcon.py',
+  ('packaging.utils',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\utils.py',
    'PYMODULE'),
-  ('win32com.shell',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\__init__.py',
+  ('packaging.specifiers',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\specifiers.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.version',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\version.py',
+  ('packaging.requirements',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\requirements.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.requirements',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\requirements.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor.packaging._compat',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_compat.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor.packaging._structures',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_structures.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\__init__.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor.pyparsing',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\pyparsing.py',
+  ('pyparsing',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pyparsing.py',
    'PYMODULE'),
   ('uuid', 'd:\\devtools\\python38\\lib\\uuid.py', 'PYMODULE'),
   ('ctypes.util', 'd:\\devtools\\python38\\lib\\ctypes\\util.py', 'PYMODULE'),
@@ -460,12 +452,60 @@
   ('netbios',
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\lib\\netbios.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.utils',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\utils.py',
+  ('packaging._structures',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\_structures.py',
+   'PYMODULE'),
+  ('packaging.markers',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\markers.py',
+   'PYMODULE'),
+  ('pkg_resources.py2_warn',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\py2_warn.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__init__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.six',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\six.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.appdirs',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\appdirs.py',
+   'PYMODULE'),
+  ('win32com.shell.shellcon',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shellcon.py',
+   'PYMODULE'),
+  ('win32com.shell',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\__init__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.requirements',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\requirements.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.__about__',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__about__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.version',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\version.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\__init__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging._compat',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_compat.py',
    'PYMODULE'),
   ('pkg_resources._vendor.packaging.specifiers',
    'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\specifiers.py',
    'PYMODULE'),
+  ('pkg_resources._vendor.packaging.markers',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\markers.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.pyparsing',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\pyparsing.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.utils',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\utils.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging._structures',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_structures.py',
+   'PYMODULE'),
   ('pkg_resources.py31compat',
    'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\py31compat.py',
    'PYMODULE'),
@@ -550,10 +590,9 @@
   ('multiprocessing.spawn',
    'd:\\devtools\\python38\\lib\\multiprocessing\\spawn.py',
    'PYMODULE'),
+  ('_py_abc', 'd:\\devtools\\python38\\lib\\_py_abc.py', 'PYMODULE'),
   ('stringprep', 'd:\\devtools\\python38\\lib\\stringprep.py', 'PYMODULE'),
   ('tracemalloc', 'd:\\devtools\\python38\\lib\\tracemalloc.py', 'PYMODULE'),
-  ('_py_abc', 'd:\\devtools\\python38\\lib\\_py_abc.py', 'PYMODULE'),
-  ('typing', 'd:\\devtools\\python38\\lib\\typing.py', 'PYMODULE'),
   ('api_context', 'E:\\WorkSpace\\DataCollection\\api_context.py', 'PYMODULE'),
   ('apis.api_init',
    'E:\\WorkSpace\\DataCollection\\apis\\api_init.py',
@@ -1306,120 +1345,120 @@
   ('asyncio.runners',
    'd:\\devtools\\python38\\lib\\asyncio\\runners.py',
    'PYMODULE')],
- [('api-ms-win-crt-stdio-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-stdio-l1-1-0.dll',
-   'BINARY'),
-  ('api-ms-win-crt-locale-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-locale-l1-1-0.dll',
-   'BINARY'),
-  ('VCRUNTIME140.dll', 'd:\\devtools\\python38\\VCRUNTIME140.dll', 'BINARY'),
+ [('VCRUNTIME140.dll', 'd:\\devtools\\python38\\VCRUNTIME140.dll', 'BINARY'),
   ('api-ms-win-crt-runtime-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-runtime-l1-1-0.dll',
    'BINARY'),
-  ('python38.dll', 'd:\\devtools\\python38\\python38.dll', 'BINARY'),
   ('api-ms-win-crt-heap-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-heap-l1-1-0.dll',
    'BINARY'),
+  ('python38.dll', 'd:\\devtools\\python38\\python38.dll', 'BINARY'),
   ('api-ms-win-crt-math-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-math-l1-1-0.dll',
    'BINARY'),
-  ('ucrtbase.dll', 'C:\\WINDOWS\\system32\\ucrtbase.dll', 'BINARY'),
-  ('api-ms-win-crt-convert-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-convert-l1-1-0.dll',
+  ('api-ms-win-crt-stdio-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-stdio-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-crt-locale-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-locale-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-string-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-string-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-crt-convert-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-convert-l1-1-0.dll',
+   'BINARY'),
+  ('ucrtbase.dll', 'C:\\WINDOWS\\system32\\ucrtbase.dll', 'BINARY'),
   ('api-ms-win-crt-time-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-time-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-environment-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-environment-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-crt-conio-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-conio-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-crt-process-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-process-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-filesystem-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-filesystem-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-crt-conio-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-conio-l1-1-0.dll',
+   'BINARY'),
   ('api-ms-win-core-rtlsupport-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-rtlsupport-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-handle-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-handle-l1-1-0.dll',
+  ('api-ms-win-core-errorhandling-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-errorhandling-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-util-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-util-l1-1-0.dll',
+  ('api-ms-win-core-string-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-string-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-interlocked-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-interlocked-l1-1-0.dll',
+  ('api-ms-win-core-file-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-2-0.dll',
    'BINARY'),
-  ('api-ms-win-core-timezone-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-timezone-l1-1-0.dll',
+  ('api-ms-win-core-namedpipe-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-namedpipe-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-string-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-string-l1-1-0.dll',
+  ('api-ms-win-core-processenvironment-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-processenvironment-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-libraryloader-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-libraryloader-l1-1-0.dll',
+  ('api-ms-win-core-sysinfo-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-sysinfo-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-profile-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-profile-l1-1-0.dll',
+  ('api-ms-win-core-synch-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-processthreads-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-handle-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-handle-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-file-l2-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-file-l2-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-localization-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-localization-l1-2-0.dll',
+  ('api-ms-win-core-timezone-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-timezone-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-datetime-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-datetime-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-processenvironment-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-processenvironment-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-core-debug-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-debug-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-synch-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-2-0.dll',
-   'BINARY'),
-  ('api-ms-win-core-memory-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-memory-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-core-console-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-console-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-sysinfo-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-sysinfo-l1-1-0.dll',
+  ('api-ms-win-core-libraryloader-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-libraryloader-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-processthreads-l1-1-1.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-1.dll',
    'BINARY'),
-  ('api-ms-win-core-errorhandling-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-errorhandling-l1-1-0.dll',
+  ('api-ms-win-core-util-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-util-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-synch-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-1-0.dll',
+  ('api-ms-win-core-synch-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-2-0.dll',
    'BINARY'),
-  ('api-ms-win-core-namedpipe-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-namedpipe-l1-1-0.dll',
+  ('api-ms-win-core-profile-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-profile-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-file-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-processthreads-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-0.dll',
-   'BINARY'),
-  ('api-ms-win-core-file-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-2-0.dll',
+  ('api-ms-win-core-localization-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-localization-l1-2-0.dll',
    'BINARY'),
   ('api-ms-win-core-heap-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-heap-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-core-memory-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-memory-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-interlocked-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-interlocked-l1-1-0.dll',
+   'BINARY'),
   ('pywintypes38.dll',
    'd:\\devtools\\python38\\lib\\site-packages\\pywin32_system32\\pywintypes38.dll',
    'BINARY'),
@@ -1447,12 +1486,12 @@
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\win32api.pyd',
    'EXTENSION'),
   ('_ctypes', 'd:\\devtools\\python38\\DLLs\\_ctypes.pyd', 'EXTENSION'),
-  ('win32com.shell.shell',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shell.pyd',
-   'EXTENSION'),
   ('win32wnet',
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\win32wnet.pyd',
    'EXTENSION'),
+  ('win32com.shell.shell',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shell.pyd',
+   'EXTENSION'),
   ('_multiprocessing',
    'd:\\devtools\\python38\\DLLs\\_multiprocessing.pyd',
    'EXTENSION'),

+ 55 - 55
build/gateway/EXE-00.toc

@@ -41,120 +41,120 @@
    'D:\\DevTools\\Python38\\Lib\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_certifi.py',
    'PYSOURCE'),
   ('gateway', 'E:\\WorkSpace\\DataCollection\\gateway.py', 'PYSOURCE'),
-  ('api-ms-win-crt-stdio-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-stdio-l1-1-0.dll',
-   'BINARY'),
-  ('api-ms-win-crt-locale-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-locale-l1-1-0.dll',
-   'BINARY'),
   ('VCRUNTIME140.dll', 'd:\\devtools\\python38\\VCRUNTIME140.dll', 'BINARY'),
   ('api-ms-win-crt-runtime-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-runtime-l1-1-0.dll',
    'BINARY'),
-  ('python38.dll', 'd:\\devtools\\python38\\python38.dll', 'BINARY'),
   ('api-ms-win-crt-heap-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-heap-l1-1-0.dll',
    'BINARY'),
+  ('python38.dll', 'd:\\devtools\\python38\\python38.dll', 'BINARY'),
   ('api-ms-win-crt-math-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-math-l1-1-0.dll',
    'BINARY'),
-  ('ucrtbase.dll', 'C:\\WINDOWS\\system32\\ucrtbase.dll', 'BINARY'),
-  ('api-ms-win-crt-convert-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-convert-l1-1-0.dll',
+  ('api-ms-win-crt-stdio-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-stdio-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-crt-locale-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-locale-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-string-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-string-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-crt-convert-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-convert-l1-1-0.dll',
+   'BINARY'),
+  ('ucrtbase.dll', 'C:\\WINDOWS\\system32\\ucrtbase.dll', 'BINARY'),
   ('api-ms-win-crt-time-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-time-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-environment-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-environment-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-crt-conio-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-conio-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-crt-process-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-process-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-filesystem-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-filesystem-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-crt-conio-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-conio-l1-1-0.dll',
+   'BINARY'),
   ('api-ms-win-core-rtlsupport-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-rtlsupport-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-handle-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-handle-l1-1-0.dll',
+  ('api-ms-win-core-errorhandling-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-errorhandling-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-util-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-util-l1-1-0.dll',
+  ('api-ms-win-core-string-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-string-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-interlocked-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-interlocked-l1-1-0.dll',
+  ('api-ms-win-core-file-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-2-0.dll',
    'BINARY'),
-  ('api-ms-win-core-timezone-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-timezone-l1-1-0.dll',
+  ('api-ms-win-core-namedpipe-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-namedpipe-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-string-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-string-l1-1-0.dll',
+  ('api-ms-win-core-processenvironment-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-processenvironment-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-libraryloader-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-libraryloader-l1-1-0.dll',
+  ('api-ms-win-core-sysinfo-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-sysinfo-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-profile-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-profile-l1-1-0.dll',
+  ('api-ms-win-core-synch-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-processthreads-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-handle-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-handle-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-file-l2-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-file-l2-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-localization-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-localization-l1-2-0.dll',
+  ('api-ms-win-core-timezone-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-timezone-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-datetime-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-datetime-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-processenvironment-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-processenvironment-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-core-debug-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-debug-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-synch-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-2-0.dll',
-   'BINARY'),
-  ('api-ms-win-core-memory-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-memory-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-core-console-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-console-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-sysinfo-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-sysinfo-l1-1-0.dll',
+  ('api-ms-win-core-libraryloader-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-libraryloader-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-processthreads-l1-1-1.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-1.dll',
    'BINARY'),
-  ('api-ms-win-core-errorhandling-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-errorhandling-l1-1-0.dll',
+  ('api-ms-win-core-util-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-util-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-synch-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-1-0.dll',
+  ('api-ms-win-core-synch-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-2-0.dll',
    'BINARY'),
-  ('api-ms-win-core-namedpipe-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-namedpipe-l1-1-0.dll',
+  ('api-ms-win-core-profile-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-profile-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-file-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-processthreads-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-0.dll',
-   'BINARY'),
-  ('api-ms-win-core-file-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-2-0.dll',
+  ('api-ms-win-core-localization-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-localization-l1-2-0.dll',
    'BINARY'),
   ('api-ms-win-core-heap-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-heap-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-core-memory-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-memory-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-interlocked-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-interlocked-l1-1-0.dll',
+   'BINARY'),
   ('pywintypes38.dll',
    'd:\\devtools\\python38\\lib\\site-packages\\pywin32_system32\\pywintypes38.dll',
    'BINARY'),
@@ -182,12 +182,12 @@
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\win32api.pyd',
    'EXTENSION'),
   ('_ctypes', 'd:\\devtools\\python38\\DLLs\\_ctypes.pyd', 'EXTENSION'),
-  ('win32com.shell.shell',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shell.pyd',
-   'EXTENSION'),
   ('win32wnet',
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\win32wnet.pyd',
    'EXTENSION'),
+  ('win32com.shell.shell',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shell.pyd',
+   'EXTENSION'),
   ('_multiprocessing',
    'd:\\devtools\\python38\\DLLs\\_multiprocessing.pyd',
    'EXTENSION'),
@@ -237,7 +237,7 @@
  [],
  False,
  False,
- 1626679261,
+ 1629184919,
  [('run.exe',
    'd:\\devtools\\python38\\lib\\site-packages\\PyInstaller\\bootloader\\Windows-64bit\\run.exe',
    'EXECUTABLE')])

BIN
build/gateway/PKG-00.pkg


+ 54 - 54
build/gateway/PKG-00.toc

@@ -38,120 +38,120 @@
    'D:\\DevTools\\Python38\\Lib\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\rthooks\\pyi_rth_certifi.py',
    'PYSOURCE'),
   ('gateway', 'E:\\WorkSpace\\DataCollection\\gateway.py', 'PYSOURCE'),
-  ('api-ms-win-crt-stdio-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-stdio-l1-1-0.dll',
-   'BINARY'),
-  ('api-ms-win-crt-locale-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-locale-l1-1-0.dll',
-   'BINARY'),
   ('VCRUNTIME140.dll', 'd:\\devtools\\python38\\VCRUNTIME140.dll', 'BINARY'),
   ('api-ms-win-crt-runtime-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-runtime-l1-1-0.dll',
    'BINARY'),
-  ('python38.dll', 'd:\\devtools\\python38\\python38.dll', 'BINARY'),
   ('api-ms-win-crt-heap-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-heap-l1-1-0.dll',
    'BINARY'),
+  ('python38.dll', 'd:\\devtools\\python38\\python38.dll', 'BINARY'),
   ('api-ms-win-crt-math-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-math-l1-1-0.dll',
    'BINARY'),
-  ('ucrtbase.dll', 'C:\\WINDOWS\\system32\\ucrtbase.dll', 'BINARY'),
-  ('api-ms-win-crt-convert-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-convert-l1-1-0.dll',
+  ('api-ms-win-crt-stdio-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-stdio-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-crt-locale-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-locale-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-string-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-string-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-crt-convert-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-convert-l1-1-0.dll',
+   'BINARY'),
+  ('ucrtbase.dll', 'C:\\WINDOWS\\system32\\ucrtbase.dll', 'BINARY'),
   ('api-ms-win-crt-time-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-time-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-environment-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-environment-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-crt-conio-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-crt-conio-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-crt-process-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-process-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-crt-filesystem-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-crt-filesystem-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-crt-conio-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-crt-conio-l1-1-0.dll',
+   'BINARY'),
   ('api-ms-win-core-rtlsupport-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-rtlsupport-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-handle-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-handle-l1-1-0.dll',
+  ('api-ms-win-core-errorhandling-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-errorhandling-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-util-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-util-l1-1-0.dll',
+  ('api-ms-win-core-string-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-string-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-interlocked-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-interlocked-l1-1-0.dll',
+  ('api-ms-win-core-file-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-2-0.dll',
    'BINARY'),
-  ('api-ms-win-core-timezone-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-timezone-l1-1-0.dll',
+  ('api-ms-win-core-namedpipe-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-namedpipe-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-string-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-string-l1-1-0.dll',
+  ('api-ms-win-core-processenvironment-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-processenvironment-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-libraryloader-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-libraryloader-l1-1-0.dll',
+  ('api-ms-win-core-sysinfo-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-sysinfo-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-profile-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-profile-l1-1-0.dll',
+  ('api-ms-win-core-synch-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-processthreads-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-handle-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-handle-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-file-l2-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-file-l2-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-localization-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-localization-l1-2-0.dll',
+  ('api-ms-win-core-timezone-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-timezone-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-datetime-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-datetime-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-processenvironment-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-processenvironment-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-core-debug-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-debug-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-synch-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-2-0.dll',
-   'BINARY'),
-  ('api-ms-win-core-memory-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-memory-l1-1-0.dll',
-   'BINARY'),
   ('api-ms-win-core-console-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-console-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-sysinfo-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-sysinfo-l1-1-0.dll',
+  ('api-ms-win-core-libraryloader-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-libraryloader-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-processthreads-l1-1-1.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-1.dll',
    'BINARY'),
-  ('api-ms-win-core-errorhandling-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-errorhandling-l1-1-0.dll',
+  ('api-ms-win-core-util-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-util-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-synch-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-1-0.dll',
+  ('api-ms-win-core-synch-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-synch-l1-2-0.dll',
    'BINARY'),
-  ('api-ms-win-core-namedpipe-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-namedpipe-l1-1-0.dll',
+  ('api-ms-win-core-profile-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-profile-l1-1-0.dll',
    'BINARY'),
   ('api-ms-win-core-file-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-1-0.dll',
    'BINARY'),
-  ('api-ms-win-core-processthreads-l1-1-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-processthreads-l1-1-0.dll',
-   'BINARY'),
-  ('api-ms-win-core-file-l1-2-0.dll',
-   'C:\\WINDOWS\\system32\\api-ms-win-core-file-l1-2-0.dll',
+  ('api-ms-win-core-localization-l1-2-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-localization-l1-2-0.dll',
    'BINARY'),
   ('api-ms-win-core-heap-l1-1-0.dll',
    'C:\\WINDOWS\\system32\\api-ms-win-core-heap-l1-1-0.dll',
    'BINARY'),
+  ('api-ms-win-core-memory-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-memory-l1-1-0.dll',
+   'BINARY'),
+  ('api-ms-win-core-interlocked-l1-1-0.dll',
+   'C:\\WINDOWS\\system32\\api-ms-win-core-interlocked-l1-1-0.dll',
+   'BINARY'),
   ('pywintypes38.dll',
    'd:\\devtools\\python38\\lib\\site-packages\\pywin32_system32\\pywintypes38.dll',
    'BINARY'),
@@ -179,12 +179,12 @@
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\win32api.pyd',
    'EXTENSION'),
   ('_ctypes', 'd:\\devtools\\python38\\DLLs\\_ctypes.pyd', 'EXTENSION'),
-  ('win32com.shell.shell',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shell.pyd',
-   'EXTENSION'),
   ('win32wnet',
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\win32wnet.pyd',
    'EXTENSION'),
+  ('win32com.shell.shell',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shell.pyd',
+   'EXTENSION'),
   ('_multiprocessing',
    'd:\\devtools\\python38\\DLLs\\_multiprocessing.pyd',
    'EXTENSION'),

BIN
build/gateway/PYZ-00.pyz


+ 92 - 53
build/gateway/PYZ-00.toc

@@ -136,23 +136,8 @@
   ('distutils',
    'd:\\devtools\\python38\\lib\\distutils\\__init__.py',
    'PYMODULE'),
-  ('distutils.ccompiler',
-   'd:\\devtools\\python38\\lib\\distutils\\ccompiler.py',
-   'PYMODULE'),
-  ('distutils.fancy_getopt',
-   'd:\\devtools\\python38\\lib\\distutils\\fancy_getopt.py',
-   'PYMODULE'),
-  ('distutils.debug',
-   'd:\\devtools\\python38\\lib\\distutils\\debug.py',
-   'PYMODULE'),
-  ('distutils.util',
-   'd:\\devtools\\python38\\lib\\distutils\\util.py',
-   'PYMODULE'),
-  ('distutils.filelist',
-   'd:\\devtools\\python38\\lib\\distutils\\filelist.py',
-   'PYMODULE'),
-  ('distutils.dep_util',
-   'd:\\devtools\\python38\\lib\\distutils\\dep_util.py',
+  ('distutils.archive_util',
+   'd:\\devtools\\python38\\lib\\distutils\\archive_util.py',
    'PYMODULE'),
   ('distutils.dir_util',
    'd:\\devtools\\python38\\lib\\distutils\\dir_util.py',
@@ -160,12 +145,30 @@
   ('distutils.file_util',
    'd:\\devtools\\python38\\lib\\distutils\\file_util.py',
    'PYMODULE'),
+  ('distutils.dep_util',
+   'd:\\devtools\\python38\\lib\\distutils\\dep_util.py',
+   'PYMODULE'),
   ('distutils.spawn',
    'd:\\devtools\\python38\\lib\\distutils\\spawn.py',
    'PYMODULE'),
+  ('distutils.debug',
+   'd:\\devtools\\python38\\lib\\distutils\\debug.py',
+   'PYMODULE'),
   ('distutils.errors',
    'd:\\devtools\\python38\\lib\\distutils\\errors.py',
    'PYMODULE'),
+  ('distutils.ccompiler',
+   'd:\\devtools\\python38\\lib\\distutils\\ccompiler.py',
+   'PYMODULE'),
+  ('distutils.fancy_getopt',
+   'd:\\devtools\\python38\\lib\\distutils\\fancy_getopt.py',
+   'PYMODULE'),
+  ('distutils.util',
+   'd:\\devtools\\python38\\lib\\distutils\\util.py',
+   'PYMODULE'),
+  ('distutils.filelist',
+   'd:\\devtools\\python38\\lib\\distutils\\filelist.py',
+   'PYMODULE'),
   ('distutils.sysconfig',
    'd:\\devtools\\python38\\lib\\distutils\\sysconfig.py',
    'PYMODULE'),
@@ -364,51 +367,40 @@
   ('pkg_resources',
    'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\__init__.py',
    'PYMODULE'),
-  ('pkg_resources.py2_warn',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\py2_warn.py',
+  ('packaging.tags',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\tags.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__init__.py',
+  ('typing', 'd:\\devtools\\python38\\lib\\typing.py', 'PYMODULE'),
+  ('packaging',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\__init__.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.six',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\six.py',
+  ('packaging.version',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\version.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.markers',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\markers.py',
+  ('packaging._musllinux',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\_musllinux.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.__about__',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__about__.py',
+  ('packaging.__about__',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\__about__.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.appdirs',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\appdirs.py',
+  ('packaging._manylinux',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\_manylinux.py',
    'PYMODULE'),
   ('ctypes', 'd:\\devtools\\python38\\lib\\ctypes\\__init__.py', 'PYMODULE'),
   ('ctypes._endian',
    'd:\\devtools\\python38\\lib\\ctypes\\_endian.py',
    'PYMODULE'),
-  ('win32com.shell.shellcon',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shellcon.py',
+  ('packaging.utils',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\utils.py',
    'PYMODULE'),
-  ('win32com.shell',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\__init__.py',
+  ('packaging.specifiers',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\specifiers.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.version',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\version.py',
+  ('packaging.requirements',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\requirements.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.requirements',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\requirements.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor.packaging._compat',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_compat.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor.packaging._structures',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_structures.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\__init__.py',
-   'PYMODULE'),
-  ('pkg_resources._vendor.pyparsing',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\pyparsing.py',
+  ('pyparsing',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pyparsing.py',
    'PYMODULE'),
   ('uuid', 'd:\\devtools\\python38\\lib\\uuid.py', 'PYMODULE'),
   ('ctypes.util', 'd:\\devtools\\python38\\lib\\ctypes\\util.py', 'PYMODULE'),
@@ -428,12 +420,60 @@
   ('netbios',
    'd:\\devtools\\python38\\lib\\site-packages\\win32\\lib\\netbios.py',
    'PYMODULE'),
-  ('pkg_resources._vendor.packaging.utils',
-   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\utils.py',
+  ('packaging._structures',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\_structures.py',
+   'PYMODULE'),
+  ('packaging.markers',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\packaging\\markers.py',
+   'PYMODULE'),
+  ('pkg_resources.py2_warn',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\py2_warn.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__init__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.six',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\six.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.appdirs',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\appdirs.py',
+   'PYMODULE'),
+  ('win32com.shell.shellcon',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\shellcon.py',
+   'PYMODULE'),
+  ('win32com.shell',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\win32comext\\shell\\__init__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.requirements',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\requirements.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.__about__',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\__about__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.version',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\version.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\__init__.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging._compat',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_compat.py',
    'PYMODULE'),
   ('pkg_resources._vendor.packaging.specifiers',
    'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\specifiers.py',
    'PYMODULE'),
+  ('pkg_resources._vendor.packaging.markers',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\markers.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.pyparsing',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\pyparsing.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging.utils',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\utils.py',
+   'PYMODULE'),
+  ('pkg_resources._vendor.packaging._structures',
+   'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\_vendor\\packaging\\_structures.py',
+   'PYMODULE'),
   ('pkg_resources.py31compat',
    'D:\\DevTools\\Python38\\Lib\\site-packages\\pkg_resources\\py31compat.py',
    'PYMODULE'),
@@ -518,10 +558,9 @@
   ('multiprocessing.spawn',
    'd:\\devtools\\python38\\lib\\multiprocessing\\spawn.py',
    'PYMODULE'),
+  ('_py_abc', 'd:\\devtools\\python38\\lib\\_py_abc.py', 'PYMODULE'),
   ('stringprep', 'd:\\devtools\\python38\\lib\\stringprep.py', 'PYMODULE'),
   ('tracemalloc', 'd:\\devtools\\python38\\lib\\tracemalloc.py', 'PYMODULE'),
-  ('_py_abc', 'd:\\devtools\\python38\\lib\\_py_abc.py', 'PYMODULE'),
-  ('typing', 'd:\\devtools\\python38\\lib\\typing.py', 'PYMODULE'),
   ('api_context', 'E:\\WorkSpace\\DataCollection\\api_context.py', 'PYMODULE'),
   ('apis.api_init',
    'E:\\WorkSpace\\DataCollection\\apis\\api_init.py',

+ 9 - 8
build/gateway/warn-gateway.txt

@@ -14,7 +14,7 @@ Types if import:
 IMPORTANT: Do NOT post this list to the issue-tracker. Use it as a basis for
            yourself tracking down the missing module. Thanks!
 
-missing module named 'org.python' - imported by copy (optional), xml.sax (delayed, conditional)
+missing module named 'org.python' - imported by copy (optional), setuptools.sandbox (conditional), xml.sax (delayed, conditional)
 missing module named _frozen_importlib_external - imported by importlib._bootstrap (delayed), importlib (optional), importlib.abc (optional), zipimport (top-level)
 excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional), zipimport (top-level), PyInstaller.loader.pyimod02_archive (delayed)
 missing module named urllib.unquote - imported by urllib (conditional), redis._compat (conditional)
@@ -32,17 +32,18 @@ missing module named readline - imported by cmd (delayed, conditional, optional)
 missing module named org - imported by pickle (optional)
 missing module named posix - imported by os (conditional, optional), shutil (conditional)
 missing module named resource - imported by posix (top-level), test.support (optional)
-missing module named grp - imported by shutil (optional), tarfile (optional), pathlib (delayed)
-missing module named pwd - imported by posixpath (delayed, conditional), shutil (optional), tarfile (optional), pathlib (delayed, conditional, optional), http.server (delayed, optional), webbrowser (delayed), netrc (delayed, conditional), getpass (delayed), distutils.util (delayed, conditional, optional)
+missing module named grp - imported by shutil (optional), tarfile (optional), pathlib (delayed), distutils.archive_util (optional)
+missing module named pwd - imported by posixpath (delayed, conditional), shutil (optional), tarfile (optional), pathlib (delayed, conditional, optional), http.server (delayed, optional), webbrowser (delayed), netrc (delayed, conditional), getpass (delayed), distutils.util (delayed, conditional, optional), distutils.archive_util (optional)
 missing module named 'win32com.gen_py' - imported by win32com (conditional, optional), D:\DevTools\Python38\Lib\site-packages\PyInstaller\hooks\rthooks\pyi_rth_win32comgenpy.py (top-level)
 missing module named pyimod03_importers - imported by D:\DevTools\Python38\Lib\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgres.py (top-level)
-missing module named StringIO - imported by PyInstaller.lib.modulegraph._compat (conditional), PyInstaller.lib.modulegraph.zipio (conditional), pkg_resources._vendor.six (conditional)
-missing module named 'pkg_resources.extern.pyparsing' - imported by pkg_resources._vendor.packaging.requirements (top-level), pkg_resources._vendor.packaging.markers (top-level)
+missing module named _manylinux - imported by packaging._manylinux (delayed, optional), setuptools._vendor.packaging.tags (delayed, optional)
+missing module named _uuid - imported by uuid (optional)
+missing module named __builtin__ - imported by pymysql._compat (conditional), pkg_resources._vendor.pyparsing (conditional), pyparsing (conditional), setuptools._vendor.pyparsing (conditional)
+missing module named ordereddict - imported by pkg_resources._vendor.pyparsing (optional), pyparsing (optional), setuptools._vendor.pyparsing (optional)
+missing module named StringIO - imported by setuptools._vendor.six (conditional), PyInstaller.lib.modulegraph._compat (conditional), PyInstaller.lib.modulegraph.zipio (conditional), pkg_resources._vendor.six (conditional)
 missing module named 'com.sun' - imported by pkg_resources._vendor.appdirs (delayed, conditional, optional)
 missing module named com - imported by pkg_resources._vendor.appdirs (delayed)
-missing module named _uuid - imported by uuid (optional)
-missing module named __builtin__ - imported by pymysql._compat (conditional), pkg_resources._vendor.pyparsing (conditional)
-missing module named ordereddict - imported by pkg_resources._vendor.pyparsing (optional)
+missing module named 'pkg_resources.extern.pyparsing' - imported by pkg_resources._vendor.packaging.markers (top-level), pkg_resources._vendor.packaging.requirements (top-level)
 missing module named pkg_resources.extern.packaging - imported by pkg_resources.extern (top-level), pkg_resources (top-level)
 missing module named pkg_resources.extern.appdirs - imported by pkg_resources.extern (top-level), pkg_resources (top-level)
 missing module named 'pkg_resources.extern.six.moves' - imported by pkg_resources (top-level), pkg_resources._vendor.packaging.requirements (top-level)

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 538 - 22
build/gateway/xref-gateway.html


+ 2 - 2
config.json

@@ -2,8 +2,8 @@
   "hardDiskdataBase": {
     "ip": "127.0.0.1",
     "username": "root",
-    "password": "root",
-    "dataBaseName": "datacollection"
+    "password": "sea12345",
+    "dataBaseName": "shucai"
   },
   "memoryDatabase": {
     "ip": "127.0.0.1",

+ 6 - 2
connectors/shuizhi_tcp_connector.py

@@ -98,7 +98,9 @@ class ShuizhiTcpConnector(Connector, threading.Thread):
         dissolved_oxygen = bytes.fromhex('010315CF0005B1FA')  # 读溶解氧发送指令,接收数据长度:15
         temperature_salinity = bytes.fromhex('010300FF001AF431')  # 读温度和盐度发送指令,接收数据长度:52 + 5 = 57
         PH = bytes.fromhex('010301D90002140C')  # 读PH发送指令,数据接收长度:4 + 5 = 9
-        chlorophyll = bytes.fromhex('010316A1000411A3')  # 读叶绿素发送指令,接收数据长度:8 + 5 = 13
+        # chlorophyll = bytes.fromhex('010316A1000411A3')  # 读叶绿素发送指令,接收数据长度:8 + 5 = 13
+        chlorophyll = bytes.fromhex('010316A80004C1A1')  # 读叶绿素发送指令,接收数据长度:8 + 5 = 13
+
         # depth = bytes.fromhex('0103046F0012F4EA')  # 读深度发送指令,接收数据长度:36 + 5 = 41
         # depth = bytes.fromhex('0103155100035016')  # 读深度发送指令,接收数据长度:6 + 5 = 11
         depth = bytes.fromhex('010315660003E1D8')  # 读深度发送指令,接收数据长度:6 + 5 = 11
@@ -137,6 +139,7 @@ class ShuizhiTcpConnector(Connector, threading.Thread):
             if self.__stopped:
                 break
 
+    # 水质解析器
     def save_format_data(self, t, name):
         data = {}
         for index in self.__data_point_config:
@@ -145,7 +148,8 @@ class ShuizhiTcpConnector(Connector, threading.Thread):
                     t = t / index['divisor']
                 if index['offset'] is not None:
                     t = t - index['offset']
-                if index['low_limit'] is not None and index['up_limit'] is not None and index['low_limit'] <= t <= index['up_limit']:
+                if index['low_limit'] is not None and index['up_limit'] is not None and index['low_limit'] <= t <= \
+                        index['up_limit']:
                     data = {'c' + str(index['serial_number']): t}
                     self.__storager.real_time_data_storage(data)
         print(data)

+ 1 - 1
connectors/tcp_connector.py

@@ -105,7 +105,7 @@ class TcpConnector(Connector, threading.Thread):
                 time.sleep(0.2)
                 data = self.__sock.recv(self.__size)
                 data = self.__converter.convert(self.__data_point_config, data)
-                print(data)
+                # print(data)
                 if data:
                     if data != "error" and data != 'pass':
                         self.__storager.real_time_data_storage(data)

+ 0 - 1
converters/adcp_converter.py

@@ -42,7 +42,6 @@ class AdcpConverter(Converter):
                             format_data[j] = format_data[j] - index['offset']
                         dict[name] = format_data[j]
                         j += 1
-                    print(dict)
                     return dict
                 elif len(raw_data) > 0:
                     return "pass"

+ 2 - 2
converters/td266_converter.py

@@ -12,7 +12,7 @@ class TD266Converter(Converter):
         # decode('utf-8'): data = 4420	1194	29.823	104.507	-7.471	28.872	253.153	9.369	1.816	91.491	-59.593	100	9.542	9.589	0.015
         # split('\t'): data = ['4420', '1194', '29.823', '104.507', '-7.471', '28.872', '253.153', '9.369', '1.816', '91.491', '-59.593', '100', '9.542', '9.589', '0.015']
         # print(len(data), time.strftime('%Y-%m-%d %H:%M:%S'), data)
-        pattern_start = b"4420\t1194"
+        pattern_start = b"4420"
         # pattern_end = b"\r\n"
         index_start = re.search(pattern_start, data)  # 查找字符串得到开始索引
         # index_end = re.search(pattern_end, data)
@@ -20,7 +20,7 @@ class TD266Converter(Converter):
         if index_start:
             index_start = index_start.span()[0]
             # index_end = index_end.span()[1]
-            data = data[index_start:25]  # 只获取流速和流向,大约取25个字符即可
+            data = data[index_start:75]  # 只获取流速和流向,大约取25个字符即可
             # print(data)
             data = data.decode('utf-8').split('\t')
             # print(data)

BIN
dist/gateway.exe


+ 173 - 0
gateway-Log/log_info.log

@@ -2,3 +2,176 @@
 [2021-07-19 15:17:19] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
 [2021-07-19 15:17:19] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [57]:Connect to [wxt536]:[192.168.1.29]:[4002] success !
 [2021-07-19 15:17:19] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-23 10:24:21] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [57]:Connect to [td266]:[192.168.1.29]:[4001] success !
+[2021-07-23 10:24:21] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-23 10:24:21] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-23 10:24:34] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-23 10:24:34] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [57]:Connect to [td266]:[192.168.1.29]:[4001] success !
+[2021-07-23 10:24:34] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-23 10:25:03] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [57]:Connect to [td266]:[192.168.1.29]:[4001] success !
+[2021-07-23 10:25:03] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-23 10:25:03] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:01:59] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:01:59] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:02:01] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [td266]:[192.168.1.29]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-07-26 09:02:03] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[192.168.1.29]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-07-26 09:06:21] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:06:21] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:07:03] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:07:03] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:11:09] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:11:09] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:12:08] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:12:08] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:12:44] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:12:44] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:14:25] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:14:25] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:14:44] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:14:44] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:14:52] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:14:52] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:23:36] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:23:36] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:24:04] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:24:04] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:24:14] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:24:14] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:24:52] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-07-26 09:25:21] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-07-26 09:25:21] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:09:42] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:09:42] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-08-17 15:09:43] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:09:43] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:09:43] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:09:43] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:09:45] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:45] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:45] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:45] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:52] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:52] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:52] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:52] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:59] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:59] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:59] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:09:59] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:07] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-08-17 15:10:07] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:10:11] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:10:11] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-08-17 15:10:13] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:13] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:13] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:13] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:22] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:22] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:22] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:22] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:49] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-08-17 15:10:49] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:10:51] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:51] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:51] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:51] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:10:53] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:53] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:53] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:10:53] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:00] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:00] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:00] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:00] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:07] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:07] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:07] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:07] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:14] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:14] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:14] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:11:14] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:12:26] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:12:26] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-08-17 15:12:28] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:12:28] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:12:28] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:12:28] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:12:30] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:12:30] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:12:30] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:12:30] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:01] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-08-17 15:13:01] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:13:03] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:13:03] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:13:03] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:13:03] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:13:05] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:05] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:05] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:05] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:12] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:12] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:12] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:12] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:19] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:19] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:19] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:19] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:26] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:26] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:26] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:26] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:33] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:33] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:33] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:33] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:40] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:40] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:40] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:40] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:47] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:47] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:47] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:47] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:54] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:54] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:54] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:13:54] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:01] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:01] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:01] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:01] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:08] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:08] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:08] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:08] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:13] E:\WorkSpace\DataCollection\historical_data_storage.py-info [16]:[HistoricalDataStorage] - Historical data storage module is running!
+[2021-08-17 15:14:13] E:\WorkSpace\DataCollection\alarm.py-info [53]:[overrun_alarm] - Over run alarm module is running!
+[2021-08-17 15:14:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:14:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:14:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:14:15] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [60]:Connect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!!
+[2021-08-17 15:14:17] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:17] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:17] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:17] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:24] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:24] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:24] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:24] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:31] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:31] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:31] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:31] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:38] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:38] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [wxt536]:[127.0.0.1]:[4001] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:38] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [td266]:[127.0.0.1]:[4003] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:38] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [adcp]:[127.0.0.1]:[4005] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..
+[2021-08-17 15:14:45] E:\WorkSpace\DataCollection\connectors\tcp_connector.py-info [76]:Reconnect to [sm140]:[127.0.0.1]:[4002] failed:[WinError 10061] 由于目标计算机积极拒绝,无法连接。 !!! Continue reconnect in 5s..

+ 2 - 8
gateway.py

@@ -41,11 +41,6 @@ Utility.start_connectors(connector_config)
 async def read_point_data(request):
     list = request.json['pointList']
     dict = gateway_storage.get_real_data(list)
-    '''
-    data_list = gateway_storage.get_point_info(list)
-    for info in data_list:
-        info['value'] = dict["c"+str(info['serial_number'])]
-    '''
     return response.json(dict)
 
 
@@ -122,13 +117,12 @@ async def notify_server_started_after_five_seconds():
 if __name__ == "__main__":
     alarm1 = Alarm()
     threading.Thread(target=alarm1.overrun_alarm).start()
-    # alarm2 = Alarm()
     # threading.Thread(target=alarm2.displacement_alarm).start()
     historicalDataStorage = HistoricalDataStorage()
     threading.Thread(target=historicalDataStorage.run).start()
     # app.add_task(overrun_alarm(app, alarm))
     # app.add_task(displacement_alarm(app, alarm))
-    # app.add_task(notify_server_started_after_five_seconds()) # 气象仪降雨量每日清零
+    # app.add_task(notify_server_started_after_five_seconds())  # 气象仪降雨量每日清零:一号打开,二号关闭,三号关闭
     app.run(host="0.0.0.0", port=8000)
 # pyinstaller -F -p C:\Users\wenge\AppData\Local\Programs\Python\Python38\Lib\site-packages  gateway.spec
-
+# pyinstaller -F -p D:\DevTools\Python38\Lib\site-packages  gateway.spec

+ 2 - 2
hard_disk_storage.py

@@ -20,7 +20,7 @@ class HardDiskStorage():
         try:
             self.conn = pymysql.connect(host=self.host, user=self.user, password=self.passwd, database=self.db, port=self.port, autocommit=True)
             return True
-        except:
+        except Exception as e:
             return False
 
     def _reConn(self, num=28800, stime=3):  # 重试连接总次数为1天,这里根据实际情况自己设置,如果服务器宕机1天都没发现就......
@@ -56,7 +56,7 @@ class HardDiskStorage():
         else:
             sql = "SELECT * FROM data_point_tbl"
         try:
-            # self._reConn()
+            self._reConn()
             self.cursor = self.conn.cursor(cursor=pymysql.cursors.DictCursor)
             self.cursor.execute(sql)
             results = self.cursor.fetchall()

+ 1 - 1
historical_data_storage.py

@@ -54,7 +54,7 @@ class HistoricalDataStorage:
                     save_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(save_time))
                     serial_number_list = item['serial_number_list']
                     real_time_data = self._storage.memoryStorage.get_value(serial_number_list)  # 根据键列表查询实时数据库
-                    print(real_time_data)
+                    # print(real_time_data)
                     flag = False  # 是否允许存储标志位
                     for key in real_time_data:
                         # 值全部为空,不允许存储

+ 12 - 8
memory_storage.py

@@ -1,14 +1,15 @@
 import redis
 
 
-class MemoryStorage():
+class MemoryStorage:
     def __init__(self, config):
         self.ip = config['ip']
         self.port = config['port']
-        self.conn = redis.StrictRedis(host=self.ip, port=self.port, db=0, decode_responses=True)
+        self.conn = None
+        self.connected()
 
     def connected(self):
-        pass
+        self.conn = redis.StrictRedis(host=self.ip, port=self.port, db=0, decode_responses=True)
 
     def set_value(self, data_dict):
         try:
@@ -23,20 +24,23 @@ class MemoryStorage():
             return True
 
     def get_value(self, keys):
-        dict = {}
+        data_dict = {}
         try:
             pipe = self.conn.pipeline(transaction=True)
             for index in range(len(keys)):
                 pipe.get(keys[index])
             result = pipe.execute()
             for index in range(len(keys)):
-                dict[keys[index]] = result[index]
-            return dict
+                data_dict[keys[index]] = result[index]
+            return data_dict
         except Exception as e:
             return e
 
     def is_connected(self):
-        pass
+        if self.conn:
+            return True
+        else:
+            return False
 
     def re_connected(self):
-        pass
+        self.conn = redis.StrictRedis(host=self.ip, port=self.port, db=0, decode_responses=True)

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác