Skip to content

C
cdz_gateway
Commit fa8cd04d by BANice
Options

修改同步口子时同步订单完成，未测试，修改了口子状态脱落检测与上次脱落时间是否超过十分钟未完成

parent 19488bd7
Showing with 2932 additions and 404 deletions
.idea/workspace.xml
...@@ -5,9 +5,44 @@ ...@@ -5,9 +5,44 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="00edf348-0453-4317-8d2b-bf5eb8ea4b7a" name="Default" comment=""> <list default="true" id="00edf348-0453-4317-8d2b-bf5eb8ea4b7a" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/Application/Model/OrderCapacityModel.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerExceptionMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerExcessMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerFailMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerFullMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/order_exception/Exception.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/order_exception/OrderState.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/order_exception/OrderTrace.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/send/Command.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/send/Send.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/send/command/BalanceChargerCommand.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/send/command/ChargerCommand.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/send/command/ConfirmChargerCommand.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/send/command/SimpleChargerCommand.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/send/command/StopChargerCommand.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/tool/ArrayToXml.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/tool/Crc.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/tool/StringTool.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bug_doc/guide/charger.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/AccessController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/AccessController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/HeartController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/HeartController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/PortController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PortController.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Application/Controller/PortController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PortController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/PowerController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PowerController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/SettingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/SettingController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Events.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Events.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Application/Events.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Events.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Route/Api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Route/Api.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Lib/Response.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Response.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/MessageData.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/MessageData.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/api/message/Push.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/api/message/Push.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/port/Port.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/port/Port.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/redis/RedisKey.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/redis/RedisKey.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -27,61 +62,47 @@ ...@@ -27,61 +62,47 @@
<file leaf-file-name="PowerController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PowerController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-867"> <state relative-caret-position="348">
<caret line="294" column="52" selection-start-line="294" selection-start-column="52" selection-end-line="294" selection-end-column="52" /> <caret line="293" selection-start-line="293" selection-end-line="293" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Events.php" pinned="false" current-in-tab="false"> <file leaf-file-name="SettingController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Events.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/SettingController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="317">
<caret line="193" lean-forward="true" selection-start-line="193" selection-end-line="193" /> <caret line="42" selection-start-line="42" selection-end-line="42" />
<folding>
<element signature="e#94#106#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PortModel.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PortController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Model/PortModel.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="PortController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="726"> <state relative-caret-position="602">
<caret line="218" column="90" lean-forward="true" selection-start-line="218" selection-start-column="90" selection-end-line="218" selection-end-column="90" /> <caret line="219" column="50" selection-start-line="219" selection-start-column="50" selection-end-line="219" selection-end-column="50" />
<folding>
<element signature="e#131#158#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Api.php" pinned="false" current-in-tab="false"> <file leaf-file-name="OrderTrace.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Route/Api.php"> <entry file="file://$PROJECT_DIR$/Lib/order_exception/OrderTrace.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="510">
<caret line="27" column="52" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" /> <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
<folding> <folding>
<element signature="e#113#155#0#PHP" expanded="true" /> <element signature="e#124#166#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Bintohex.php" pinned="false" current-in-tab="true"> <file leaf-file-name="_types.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/_types.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-385"> <state relative-caret-position="304">
<caret line="8" selection-start-line="8" selection-end-line="8" /> <caret line="105" column="13" selection-start-line="105" selection-start-column="13" selection-end-line="105" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -89,11 +110,17 @@ ...@@ -89,11 +110,17 @@
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244"> <state relative-caret-position="358">
<caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" /> <caret line="228" column="20" lean-forward="true" selection-start-line="228" selection-start-column="20" selection-end-line="228" selection-end-column="20" />
<folding> </state>
<element signature="e#126#153#0#PHP" expanded="true" /> </provider>
</folding> </entry>
</file>
<file leaf-file-name="Port.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/port/Port.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="471">
<caret line="347" column="20" selection-start-line="347" selection-start-column="20" selection-end-line="347" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -101,26 +128,26 @@ ...@@ -101,26 +128,26 @@
<file leaf-file-name="Redis.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Redis.php" pinned="false" current-in-tab="false">
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311"> <state relative-caret-position="304">
<caret line="2982" column="20" selection-start-line="2982" selection-start-column="20" selection-end-line="2982" selection-end-column="20" /> <caret line="2763" column="20" selection-start-line="2763" selection-start-column="20" selection-end-line="2763" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="RedisKey.php" pinned="false" current-in-tab="false"> <file leaf-file-name="HeartController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/redis/RedisKey.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/HeartController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="345">
<caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" /> <caret line="29" column="21" selection-start-line="29" selection-start-column="21" selection-end-line="29" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CertifyController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="OrderState.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php"> <entry file="file://$PROJECT_DIR$/Lib/order_exception/OrderState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="600">
<caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" /> <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -152,6 +179,9 @@ ...@@ -152,6 +179,9 @@
<replace>$pushMessage</replace> <replace>$pushMessage</replace>
<replace>333</replace> <replace>333</replace>
</replaceStrings> </replaceStrings>
<dirStrings>
<dir>$PROJECT_DIR$/Lib/send</dir>
</dirStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
...@@ -159,57 +189,57 @@ ...@@ -159,57 +189,57 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Application/start_gateway.php" />
<option value="$PROJECT_DIR$/Lib/Route.php" />
<option value="$PROJECT_DIR$/Lib/Aes.php" />
<option value="$PROJECT_DIR$/Lib/Request.php" />
<option value="$PROJECT_DIR$/Lib/log/logger.php" />
<option value="$PROJECT_DIR$/Lib/log/Logger.php" />
<option value="$PROJECT_DIR$/Lib/log/LogRecord.php" />
<option value="$PROJECT_DIR$/Application/Model/GatewayModel.php" />
<option value="$PROJECT_DIR$/Application/Controller/powerController.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/.example" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/Application/Middleware.php" />
<option value="$PROJECT_DIR$/Application/Middleware/hasMacMiddleware.php" />
<option value="$PROJECT_DIR$/Application/Middleware/HasMacMiddleware.php" /> <option value="$PROJECT_DIR$/Application/Middleware/HasMacMiddleware.php" />
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/Application/Model/PortModel.php" /> <option value="$PROJECT_DIR$/Application/Model/PortModel.php" />
<option value="$PROJECT_DIR$/Application/Model/OrderModel.php" /> <option value="$PROJECT_DIR$/Application/Model/OrderModel.php" />
<option value="$PROJECT_DIR$/Application/Controller/CapacityController.php" /> <option value="$PROJECT_DIR$/Application/Controller/CapacityController.php" />
<option value="$PROJECT_DIR$/Application/Controller/CertifyController.php" /> <option value="$PROJECT_DIR$/Application/Controller/CertifyController.php" />
<option value="$PROJECT_DIR$/Application/Model/StationModel.php" /> <option value="$PROJECT_DIR$/Application/Model/StationModel.php" />
<option value="$PROJECT_DIR$/start.php" /> <option value="$PROJECT_DIR$/start.php" />
<option value="$PROJECT_DIR$/Lib/api/message/Push.php" />
<option value="$PROJECT_DIR$/Lib/api/message/PortShetMessage.php" /> <option value="$PROJECT_DIR$/Lib/api/message/PortShetMessage.php" />
<option value="$PROJECT_DIR$/Lib/wx/User.php" /> <option value="$PROJECT_DIR$/Lib/wx/User.php" />
<option value="$PROJECT_DIR$/Lib/state/StateCode.php" /> <option value="$PROJECT_DIR$/Lib/state/StateCode.php" />
<option value="$PROJECT_DIR$/Application/Model/OrderExceptionModel.php" /> <option value="$PROJECT_DIR$/Application/Model/OrderExceptionModel.php" />
<option value="$PROJECT_DIR$/Application/Model.php" /> <option value="$PROJECT_DIR$/Application/Model.php" />
<option value="$PROJECT_DIR$/Lib/Log.php" /> <option value="$PROJECT_DIR$/Lib/Log.php" />
<option value="$PROJECT_DIR$/Lib/port/Port.php" />
<option value="$PROJECT_DIR$/Application/Controller.php" /> <option value="$PROJECT_DIR$/Application/Controller.php" />
<option value="$PROJECT_DIR$/Application/Model/ConfigModel.php" /> <option value="$PROJECT_DIR$/Application/Model/ConfigModel.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" /> <option value="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" />
<option value="$PROJECT_DIR$/Application/Controller/SettingController.php" />
<option value="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/MessageData.php" />
<option value="$PROJECT_DIR$/Application/Middleware/AuthMiddleware.php" /> <option value="$PROJECT_DIR$/Application/Middleware/AuthMiddleware.php" />
<option value="$PROJECT_DIR$/Lib/Gateway.php" /> <option value="$PROJECT_DIR$/Lib/Gateway.php" />
<option value="$PROJECT_DIR$/Application/Controller/HeartController.php" />
<option value="$PROJECT_DIR$/Lib/Response.php" />
<option value="$PROJECT_DIR$/Lib/log/DeviceLog.php" /> <option value="$PROJECT_DIR$/Lib/log/DeviceLog.php" />
<option value="$PROJECT_DIR$/Application/Model/ExceptionModel.php" /> <option value="$PROJECT_DIR$/Application/Model/ExceptionModel.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php" />
<option value="$PROJECT_DIR$/Application/Controller/PowerController.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php" /> <option value="$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php" />
<option value="$PROJECT_DIR$/Route/Api.php" />
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/Application/Model/OrderCapacityModel.php" />
<option value="$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php" />
<option value="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" />
<option value="$PROJECT_DIR$/Lib/rabbitmq/Publish.php" />
<option value="$PROJECT_DIR$/Lib/rabbitmq/PublishPortShed.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.php" />
<option value="$PROJECT_DIR$/Lib/Response.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerExcessMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/MessageData.php" />
<option value="$PROJECT_DIR$/Lib/api/message/Push.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerFullMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php" />
<option value="$PROJECT_DIR$/Application/Controller/SettingController.php" />
<option value="$PROJECT_DIR$/Application/Events.php" />
<option value="$PROJECT_DIR$/Lib/port/Port.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerFailMessage.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerExceptionMessage.php" />
<option value="$PROJECT_DIR$/Lib/order_exception/OrderTrace.php" />
<option value="$PROJECT_DIR$/Lib/order_exception/Exception.php" />
<option value="$PROJECT_DIR$/Lib/send/Send.php" />
<option value="$PROJECT_DIR$/Lib/tool/StringTool.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php" />
<option value="$PROJECT_DIR$/Application/Controller/HeartController.php" />
<option value="$PROJECT_DIR$/Lib/redis/RedisKey.php" /> <option value="$PROJECT_DIR$/Lib/redis/RedisKey.php" />
<option value="$PROJECT_DIR$/Application/Controller/AccessController.php" /> <option value="$PROJECT_DIR$/Application/Controller/AccessController.php" />
<option value="$PROJECT_DIR$/Application/Events.php" /> <option value="$PROJECT_DIR$/Application/Controller/PowerController.php" />
<option value="$PROJECT_DIR$/Lib/order_exception/OrderState.php" />
<option value="$PROJECT_DIR$/Application/Controller/PortController.php" /> <option value="$PROJECT_DIR$/Application/Controller/PortController.php" />
<option value="$PROJECT_DIR$/Route/Api.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -222,7 +252,7 @@ ...@@ -222,7 +252,7 @@
<component name="NodePackageJsonFileManager"> <component name="NodePackageJsonFileManager">
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="PhpWorkspaceProjectConfiguration"> <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 7.2">
<include_path> <include_path>
<path value="$PROJECT_DIR$/vendor/psr/log" /> <path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" /> <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
...@@ -236,10 +266,11 @@ ...@@ -236,10 +266,11 @@
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds" fullScreen="true">
<option name="y" value="23" /> <option name="x" value="1920" />
<option name="width" value="1855" /> <option name="y" value="-58" />
<option name="height" value="1057" /> <option name="width" value="1920" />
<option name="height" value="1080" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" /> <ConfirmationsSetting value="2" id="Add" />
...@@ -249,7 +280,6 @@ ...@@ -249,7 +280,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -271,85 +301,39 @@ ...@@ -271,85 +301,39 @@
<path> <path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Model" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" /> <item name="Lib" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" /> <item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" /> <item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" /> <item name="order_exception" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="message" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Lib" type="462c0819:PsiDirectoryNode" />
<item name="redis" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Route" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="Protocols" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="php.override.implement.member.chooser.php.doc" value="NONE" /> <property name="php.override.implement.member.chooser.php.doc" value="NONE" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" /> <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="web-ide.project.structure" /> <property name="settings.editor.selected.configurable" value="reference.webide.settings.project.settings.php" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/Application" />
<recent name="$PROJECT_DIR$" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/bug_doc/guide" />
<recent name="$PROJECT_DIR$/Lib" /> <recent name="$PROJECT_DIR$/Lib" />
<recent name="$PROJECT_DIR$/Lib/send" />
<recent name="$PROJECT_DIR$/Lib/rabbitmq" />
<recent name="$PROJECT_DIR$/vendor/workerman/workerman/Protocols" /> <recent name="$PROJECT_DIR$/vendor/workerman/workerman/Protocols" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/bug_doc" />
<recent name="$PROJECT_DIR$/Application" /> <recent name="$PROJECT_DIR$/Application" />
<recent name="$PROJECT_DIR$" />
</key> </key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
...@@ -386,12 +370,17 @@ ...@@ -386,12 +370,17 @@
<workItem from="1528162550658" duration="19510000" /> <workItem from="1528162550658" duration="19510000" />
<workItem from="1528264483144" duration="56097000" /> <workItem from="1528264483144" duration="56097000" />
<workItem from="1529386475275" duration="15536000" /> <workItem from="1529386475275" duration="15536000" />
<workItem from="1530073528657" duration="5482000" /> <workItem from="1530073528657" duration="10185000" />
<workItem from="1530325967120" duration="477000" />
<workItem from="1530326477489" duration="4139000" />
<workItem from="1530496499150" duration="45852000" />
<workItem from="1531129252870" duration="18903000" />
<workItem from="1531278957060" duration="17093000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="270795000" /> <option name="totallyTimeSpent" value="361962000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -403,17 +392,17 @@ ...@@ -403,17 +392,17 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1855" height="1057" extended-state="0" /> <frame x="1920" y="-58" width="1920" height="1080" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info anchor="bottom" id="TODO" order="6" weight="0.32977587" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.32977587" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="File Transfer" order="8" weight="0.32870865" /> <window_info anchor="bottom" id="File Transfer" order="8" visible="true" weight="0.041751526" />
<window_info anchor="bottom" id="Version Control" order="7" /> <window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.3191035" /> <window_info anchor="bottom" id="Terminal" order="7" weight="0.31873727" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.23883067" /> <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.1826411" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" /> <window_info anchor="right" id="Database" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
...@@ -440,357 +429,334 @@ ...@@ -440,357 +429,334 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/src/Lib/Db.php"> <entry file="file://$PROJECT_DIR$/Lib/rabbitmq/MyRabbitMq.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
</entry> <state relative-caret-position="582">
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/src/Lib/DbConnection.php"> <caret line="60" column="20" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
<provider selected="true" editor-type-id="text-editor" /> </state>
</entry> </provider>
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/src/BusinessWorker.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/src/Register.php">
<provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model/OrderModel.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/MessageData.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="465">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" /> <caret line="36" column="33" lean-forward="true" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Route.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/Push.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1000" /> <state relative-caret-position="375">
<caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Middleware/HasMacMiddleware.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/PortShedMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="255">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" /> <caret line="22" column="49" selection-start-line="22" selection-start-column="49" selection-end-line="22" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Crc.php"> <entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440"> <state relative-caret-position="60">
<caret line="66" column="27" selection-start-line="66" selection-start-column="27" selection-end-line="66" selection-end-column="27" /> <caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Middleware.php"> <entry file="file://$PROJECT_DIR$/start.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model/OrderExceptionModel.php"> <entry file="file://$PROJECT_DIR$/Application/Model/StationModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="120">
<caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" /> <caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/src/Lib/Gateway.php"> <entry file="file://$PROJECT_DIR$/Application/Model/ExceptionModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311"> <state relative-caret-position="120">
<caret line="869" column="27" selection-start-line="869" selection-start-column="27" selection-end-line="869" selection-end-column="27" /> <caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/mysql/src/Connection.php"> <entry file="file://$PROJECT_DIR$/Lib/log/DeviceLog.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6250"> <state relative-caret-position="114">
<caret line="1910" column="20" selection-start-line="1910" selection-start-column="20" selection-end-line="1910" selection-end-column="20" /> <caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
<folding>
<element signature="e#34#48#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model.php"> <entry file="file://$PROJECT_DIR$/Lib/order_exception/Ordee.php" />
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334"> <state relative-caret-position="318">
<caret line="40" column="20" selection-start-line="40" selection-start-column="20" selection-end-line="40" selection-end-column="20" /> <caret line="76" column="9" selection-start-line="76" selection-start-column="9" selection-end-line="76" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/mysql/README.md"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="text-editor">
<state split_layout="SPLIT"> <state relative-caret-position="722">
<first_editor relative-caret-position="-360" /> <caret line="70" column="11" selection-start-line="70" selection-start-column="11" selection-end-line="70" selection-end-column="11" />
<second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model/ConfigModel.php"> <entry file="file://$PROJECT_DIR$/Lib/order_exception/Exception.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="330">
<caret line="24" column="5" lean-forward="true" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" /> <caret line="27" selection-start-line="27" selection-end-line="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_3.php"> <entry file="file://$PROJECT_DIR$/Lib/send/send/command/ChargerCommand.php" />
<entry file="file://$PROJECT_DIR$/Lib/send/command/ChargerCommand.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319"> <state relative-caret-position="360">
<caret line="856" column="9" selection-start-line="856" selection-start-column="9" selection-end-line="856" selection-end-column="9" /> <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php"> <entry file="file://$PROJECT_DIR$/Lib/tool/ArrayToXml.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Lib/tool/Crc.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Lib/tool/StringTool.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367"> <state relative-caret-position="90">
<caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" /> <caret line="11" selection-start-line="11" selection-end-line="11" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/port/Port.php"> <entry file="file://$PROJECT_DIR$/Lib/send/Send.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5085"> <state relative-caret-position="1320">
<caret line="346" selection-start-line="346" selection-end-line="346" /> <caret line="96" selection-start-line="96" selection-end-line="96" />
<folding> <folding>
<element signature="e#117#129#0#PHP" expanded="true" /> <element signature="e#115#131#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Middleware/AuthMiddleware.php"> <entry file="file://$PROJECT_DIR$/Lib/send/command/StopChargerCommand.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="990">
<caret line="18" column="44" selection-start-line="18" selection-start-column="44" selection-end-line="18" selection-end-column="44" /> <caret line="72" column="20" selection-start-line="72" selection-start-column="20" selection-end-line="72" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/CapacityController.php"> <entry file="file://$PROJECT_DIR$/Lib/Log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="300">
<caret line="33" selection-start-line="33" selection-end-line="33" /> <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/SettingController.php"> <entry file="file://$PROJECT_DIR$/Lib/send/command/BalanceChargerCommand.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFullMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660"> <state relative-caret-position="285">
<caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" /> <caret line="24" selection-start-line="24" selection-end-line="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/composer.json"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="955">
<caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" /> <caret line="96" column="39" selection-start-line="96" selection-start-column="39" selection-end-line="96" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/start.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFailMessage.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
</entry> <state relative-caret-position="-304">
<entry file="file://$PROJECT_DIR$/Application/start_businessworker.php"> <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor />
<second_editor />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/composer.json"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerExcessMessage.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/gateway-worker/src/Gateway.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810"> <state relative-caret-position="90">
<caret line="54" column="6" selection-start-line="54" selection-start-column="6" selection-end-line="54" selection-end-column="6" /> <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Gateway.php"> <entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284"> <state relative-caret-position="1869">
<caret line="19" column="18" lean-forward="true" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" /> <caret line="224" selection-start-line="224" selection-end-line="224" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/HeartController.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerExceptionMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="512">
<caret line="30" column="27" lean-forward="true" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" /> <caret line="57" column="41" selection-start-line="57" selection-start-column="41" selection-end-line="57" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Response.php"> <entry file="file://$PROJECT_DIR$/Application/Controller.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318"> <state relative-caret-position="1245">
<caret line="80" column="73" lean-forward="true" selection-start-line="80" selection-start-column="73" selection-end-line="80" selection-end-column="73" /> <caret line="93" column="18" lean-forward="true" selection-start-line="93" selection-start-column="18" selection-end-line="93" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/Log.php"> <entry file="file://$PROJECT_DIR$/Application/Model.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="426">
<caret line="36" column="21" selection-start-line="36" selection-start-column="21" selection-end-line="36" selection-end-column="21" /> <caret line="93" column="43" selection-start-line="93" selection-start-column="43" selection-end-line="93" selection-end-column="43" />
<folding>
<element signature="e#111#151#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/MessageData.php"> <entry file="file://$PROJECT_DIR$/Application/Model/OrderExceptionModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="255">
<caret line="24" column="20" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" /> <caret line="22" selection-start-line="22" selection-end-line="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/PortShedMessage.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="1535">
<caret line="31" column="7" lean-forward="true" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" /> <caret line="132" column="20" selection-start-line="132" selection-start-column="20" selection-end-line="132" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/Push.php"> <entry file="file://$PROJECT_DIR$/Lib/redis/RedisKey.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <state relative-caret-position="660">
<caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" /> <caret line="49" selection-start-line="49" selection-end-line="49" />
<folding>
<element signature="e#119#141#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php"> <entry file="file://$PROJECT_DIR$/Lib/state/StateCode.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229"> <state relative-caret-position="210">
<caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" /> <caret line="19" column="10" selection-start-line="19" selection-start-column="10" selection-end-line="19" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model/ExceptionModel.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerReloadMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="90">
<caret line="11" column="22" lean-forward="true" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" /> <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/state/StateCode.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="390">
<caret line="31" column="10" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" /> <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php"> <entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495"> <state relative-caret-position="491">
<caret line="39" column="7" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" /> <caret line="81" column="13" selection-start-line="81" selection-start-column="13" selection-end-line="81" selection-end-column="13" />
<folding>
<element signature="e#118#151#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php"> <entry file="file://$PROJECT_DIR$/Route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645"> <state relative-caret-position="300">
<caret line="48" column="24" selection-start-line="48" selection-start-column="24" selection-end-line="48" selection-end-column="24" /> <caret line="27" column="52" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2265"> <state relative-caret-position="304">
<caret line="161" column="20" selection-start-line="161" selection-start-column="20" selection-end-line="161" selection-end-column="20" /> <caret line="2763" column="20" selection-start-line="2763" selection-start-column="20" selection-end-line="2763" selection-end-column="20" />
<folding>
<element signature="e#119#131#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/log/DeviceLog.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_1.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="299">
<caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" /> <caret line="996" column="9" selection-start-line="996" selection-start-column="9" selection-end-line="996" selection-end-column="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Model/PortModel.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_3.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="94" column="9" selection-start-line="94" selection-start-column="9" selection-end-line="94" selection-end-column="9" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/CertifyController.php"> <entry file="file://$PROJECT_DIR$/bug_doc/guide/charger.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="358">
<caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" /> <caret line="228" column="20" lean-forward="true" selection-start-line="228" selection-start-column="20" selection-end-line="228" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Lib/redis/RedisKey.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/HeartController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="345">
<caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" /> <caret line="29" column="21" selection-start-line="29" selection-start-column="21" selection-end-line="29" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/redis/Redis.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311"> <state relative-caret-position="348">
<caret line="2982" column="20" selection-start-line="2982" selection-start-column="20" selection-end-line="2982" selection-end-column="20" /> <caret line="293" selection-start-line="293" selection-end-line="293" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/AccessController.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/SettingController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244"> <state relative-caret-position="317">
<caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" /> <caret line="42" selection-start-line="42" selection-end-line="42" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php"> <entry file="file://$PROJECT_DIR$/Lib/port/Port.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="471">
<caret line="193" lean-forward="true" selection-start-line="193" selection-end-line="193" /> <caret line="347" column="20" selection-start-line="347" selection-start-column="20" selection-end-line="347" selection-end-column="20" />
<folding>
<element signature="e#94#106#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/_types.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-867"> <state relative-caret-position="304">
<caret line="294" column="52" selection-start-line="294" selection-start-column="52" selection-end-line="294" selection-end-column="52" /> <caret line="105" column="13" selection-start-line="105" selection-start-column="13" selection-end-line="105" selection-end-column="13" />
<folding>
<element signature="e#126#153#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php"> <entry file="file://$PROJECT_DIR$/Lib/order_exception/OrderTrace.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="726"> <state relative-caret-position="510">
<caret line="218" column="90" lean-forward="true" selection-start-line="218" selection-start-column="90" selection-end-line="218" selection-end-column="90" /> <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
<folding> <folding>
<element signature="e#131#158#0#PHP" expanded="true" /> <element signature="e#124#166#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Route/Api.php"> <entry file="file://$PROJECT_DIR$/Lib/order_exception/OrderState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="600">
<caret line="27" column="52" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" /> <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
<folding>
<element signature="e#113#155#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php"> <entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-385"> <state relative-caret-position="602">
<caret line="8" selection-start-line="8" selection-end-line="8" /> <caret line="219" column="50" selection-start-line="219" selection-start-column="50" selection-end-line="219" selection-end-column="50" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
Application/Controller/AccessController.php
...@@ -11,6 +11,7 @@ namespace Application\Controller; ...@@ -11,6 +11,7 @@ namespace Application\Controller;
use Application\Controller; use Application\Controller;
use Application\Model\GatewayModel; use Application\Model\GatewayModel;
use Application\Model\OrderModel;
use Application\Model\PortModel; use Application\Model\PortModel;
use Application\Model\StationModel; use Application\Model\StationModel;
use GatewayWorker\Lib\Gateway; use GatewayWorker\Lib\Gateway;
...@@ -129,9 +130,7 @@ class AccessController extends Controller ...@@ -129,9 +130,7 @@ class AccessController extends Controller
public function syncPort() public function syncPort()
{ {
Log::debug('端口同步', $this->getRequest()->getParameters()); Log::debug('端口同步');
Log::debug($this->message);
$startLogicNum = $this->get('start_num'); $startLogicNum = $this->get('start_num');
...@@ -157,6 +156,13 @@ class AccessController extends Controller ...@@ -157,6 +156,13 @@ class AccessController extends Controller
$portMacId = isset($_SESSION['port_mac_id']) ? $_SESSION['port_mac_id'] : []; $portMacId = isset($_SESSION['port_mac_id']) ? $_SESSION['port_mac_id'] : [];
//口子的逻辑地址和id映射缓存到session 中
foreach ($macLogicArray as $mac => $logic) {
if (isset($portMacId[$mac])) {
$_SESSION['logic_port_id'][$logic] = $portMacId[$mac];
}
}
$port = new port(); $port = new port();
$portIdState = []; $portIdState = [];
...@@ -170,6 +176,7 @@ class AccessController extends Controller ...@@ -170,6 +176,7 @@ class AccessController extends Controller
foreach ($macLogicArray as $mac => $logic)//将端口状态和端口逻辑地址更新至数据库中 foreach ($macLogicArray as $mac => $logic)//将端口状态和端口逻辑地址更新至数据库中
{ {
if (isset($portMacId[$mac])) { if (isset($portMacId[$mac])) {
$portId = $portMacId[$mac]; $portId = $portMacId[$mac];
$redis->hSet(RedisKey::PORT_ID_LOGIC_HASH, $portId, (int)$logic); $redis->hSet(RedisKey::PORT_ID_LOGIC_HASH, $portId, (int)$logic);
...@@ -192,6 +199,9 @@ class AccessController extends Controller ...@@ -192,6 +199,9 @@ class AccessController extends Controller
$redis->exec(); $redis->exec();
Log::debug('口子状态', $portIdState
);
$port->setPortState($portIdState); //改变口子状态 $port->setPortState($portIdState); //改变口子状态
...@@ -202,7 +212,74 @@ class AccessController extends Controller ...@@ -202,7 +212,74 @@ class AccessController extends Controller
} }
return $this->response->send('03', $startLogicNum . $count . $totalCount); $responseOrder = [];
$time = time();
foreach ($portIdState as $id => $state) {
$port->setId($id);
$orderId = $port->getPortUsingOrderId($redis, $id);
var_dump($orderId);
if (isset($orderId) === false || $orderId === false || $orderId == 0) {
continue;
} else {
$orderModel = new OrderModel();
$orderInfo = $orderModel->getColumns(['charger_time', 'created_at', 'logic_num'], 'id = ' . $orderId);
$createdTime = $orderInfo['created_at'];
$chargerTime = $orderInfo['charger_time'];
if (($chargerTime + strtotime($createdTime) < $time)) {
continue;
} else {
$chargerTime = ceil($chargerTime - ($time - strtotime($createdTime)));
$chargerTime = (int)$chargerTime;
if ($chargerTime > 0) {
array_push($responseOrder, [
sprintf('%02x', $orderInfo['logic_num']),
sprintf('%012x', $orderId),
sprintf('%04x', $chargerTime),
]);
}
}
}
}
$orderCount = sprintf('%02x',count($responseOrder));
$responseOrderMessage = '';
foreach ($responseOrder as $order) {
$responseOrderMessage.=implode('',$order);
}
Log::debug($orderCount);
Log::debug('order_using',$responseOrder);
Log::debug('response_order_message ->'.$responseOrderMessage);
return $this->response->send('03', $startLogicNum . $count . $totalCount.$orderCount.$responseOrderMessage);
} }
...@@ -225,6 +302,8 @@ class AccessController extends Controller ...@@ -225,6 +302,8 @@ class AccessController extends Controller
} }
Log::debug('mac => logic', $macLogic);
return $macLogic; return $macLogic;
} }
......
Application/Controller/HeartController.php
...@@ -19,18 +19,24 @@ class HeartController extends Controller ...@@ -19,18 +19,24 @@ class HeartController extends Controller
'00' => [ '00' => [
] ],
]; ];
public function heart() public function heart()
{ {
$time = sprintf('%08x',time()); $time = sprintf('%08x', time());
Log::debug("[heart]", [
Log::debug($time); 'gateway_id' => $_SESSION['gateway_id'],
'data' => $this->message,
'length' => hexdec(substr($this->message,4*2,4)),
$this->response->send('00',$time); ]);
$this->response->send('00', $time);
} }
......
Application/Controller/PortController.php
...@@ -15,12 +15,16 @@ use Application\Model\OrderExceptionModel; ...@@ -15,12 +15,16 @@ use Application\Model\OrderExceptionModel;
use Application\Model\OrderModel; use Application\Model\OrderModel;
use Application\Model\PortModel; use Application\Model\PortModel;
use Application\Model\StationModel; use Application\Model\StationModel;
use function GuzzleHttp\Psr7\str;
use Lib\api\message\ChargerReloadMessage;
use Lib\api\message\ChargerStartMessage; use Lib\api\message\ChargerStartMessage;
use Lib\api\message\PortShedMessage; use Lib\api\message\PortShedMessage;
use Lib\api\message\Push; use Lib\api\message\Push;
use Lib\Gateway; use Lib\Gateway;
use Lib\Log; use Lib\Log;
use Lib\order_exception\OrderState;
use Lib\port\Port; use Lib\port\Port;
use Lib\rabbitmq\PublishPortShed;
use Lib\state\StateCode; use Lib\state\StateCode;
use Lib\wx\User; use Lib\wx\User;
...@@ -151,6 +155,8 @@ class PortController extends Controller ...@@ -151,6 +155,8 @@ class PortController extends Controller
public function portState() public function portState()
{ {
$nowTime = date('Y-m-d H:i:s');
Log::debug('口子状态改变', $this->getRequest()->getParameters()); Log::debug('口子状态改变', $this->getRequest()->getParameters());
$portMac = $this->get('mac'); $portMac = $this->get('mac');
...@@ -169,7 +175,7 @@ class PortController extends Controller ...@@ -169,7 +175,7 @@ class PortController extends Controller
$lastState = $port->getState($portId); $lastState = $port->getState($portId);
Log::debug('口子状态改变为脱落->原状态为' . $lastState . '更新->' . $state); Log::debug('口子状态改变-->原状态为->' . $lastState . '更新->' . $state);
if ($state === StateCode::PORT_EXCEPTION) { if ($state === StateCode::PORT_EXCEPTION) {
...@@ -177,6 +183,9 @@ class PortController extends Controller ...@@ -177,6 +183,9 @@ class PortController extends Controller
return; return;
} }
$orderId = $port->getPortUsingOrderId(\Events::getRedis(), $portId);
if ($lastState == -1 && $state === 12) { if ($lastState == -1 && $state === 12) {
try { try {
...@@ -184,9 +193,7 @@ class PortController extends Controller ...@@ -184,9 +193,7 @@ class PortController extends Controller
$update = ['is_charger' => $state]; $update = ['is_charger' => $state];
$update['start_time'] = date('Y-m-d H:i:s'); $update['start_time'] = $nowTime;
$orderId = $port->getPortUsingOrderId(\Events::getRedis(), $portId);
$row = $orderModel->update($update, 'id = ' . $orderId); $row = $orderModel->update($update, 'id = ' . $orderId);
...@@ -195,13 +202,38 @@ class PortController extends Controller ...@@ -195,13 +202,38 @@ class PortController extends Controller
Log::error($exception->getMessage()); Log::error($exception->getMessage());
} }
} } else if ($state === StateCode::PORT_SHED) {
$orderModel = new OrderModel();
$userId = $port->getPortUsingId(\Events::getRedis(), $portId); $lastShedTime = $orderModel->getColumn('shed_time', 'id = ' . $orderId);
$orderId = $port->getPortUsingOrderId(\Events::getRedis(), $portId); $update = ['shed_time' => $nowTime];
$orderLastState = OrderState::getState($orderId);
if($orderLastState == StateCode::PORT_SHED) {
if (isset($lastShedTime)) {
$gapTime = strtotime($nowTime) - strtotime($lastShedTime);
if (($gapTime / 60) > 12) {
//口子距离上一次插口脱落时间超过了十分中，下发结束充电命令
//发送结束充电,结束状态为远程超时结束
Log::debug('todo 插口脱落超时10分钟');
}
}
}
$orderModel->update($update, 'id = ' . $orderId);
}
$userId = $port->getPortUsingId(\Events::getRedis(), $portId);
//服务器下发充电命令给下位机并将口子状态设置为-1，如果口子未插上下位机返回14，这种情况下口子依然被视为等待充电不改变状态，保持-1，但需要推送消息 //服务器下发充电命令给下位机并将口子状态设置为-1，如果口子未插上下位机返回14，这种情况下口子依然被视为等待充电不改变状态，保持-1，但需要推送消息
if ($lastState != -1 || $state != 14) { if ($lastState != -1 || $state != 14) {
...@@ -262,30 +294,30 @@ class PortController extends Controller ...@@ -262,30 +294,30 @@ class PortController extends Controller
switch ($state) { switch ($state) {
case StateCode::PORT_CHARGER: case StateCode::PORT_CHARGER:
if ($lastState == 14) {
$orderModel = new OrderModel(); $orderState = new OrderState($orderId);
$result = $orderModel->getColumns(['port_name', 'station_name', 'created_at', 'charger_time', 'order_amount'], 'id = ' . $orderId); $orderState->setState(12);
if (count($result) !== 0) { $orderModel = new OrderModel();
try {
$result = $orderModel->getColumns(['port_name', 'station_name', 'created_at', 'charger_time', 'order_amount'], 'id = ' . $orderId);
$chargerStartMessage = new ChargerStartMessage(); if ($lastState == 14) {
$chargerStartMessage->setUserId($userId); if (count($result) !== 0) {
try {
$chargerStartMessage->setStartTime($result['created_at']); $chargerReloadMessage = new ChargerReloadMessage();
$chargerStartMessage->setAddress($result['station_name'] . '-' . $result['port_name']); $chargerReloadMessage->setStationName($result['station_name']);
$chargerStartMessage->setAmount(number_format($result['order_amount'] / 100, 2)); $chargerReloadMessage->setPortName($result['port_name']);
$push = new Push(); $push = new Push();
$push->push($chargerStartMessage, $userId); $push->push($chargerReloadMessage, $userId);
} catch (\Exception $exception) { } catch (\Exception $exception) {
Log::error($exception->getMessage()); Log::error($exception->getMessage());
...@@ -297,6 +329,19 @@ class PortController extends Controller ...@@ -297,6 +329,19 @@ class PortController extends Controller
} }
} else if ($lastState == -1) {
$chargerStartMessage = new ChargerStartMessage();
$chargerStartMessage->setStartTime($result['created_at']);
$chargerStartMessage->setAmount(number_format($result['order_amount'] / 100, 2));
$chargerStartMessage->setAddress($result['station_name'] . '(' . $result['port_name'] . ')');
$push = new Push();
$push->push($chargerStartMessage, $userId);
} }
break; break;
...@@ -327,7 +372,11 @@ class PortController extends Controller ...@@ -327,7 +372,11 @@ class PortController extends Controller
$portShedMessage->setStationName($stationName); $portShedMessage->setStationName($stationName);
$portShedMessage->setTime(10); $portShedMessage->setRemark('超时将关闭订单喔，请尽快重连插口');
$portShedMessage->setWaitingTime(10);
$portShedMessage->setTime(date('Y-m-d H:i:s'));
$push = new Push(); $push = new Push();
...@@ -345,6 +394,27 @@ class PortController extends Controller ...@@ -345,6 +394,27 @@ class PortController extends Controller
} }
//发送延迟任务
try {
$publishPortShedJob = new PublishPortShed();
} catch (\Exception $exception) {
Log::error($exception->getMessage());
}
$publishPortShedJob->publishOrder(
[
'order_id' => $orderId,
'time' => date('Y-m-d H:i:s'),
'gateway_mac' => $_SESSION['gateway_mac'],
]
);
} }
break; break;
......
Application/Controller/PowerController.php
...@@ -10,17 +10,30 @@ namespace Application\Controller; ...@@ -10,17 +10,30 @@ namespace Application\Controller;
use Application\Controller; use Application\Controller;
use Application\Model\ExceptionModel;
use Application\Model\OrderCapacityModel;
use Application\Model\OrderExceptionModel;
use Application\Model\OrderModel; use Application\Model\OrderModel;
use Lib\api\message\ChargerExceedMessage; use Lib\api\message\ChargerExceedMessage;
use Lib\api\message\ChargerExceptionMessage;
use Lib\api\message\ChargerExcessMessage;
use Lib\api\message\ChargerFailMessage;
use Lib\api\message\ChargerFinishMessage; use Lib\api\message\ChargerFinishMessage;
use Lib\api\message\ChargerRefundMessage; use Lib\api\message\ChargerRefundMessage;
use Lib\api\message\ChargerStartMessage; use Lib\api\message\ChargerStartMessage;
use Lib\api\message\MessageData;
use Lib\api\message\PortShedMessage; use Lib\api\message\PortShedMessage;
use Lib\api\message\Push; use Lib\api\message\Push;
use Lib\Gateway; use Lib\Gateway;
use Lib\Log; use Lib\Log;
use Lib\order_exception\OrderState;
use Lib\order_exception\OrderTrace;
use Lib\port\Port; use Lib\port\Port;
use Lib\rabbitmq\MyRabbitMq;
use Lib\send\command\StopChargerCommand;
use Lib\send\Send;
use Lib\state\StateCode; use Lib\state\StateCode;
use Workerman\Events\Event;
class PowerController extends Controller class PowerController extends Controller
{ {
...@@ -104,11 +117,11 @@ class PowerController extends Controller ...@@ -104,11 +117,11 @@ class PowerController extends Controller
$id = hexdec($orderId); $id = hexdec($orderId);
$_SESSION['current_order_id'] = $id;
$_SESSION['order_state'] = $state; $_SESSION['order_state'] = $state;
$orderCollection = $orderModel->getColumns(['wx_user_id', 'port_name', 'order_amount'], 'id = ' . $id); $orderCollection = $orderModel->getColumns(['wx_user_id', 'port_name', 'order_amount', 'port_id'], 'id = ' . $id);
$_SESSION['current_order_id'][strval($orderCollection['port_id'])] = $id;
$update = ['is_charger' => $state, 'start_capacity' => $power]; $update = ['is_charger' => $state, 'start_capacity' => $power];
...@@ -118,6 +131,8 @@ class PowerController extends Controller ...@@ -118,6 +131,8 @@ class PowerController extends Controller
$stationName = $_SESSION['station_name']; $stationName = $_SESSION['station_name'];
$orderState = new OrderState($orderId);
if ($state === StateCode::PORT_CHARGER) { if ($state === StateCode::PORT_CHARGER) {
$timeNow = date('Y-m-d H:i:s'); $timeNow = date('Y-m-d H:i:s');
...@@ -132,15 +147,24 @@ class PowerController extends Controller ...@@ -132,15 +147,24 @@ class PowerController extends Controller
$pushMessage->setAddress($stationName . '-' . $portName . '号'); $pushMessage->setAddress($stationName . '-' . $portName . '号');
} else if ($state === StateCode::PORT_SHED) { $orderState->setState($state);
} else if ($state === StateCode::PORT_EXCEPTION) {
Log::debug('开始充电，口子未插上'); $pushMessage = new ChargerExceptionMessage();
$pushMessage = new PortShedMessage(); $pushMessage->setAddress($stationName . "($portName)");
$pushMessage->setStationName($stationName); $orderAmount = number_format($orderCollection['order_amount'] / 100, 2);
$pushMessage->setAmount($orderAmount);
$pushMessage->setOrderId($orderId);
$orderState->setState($state);
$pushMessage->setPortName($portName);
} }
...@@ -158,8 +182,6 @@ class PowerController extends Controller ...@@ -158,8 +182,6 @@ class PowerController extends Controller
if (Gateway::isUidOnline($userId) === 1) { if (Gateway::isUidOnline($userId) === 1) {
Log::debug('webSocket', ['user_id' => $userId]);
Gateway::sendToUid($userId, json_encode(['code' => 10000])); Gateway::sendToUid($userId, json_encode(['code' => 10000]));
} else { } else {
...@@ -178,14 +200,15 @@ class PowerController extends Controller ...@@ -178,14 +200,15 @@ class PowerController extends Controller
} }
//记录订单的轨迹
$orderTrace = new OrderTrace($state);
//todo websocket推送给前段开始充电信息，如果未发现当前订单id连接则存入消息队列当中 $orderTrace->setOrderId($orderId);
$orderTrace->writeTrace();
} }
Log::debug('order_id ->'.$orderId);
$this->response->send('14', $orderId); $this->response->send('14', $orderId);
...@@ -231,6 +254,19 @@ class PowerController extends Controller ...@@ -231,6 +254,19 @@ class PowerController extends Controller
$portId = $port->getIdByLogic(); $portId = $port->getIdByLogic();
try {
//记录订单轨迹
$orderTrace = new OrderTrace($state);
$orderTrace->setOrderId($id);
$orderTrace->writeTrace();
} catch (\Exception $exception) {
Log::error($exception->getMessage());
}
// 发送微信消息给用户。 // 发送微信消息给用户。
// 充电结束时删除端口正在使用的hash表中的元素，删除充电用户正在充电订单中的本次订单 // 充电结束时删除端口正在使用的hash表中的元素，删除充电用户正在充电订单中的本次订单
...@@ -252,6 +288,11 @@ class PowerController extends Controller ...@@ -252,6 +288,11 @@ class PowerController extends Controller
$orderModel->update(['is_stop' => $state, 'state' => 1, 'end_capacity' => $capacity, 'end_time' => $time], ' id = ' . $id); $orderModel->update(['is_stop' => $state, 'state' => 1, 'end_capacity' => $capacity, 'end_time' => $time], ' id = ' . $id);
$orderState = new OrderState($orderId);
$orderState->setState($state);
} }
} }
...@@ -277,16 +318,26 @@ class PowerController extends Controller ...@@ -277,16 +318,26 @@ class PowerController extends Controller
case StateCode::FINISH_EXCEED: case StateCode::FINISH_EXCEED:
$finishMessage = new ChargerExceedMessage(); $finishMessage = new ChargerExceedMessage();
$finishMessage->setUserId($orderInfo['wx_user_id']); $finishMessage->setUserId($orderInfo['wx_user_id']);
$finishMessage->setStartTime($orderInfo['start_time']); $finishMessage->setStartTime($orderInfo['start_time']);
$finishMessage->setChargerTime($orderId['charger_time']); $finishMessage->setChargerTime($orderInfo['charger_time']);
$finishMessage->setEndTime($time); $finishMessage->setEndTime($time);
$orderExceptionModel = new OrderExceptionModel();
$orderExceptionModel->insertRow([
'order_id' => $orderId,
'state' => $state,
]);
break; break;
case StateCode::FINISH_REMOTE: case StateCode::FINISH_REMOTE:
...@@ -302,6 +353,32 @@ class PowerController extends Controller ...@@ -302,6 +353,32 @@ class PowerController extends Controller
$finishMessage->setUserId($orderInfo['wx_user_id']); $finishMessage->setUserId($orderInfo['wx_user_id']);
} else {
$finishMessage = new ChargerFinishMessage();
$finishMessage->setUserId($orderInfo['wx_user_id']);
$finishMessage->setEndTime($time);
$startTime = $orderInfo['start_time'];
$startTimeTimestamp = strtotime($startTime);
$now = time();
$first = $finishMessage->getFirst();
$first .= ' (远程关闭)';
$finishMessage->setFirst($first);
$finishMessage->setChargerTime(ceil(($now - $startTimeTimestamp) / 60));
$finishMessage->setChargerPlc($orderInfo['station_name'] . '-' . $orderInfo['port_id']);
$finishMessage->setOrderAmount($orderInfo['order_amount']);
} }
...@@ -322,6 +399,25 @@ class PowerController extends Controller ...@@ -322,6 +399,25 @@ class PowerController extends Controller
$finishMessage->setOrderAmount($orderInfo['order_amount']); $finishMessage->setOrderAmount($orderInfo['order_amount']);
break; break;
case StateCode::FINISH_FULL:
$finishMessage = new ChargerFinishMessage();
$finishMessage->setUserId($orderInfo['wx_user_id']);
$finishMessage->setEndTime($time);
$finishMessage->setChargerTime(ceil((time() - strtotime($orderInfo['charger_time']) / 60)));
$finishMessage->setChargerPlc($orderInfo['station_name'] . '-' . $orderInfo['port_id']);
$finishMessage->setOrderAmount($orderInfo['order_amount']);
break;
default: default:
break; break;
...@@ -332,9 +428,12 @@ class PowerController extends Controller ...@@ -332,9 +428,12 @@ class PowerController extends Controller
try { try {
if (isset($finishMessage) === true) { if (isset($finishMessage) == true) {
$push->push($finishMessage, $finishMessage->getUserId()); $push->push($finishMessage, $finishMessage->getUserId());
} }
} catch (\Exception $exception) { } catch (\Exception $exception) {
...@@ -342,6 +441,7 @@ class PowerController extends Controller ...@@ -342,6 +441,7 @@ class PowerController extends Controller
} }
unset($_SESSION['current_order_id']);
$this->response->send('15', $orderId); $this->response->send('15', $orderId);
...@@ -400,9 +500,54 @@ class PowerController extends Controller ...@@ -400,9 +500,54 @@ class PowerController extends Controller
$logicNum = $this->get('logic'); $logicNum = $this->get('logic');
$powerData = $this->get('power'); $powerData = hexdec($this->get('power'));
$capacity = hexdec($this->get('capacity'));
$port = new Port();
$port->setLogic($logicNum);
$capacity = $this->get('capacity'); if (isset($_SESSION['logic_port_id'][$logicNum])) {
$portId = $_SESSION['logic_port_id'][$logicNum];
} else {
$portId = $port->getIdByLogic();
}
if (isset($_SESSION['current_order_id'][$portId])) {
$orderId = $_SESSION['current_order_id'][$portId];
} else {
Log::info('gatway session 缺少当前订单id');
$orderId = $port->getPortUsingOrderId(\Events::getRedis(), $portId);
Log::info('从redis中获取当前订单 ->' . $orderId);
}
try {
$orderCapacityModel = new OrderCapacityModel();
$orderCapacityModel->insertRow([
'order_id' => $orderId,
'port_id' => $portId,
'capacity' => $capacity,
'power' => $powerData,
'created_at' => date('Y-m-d H:i:s'),
]);
} catch (\Exception $exception) {
Log::error($exception->getMessage());
}
} }
......
Application/Controller/SettingController.php
...@@ -11,6 +11,8 @@ namespace Application\Controller; ...@@ -11,6 +11,8 @@ namespace Application\Controller;
use Application\Controller; use Application\Controller;
use Application\Model\ConfigModel; use Application\Model\ConfigModel;
use Application\Model\StationModel;
use function Couchbase\defaultDecoder;
use Lib\Log; use Lib\Log;
class SettingController extends Controller class SettingController extends Controller
...@@ -31,19 +33,24 @@ class SettingController extends Controller ...@@ -31,19 +33,24 @@ class SettingController extends Controller
} }
Log::debug('config', $idConfigValue);
$invertalTime = $idConfigValue['5']; $invertalTime = $idConfigValue['5'];
$stationId = $_SESSION['station_id'];
$stationModel = new StationModel();
$stationMaxCep = $stationModel->getColumn('max_cep', 'id = ' . $stationId);
$powerUpperLimit = isset($stationMaxCep) ? $stationMaxCep : $idConfigValue['1'];
$getPriceConfig = $idConfigValue['6']; $getPriceConfig = $idConfigValue['6'];
$powerUpperLimit = $idConfigValue['1'];
$powerSaturateInvertalTime = $idConfigValue['7']; $powerSaturateInvertalTime = $idConfigValue['7'];
$extraTime = $idConfigValue['8']; $extraTime = $idConfigValue['8'];
$powerLowerLimit = 5; $powerLowerLimit = 120;
$detectTime = 5; $detectTime = 5;
...@@ -56,7 +63,6 @@ class SettingController extends Controller ...@@ -56,7 +63,6 @@ class SettingController extends Controller
[$powerLowerLimit, 2], [$powerLowerLimit, 2],
[$detectTime, 2], [$detectTime, 2],
]); ]);
Log::debug('afterFormat', $afterFormat);
$this->response->send('0a', implode($afterFormat)); $this->response->send('0a', implode($afterFormat));
......
Application/Events.php
...@@ -74,14 +74,10 @@ class Events ...@@ -74,14 +74,10 @@ class Events
public static function onMessage($clientId, $message) public static function onMessage($clientId, $message)
{ {
$crc = substr($message, -2); $crc = substr($message, -2);
$makeCrc = sprintf('%08x', (Crc::crc(substr($message, 0, -2)))); $makeCrc = sprintf('%08x', (Crc::crc(substr($message, 0, -2))));
if ($crc != mb_strtoupper(substr($makeCrc, 0, 2))) { if ($crc != mb_strtoupper(substr($makeCrc, 0, 2))) {
Log::error('crc 错误'); Log::error('crc 错误');
...@@ -90,8 +86,6 @@ class Events ...@@ -90,8 +86,6 @@ class Events
} else { } else {
$command = substr($message, 6, 2); $command = substr($message, 6, 2);
$route = Api::getRoute($command); $route = Api::getRoute($command);
...@@ -116,7 +110,6 @@ class Events ...@@ -116,7 +110,6 @@ class Events
if ($item instanceof \Application\Middleware) { if ($item instanceof \Application\Middleware) {
if ($item->handle($clientId, $message) === false) { if ($item->handle($clientId, $message) === false) {
try { try {
Gateway::closeCurrentClient(); Gateway::closeCurrentClient();
} catch (Exception $e) { } catch (Exception $e) {
...@@ -145,7 +138,6 @@ class Events ...@@ -145,7 +138,6 @@ class Events
} }
} }
...@@ -180,7 +172,7 @@ class Events ...@@ -180,7 +172,7 @@ class Events
$log = new \Lib\log\DeviceLog($gatewayMac); $log = new \Lib\log\DeviceLog($gatewayMac);
$log->setType('state'); $log->setType('offline');
$log->log(); $log->log();
...@@ -217,11 +209,10 @@ class Events ...@@ -217,11 +209,10 @@ class Events
$gatewayId = $_SESSION['gateway_id']; $gatewayId = $_SESSION['gateway_id'];
$insert = ['message' => '网关离线', 'gateway_id' => $gatewayId, 'type' => 1,'created_at' => date('Y-m-d H:i:s')]; $insert = ['message' => '网关离线', 'gateway_id' => $gatewayId, 'type' => 1, 'created_at' => date('Y-m-d H:i:s')];
if(isset($_SESSION['station_id'])) if (isset($_SESSION['station_id'])) {
{ $insert['station_id'] = $_SESSION['station_id'];
$insert['station_id'] = $_SESSION['station_id'];
} }
$exceptionModel->insertRow($insert); $exceptionModel->insertRow($insert);
...@@ -229,6 +220,10 @@ class Events ...@@ -229,6 +220,10 @@ class Events
Log::error($exception->getMessage()); Log::error($exception->getMessage());
} }
} }
public static function getRedis() public static function getRedis()
......
Application/Model/OrderCapacityModel.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/2
* Time: 上午10:17
*/
namespace Application\Model;
use Application\Model;
class OrderCapacityModel extends Model
{
protected $table = 'order_power_capacity';
}
\ No newline at end of file
Lib/Response.php
...@@ -106,7 +106,7 @@ class Response ...@@ -106,7 +106,7 @@ class Response
if(strlen($exceptCrc)%2 != 0) if(strlen($exceptCrc)%2 != 0)
{ {
Log::error('length wrogn'); Log::error('length wrong');
} }
Log::debug('response'.$exceptCrc); Log::debug('response'.$exceptCrc);
......
Lib/api/message/ChargerExceedMessage.php
...@@ -14,7 +14,7 @@ class ChargerExceedMessage extends MessageData ...@@ -14,7 +14,7 @@ class ChargerExceedMessage extends MessageData
/** /**
* @var string * @var string
*/ */
protected $templateId = 'IDrdzTNQ7t4uRXkP0SkuwW10WH77A_CIgYFiJykXJ0utU'; protected $templateId = 'rdzTNQ7t4uRXkP0SkuwW10WH77A_CIgYFiJykXJ0utU';
/** /**
* @var string * @var string
...@@ -57,14 +57,10 @@ class ChargerExceedMessage extends MessageData ...@@ -57,14 +57,10 @@ class ChargerExceedMessage extends MessageData
], ],
'keyword2' => [ 'keyword2' => [
'value' => $this->chargerTime, 'value' => $this->chargerTime.'分钟',
'color' => '#333', 'color' => '#333',
], ],
'keyword3' => [ 'keyword3' => [
'value' => $this->chargerTime,
'color' => '#333',
],
'keyword4' => [
'value' => $this->endTime, 'value' => $this->endTime,
'color' => '#333', 'color' => '#333',
], ],
...@@ -73,6 +69,7 @@ class ChargerExceedMessage extends MessageData ...@@ -73,6 +69,7 @@ class ChargerExceedMessage extends MessageData
'color' => '#333', 'color' => '#333',
], ],
]); ]);
} }
/** /**
......
Lib/api/message/ChargerExceptionMessage.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/10
* Time: 下午3:27
*/
namespace Lib\api\message;
class ChargerExceptionMessage extends MessageData
{
protected $templateId = '0al-a6kkNsdqFyXPEe97m4jjtbfOXjEC3eCjEsMHJdw';
protected $first = '充电口打开失败，已取消订单，退款稍后送达，请注意查收哟';
/**
* @var string
*/
private $orderId = '';
/**
* @var string
*/
private $address = '';
/**
* @var int
*/
private $amount;
/**
* @var string
*/
private $remark = '温馨提示：超时关闭此次交易，支付金额会在1个工作日内退回您的余额或零钱，请注意查看，若未收到请联系我们的客服为您处理。若为充电口异常，请您及时更换至其它充电口充电';
public function getPushDataJson(): string
{
// TODO: Implement getPushDataJson() method.
return json_encode([
'first' => [
'value' => $this->first,
'color' => '#333',
],
'keyword1' => [
'value' => $this->orderId,
'color' => '#333',
],
'keyword2' => [
'value' => $this->address,
'color' => '#333',
],
'keyword3' => [
'value' => $this->amount,
'color' => '#333',
],
'remark' => [
'value' => $this->remark,
'color' => '#333',
],
]);
}
/**
* @return string
*/
public function getOrderId(): string
{
return $this->orderId;
}
/**
* @param string $orderId
*/
public function setOrderId(string $orderId): void
{
$this->orderId = $orderId;
}
/**
* @return string
*/
public function getAddress(): string
{
return $this->address;
}
/**
* @param string $address
*/
public function setAddress(string $address): void
{
$this->address = $address;
}
/**
* @return int
*/
public function getAmount(): int
{
return $this->amount;
}
/**
* @param int $amount
*/
public function setAmount(int $amount): void
{
$this->amount = $amount;
}
/**
* @return string
*/
public function getRemark(): string
{
return $this->remark;
}
/**
* @param string $remark
*/
public function setRemark(string $remark): void
{
$this->remark = $remark;
}
}
\ No newline at end of file
Lib/api/message/ChargerExcessMessage.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/6
* Time: 上午11:45
*/
namespace Lib\api\message;
class ChargerExcessMessage extends MessageData
{
public function getPushDataJson(): string
{
return 'a';
// TODO: Implement getPushDataJson() method.
}
}
\ No newline at end of file
Lib/api/message/ChargerFailMessage.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/6/30
* Time: 下午4:13
*/
namespace Lib\api\message;
class ChargerFailMessage extends MessageData
{
/**
* @var string
*/
protected $templateId = 'C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8';
/**
* @var string
*/
private $first = '尊敬的用户，我们检测的您的订单充电失败。
';
/**
* @var string
*/
private $portName = '';
/**
* @var string
*/
private $stationName = '';
/**
* @var string
*/
private $time = '';
/**
* @var string
*/
private $remark = '支付金额会在1个工作日内退回您的余额或零钱。';
public function getUserId(): int
{
// TODO: Implement getUserId() method.
}
/**
* @return string
*/
public function getPushDataJson(): string
{
return json_encode([
'first' => [
'value' => $this->first,
'color' => '#333',
],
'keyword1' => [
'value' => $this->stationName . "($this->portName)",
'color' => '#333',
],
'keyword2' => [
'value' => $this->time,
'color' => '#333',
],
'remark' => [
'value' => $this->remark,
'color' => '#333',
],
]);
// TODO: Implement getPushDataJson() method.
}
/**
* @return string
*/
public function getFirst(): string
{
return $this->first;
}
/**
* @param string $first
*/
public function setFirst(string $first): void
{
$this->first = $first;
}
/**
* @return string
*/
public function getPortName(): string
{
return $this->portName;
}
/**
* @param string $portName
*/
public function setPortName(string $portName): void
{
$this->portName = $portName;
}
/**
* @return string
*/
public function getStationName(): string
{
return $this->stationName;
}
/**
* @param string $stationName
*/
public function setStationName(string $stationName): void
{
$this->stationName = $stationName;
}
/**
* @return string
*/
public function getTime(): string
{
return $this->time;
}
/**
* @param string $time
*/
public function setTime(string $time): void
{
$this->time = $time;
}
/**
* @return string
*/
public function getRemark(): string
{
return $this->remark;
}
/**
* @param string $remark
*/
public function setRemark(string $remark): void
{
$this->remark = $remark;
}
}
\ No newline at end of file
Lib/api/message/ChargerFinishMessage.php
...@@ -73,11 +73,11 @@ class ChargerFinishMessage extends MessageData ...@@ -73,11 +73,11 @@ class ChargerFinishMessage extends MessageData
'color' => '#333', 'color' => '#333',
], ],
'keyword3' => [ 'keyword3' => [
'value' => $this->chargerTime.' 分', 'value' => $this->chargerTime.'分钟',
'color' => '#333', 'color' => '#333',
], ],
'keyword4' => [ 'keyword4' => [
'value' => $this->orderAmount.' ￥', 'value' => '￥'.$this->orderAmount,
'color' => '#333', 'color' => '#333',
], ],
'remark' => [ 'remark' => [
......
Lib/api/message/ChargerFullMessage.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/7
* Time: 上午11:36
*/
namespace Lib\api\message;
class ChargerFullMessage extends MessageData
{
protected $templateId ='rdzTNQ7t4uRXkP0SkuwW10WH77A_CIgYFiJykXJ0utU';
private $first = '';
private $startTime = '';
public function getPushDataJson(): string
{
return '';
}
}
\ No newline at end of file
Lib/api/message/ChargerReloadMessage.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/6
* Time: 上午9:45
*/
namespace Lib\api\message;
class ChargerReloadMessage extends MessageData
{
protected $templateId = 't_PyOGCKN_fmD0blw0EuIQs-8sS3qOTmpQay12haPZY';
private $first = '充电继续通知:';
private $stationName = '';
private $portName = '';
private $time = '';
private $remark = '';
/**
* @return string
*/
public function getFirst(): string
{
return $this->first;
}
/**
* @param string $first
*/
public function setFirst(string $first): void
{
$this->first = $first;
}
/**
* @return string
*/
public function getStationName(): string
{
return $this->stationName;
}
/**
* @param string $stationName
*/
public function setStationName(string $stationName): void
{
$this->stationName = $stationName;
}
/**
* @return string
*/
public function getPortName(): string
{
return $this->portName;
}
/**
* @param string $portName
*/
public function setPortName(string $portName): void
{
$this->portName = $portName;
}
/**
* @return string
*/
public function getTime(): string
{
return $this->time;
}
/**
* @param string $time
*/
public function setTime(string $time): void
{
$this->time = $time;
}
/**
* @return string
*/
public function getRemark(): string
{
return $this->remark;
}
/**
* @param string $remark
*/
public function setRemark(string $remark): void
{
$this->remark = $remark;
}
public function getPushDataJson(): string
{
return json_encode([
'first' => [
'value' => $this->first,
'color' => '#333',
],
'keyword1' => [
'value' => $this->stationName,
'color' => '#333',
],
'keyword2' => [
'value' => $this->portName,
'color' => '#333',
],
'keyword3' => [
'value' => date('Y-m-d H:i:s'),
'color' => '#333',
],
'remark' => [
'value' => '感谢你的使用',
'color' => '#333',
],
]);
// TODO: Implement getPushDataJson() method.
}
}
\ No newline at end of file
Lib/api/message/MessageData.php
...@@ -38,7 +38,7 @@ abstract class MessageData ...@@ -38,7 +38,7 @@ abstract class MessageData
} }
protected function getUserId(): int public function getUserId(): int
{ {
return $this->userId; return $this->userId;
......
Lib/api/message/PortShedMessage.php
...@@ -20,7 +20,7 @@ class PortShedMessage extends MessageData ...@@ -20,7 +20,7 @@ class PortShedMessage extends MessageData
/** /**
* @var string * @var string
*/ */
private $first = '尊敬的用户，充电端未检测到插头，请您在%s分钟内接入
'; private $first = '尊敬的用户，充电端未检测到插头，请您在%s分钟内接入。';
/** /**
* @var string * @var string
...@@ -172,5 +172,23 @@ class PortShedMessage extends MessageData ...@@ -172,5 +172,23 @@ class PortShedMessage extends MessageData
$this->remark = $remark; $this->remark = $remark;
} }
/**
* @return int
*/
public function getWaitingTime(): int
{
return $this->waitingTime;
}
/**
* @param int $waitingTime
*/
public function setWaitingTime(int $waitingTime): void
{
$this->waitingTime = $waitingTime;
}
} }
\ No newline at end of file
Lib/api/message/Push.php
...@@ -26,33 +26,33 @@ class Push ...@@ -26,33 +26,33 @@ class Push
* @return bool * @return bool
* @throws \GuzzleHttp\Exception\GuzzleException * @throws \GuzzleHttp\Exception\GuzzleException
*/ */
public function push(MessageData $messageData,string $userId) public function push(MessageData $messageData, string $userId)
{ {
$client = new Client([ $client = new Client([
'base_uri' => self::URI 'base_uri' => self::URI,
]); ]);
$response = $client->request('POST',self::PATH,[ $response = $client->request('POST', self::PATH, [
'form_params' => [ 'form_params' => [
'userId' => $userId, 'userId' => $userId,
'templateId' => $messageData->getTemplateId(), 'templateId' => $messageData->getTemplateId(),
'data' => $messageData->getPushDataJson(), 'data' => $messageData->getPushDataJson(),
], ],
'http_errors' => false, 'http_errors' => false,
]); ]);
if($response->getStatusCode() === 200) if ($response->getStatusCode() === 200) {
{
Log::debug('发送模版消息'.$messageData->getTemplateId(),json_decode($response->getBody(),true)); Log::debug('发送模版消息' . $messageData->getTemplateId(), json_decode($response->getBody(), true));
} }
Log::debug($response->getStatusCode());
Log::debug($response->getStatusCode());
return $response->getStatusCode() === 200; return $response->getStatusCode() === 200;
......
Lib/order_exception/Exception.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/10
* Time: 上午10:57
*/
namespace Lib\order_exception;
class Exception
{
const STATE_MESSAGE = [
'12' => '开始充电',
'10' => '口子离线',
'11' => '口子上线',
'13' => '开始充电失败(异常)',
'14' => '插口脱落',
'30' => '充电计时结束',
'31' => '远程关闭',
'32' => '插口脱落结束充电',
'34' => '功率超限结束充电',
'99' => '下发开始充电命令',
'98' => '更换充电口',
'97' => '下发结束充电命令',
];
}
\ No newline at end of file
Lib/order_exception/OrderState.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/12
* Time: 上午10:24
*/
namespace Lib\order_exception;
use Lib\redis\RedisKey;
/**
* 设置订单的状态
* Class OrderState
* @package Lib\order_exception
*/
class OrderState
{
/**
* @var int
*/
private $orderId;
public function __construct(int $orderId)
{
$this->orderId = $orderId;
}
/**
* @param int $state
*/
public function setState(int $state)
{
$redis = \Events::getRedis();
$redis->zAdd(RedisKey::ORDER_STATE, $state, $this->orderId);
}
/**获取订单状态
* @param int $orderId
* @return float
*/
public static function getState(int $orderId)
{
$redis = \Events::getRedis();
return $redis->zScore(RedisKey::ORDER_STATE, $orderId);
}
}
\ No newline at end of file
Lib/order_exception/OrderTrace.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/10
* Time: 上午11:09
*/
namespace Lib\order_exception;
use Application\Model\OrderExceptionModel;
use Lib\Log;
class OrderTrace
{
/**
* @var string
*/
private $orderId ='';
/**
* @var string
*/
private $state = '';
/**
* @var OrderExceptionModel
*/
private $orderExceptionModel;
/**
* OrderTrace constructor.
* @param string $state
*/
public function __construct($state = '') {
$this->orderExceptionModel = new OrderExceptionModel();
$this->state = $state;
}
/**
* @return string
*/
public function getOrderId(): string
{
return $this->orderId;
}
/**
* @param string $orderId
*/
public function setOrderId(string $orderId): void
{
$this->orderId = $orderId;
}
/**
* 按照state记录订单异常
*/
public function writeTrace()
{
if (!isset(Exception::STATE_MESSAGE[$this->state]))
{
Log::error('记录订单异常无次state'."($this->state)");
return ;
}
try{
$this->orderExceptionModel->insertRow([
'state' => $this->state,
'desc' => Exception::STATE_MESSAGE[$this->state],
'created_at' => date('Y-m-d H:i:s'),
'order_id' => $this->orderId,
]);
}catch (\Exception $exception)
{
Log::error($exception->getMessage());
}
}
/**
* 记录订单异常
* @param int $state
* @param string $message
*/
public function writeRawTrace(int $state,string $message)
{
try{
$this->orderExceptionModel->insertRow([
'state' => $state,
'desc' => $message,
'created_at' => date('Y-m-d H:i:s'),
'order_id' => $this->orderId
]);
}catch (\Exception $exception)
{
Log::error($exception->getMessage());
}
}
}
Lib/port/Port.php
...@@ -183,7 +183,10 @@ class Port ...@@ -183,7 +183,10 @@ class Port
*/ */
public function freePort() public function freePort()
{ {
//todo 口子充电结束，释放口子，删除正在使用的订单号和用户id，口子状态修改为1。 // 口子充电结束，释放口子，删除正在使用的订单号和用户id，口子状态修改为1。
Log::debug('释放口子id->'.$this->id);
$this->redis->hDel(RedisKey::PORT_USING_ORDER_ID,$this->id); $this->redis->hDel(RedisKey::PORT_USING_ORDER_ID,$this->id);
......
Lib/rabbitmq/MyRabbitMq.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: suhangyang
* Date: 2018/5/4
* Time: 上午9:36
*/
namespace Lib\rabbitmq;
use Log;
class MyRabbitMq
{
const CONNECTION = [
'host' => 'rabbitmq.default.svc.cluster.local',
'port' => '5672',
'login' => 'rabbitmq',
'password' => 'senthink123!',
'vhost' => 'cdz_gateway',
];
/**
* @var \AMQPConnection
*/
protected $connection;
/**
* @var \AMQPChannel
*/
protected $channel;
/**
* @var string
*/
protected $routeKey;
/**
* @var string
*/
protected $exchangeKey;
/**
* @var \AMQPExchange
*/
protected $exchange;
/**
* MyRabbitMq constructor.
* @throws \AMQPConnectionException
* @throws \AMQPExchangeException
*/
public function __construct()
{
$this->connection = new \AMQPConnection(self::CONNECTION);
if (!$this->connection->connect()) {
Log::error('rabbit mq connect fail');
throw new \Exception('amqp connect fail');
} else {
$this->channel = new \AMQPChannel($this->connection);
$this->exchange = new \AMQPExchange($this->channel);
}
}
/**
* @return \AMQPChannel
* @throws \AMQPConnectionException
*/
public function getChannel():\AMQPChannel
{
return $this->channel = new \AMQPChannel($this->connection);
}
/**
* @return \AMQPConnection
*/
public function getConnection(): \AMQPConnection
{
return $this->connection;
}
/**
* @param \AMQPConnection $connection
*/
public function setConnection(\AMQPConnection $connection)
{
$this->connection = $connection;
}
/**
* @return string
*/
public function getRouteKey(): string
{
return $this->routeKey;
}
/**
* @param string $routeKey
*/
public function setRouteKey(string $routeKey)
{
$this->routeKey = $routeKey;
}
/**
* @return string
*/
public function getExchangeKey(): string
{
return $this->exchangeKey;
}
/**
* @param string $exchangeKey
*/
public function setExchangeKey(string $exchangeKey)
{
$this->exchangeKey = $exchangeKey;
}
/**
* @return \AMQPExchange
*/
public function getExchange(): \AMQPExchange
{
return $this->exchange;
}
/**
* @param \AMQPExchange $exchange
*/
public function setExchange(\AMQPExchange $exchange)
{
$this->exchange = $exchange;
}
}
\ No newline at end of file
Lib/rabbitmq/PublishPortShed.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/7/5
* Time: 下午4:44
*/
namespace Lib\rabbitmq;
use Lib\Log;
class PublishPortShed
{
/**
* PublishPortShed constructor.
* @throws \AMQPConnectionException
* @throws \AMQPExchangeException
*/
public function __construct() {
$this->rabbitMq = new MyRabbitMq();
$this->exchange = $this->rabbitMq->getExchange();
$this->exchange->setName('cdz_gateway');
$this->exchange->setType(AMQP_EX_TYPE_DIRECT);
$this->exchange->setFlags(AMQP_DURABLE);
try {
$this->exchange->declareExchange();
} catch (\AMQPChannelException $e) {
Log::error($e->getMessage());
} catch (\AMQPConnectionException $e) {
Log::error($e->getMessage());
} catch (\AMQPExchangeException $e) {
Log::error($e->getMessage());
}
}
public function publishOrder(array $message, string $routeKey = 'delay_check_port_charger_state')
{
try {
return $this->exchange->publish(json_encode($message), $routeKey, AMQP_MANDATORY);
} catch (\AMQPChannelException $e) {
} catch (\AMQPConnectionException $e) {
} catch (\AMQPExchangeException $e) {
}
}
}
\ No newline at end of file
Lib/redis/RedisKey.php
...@@ -46,5 +46,9 @@ class RedisKey ...@@ -46,5 +46,9 @@ class RedisKey
const PORT_MAC_ID = 'cdz:port:mac_id:hash'; const PORT_MAC_ID = 'cdz:port:mac_id:hash';
const ORDER_STATE = 'cdz:order:state:zset';
} }
\ No newline at end of file
Lib/send/Command.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: suhangyang
* Date: 2018/5/7
* Time: 上午9:39
*/
namespace Lib\send;
abstract class Command
{
/**
* @var string
*/
protected $headerCtrl = '';
/**
* @var string
*/
protected $messageBody = '';
/**
* @var string
*/
protected $clientId = '';
/**
* @var string
*/
protected $clientUid = '';
abstract public function getMessageBody(): string;
abstract public function getClientId(): string;
abstract public function getClientUid(): string;
/**
* @return string
*/
public function getHeaderCtrl(): string
{
return $this->headerCtrl;
}
/**
* @param string $headerCtrl
*/
public function setHeadCtrl(string $headerCtrl)
{
$this->headerCtrl = $headerCtrl;
}
}
\ No newline at end of file
Lib/send/Send.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: suhangyang
* Date: 2018/5/7
* Time: 上午9:39
*/
namespace Lib\send;
use Lib\Gateway;
use Lib\tool\Crc;
use Lib\tool\StringTool;
use Lib\Log;
class Send
{
/**
* 数据头标识符
*/
const PREAMBLE = 'ffaa';
/**
* @var string
*/
private $headerFlag = '04';
/**
* @var string
*/
private $headerCtrl = '';
/**
* @var string
*/
private $length;
/**
* @var string
*/
private $nonce;
/**
* @var Command
*/
private $command;
/**
* Send constructor.
*
* @param Command $command
*/
public function __construct(Command $command)
{
$this->command = $command;
$this->headerCtrl = $command->getHeaderCtrl();
$this->nonce = StringTool::padded(rand(0, 255), 2);
}
/**
* @param Command $command
*/
public function setCommand(Command $command): void
{
$this->command = $command;
$this->headerCtrl = $command->getHeaderCtrl();
$this->nonce = StringTool::padded(rand(0, 255), 2);
}
/**
* 发送至下位机
* @return bool
*/
public function send()
{
$result = false;
$clientUid = $this->command->getClientUid();
$message = $this->makeMessage();
Log::debug('send messag'.$message);
if(strlen($message)%2 === 1)
{
Log::error('length wrong- '.$message);
}
//debug
if (Gateway::isUidOnline($clientUid) === 1) {
Gateway::sendToUid($clientUid, $message);
$result = true;
}
return $result;
}
/**
* 按命令生成发送的message
* @return string
*/
public function makeMessage()
{
$body = $this->command->getMessageBody();
$length = 8;
$length += strlen($body) / 2;
$this->length = StringTool::padded($length, 4);
$message = self::PREAMBLE . $this->headerFlag . $this->headerCtrl . $this->length . $this->nonce . $body;
$crc = Crc::crc($message);
$mic = substr($crc, 0, 2);
$message .= $mic;
return $message;
}
}
Lib/send/command/BalanceChargerCommand.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/5/30
* Time: 下午4:52
*/
namespace Lib\send\command;
use Lib\balance\BalanceOrder;
use Lib\send\Command;
class BalanceChargerCommand extends Command
{
/**
* @var string
*/
protected $headerCtrl = '04';
/**
* @var BalanceOrder
*/
private $balanceOrder;
/**
* BalanceChargerCommand constructor.
* @param BalanceOrder $balanceOrder
*/
public function __construct(BalanceOrder $balanceOrder) {
$this->clientUid = $balanceOrder->getGatewayMac();
$this->balanceOrder = $balanceOrder;
}
/**
* @return string
*/
public function getMessageBody(): string
{
$portLogic = sprintf('%02x',$this->balanceOrder->getPortLogic());
$orderId = sprintf('%012x',$this->balanceOrder->getOrderId());
// $time = sprintf('%04x',$this->balanceOrder->getTime());
$time = sprintf('%04x',$this->balanceOrder->getTime());
return '01'.$portLogic.$orderId.$time;
}
public function getClientId(): string
{
// TODO: Implement getClientId() method.
}
public function getClientUid(): string
{
return $this->balanceOrder->getGatewayMac();
}
}
\ No newline at end of file
Lib/send/command/ChargerCommand.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: suhangyang
* Date: 2018/5/7
* Time: 上午9:41
*/
namespace Lib\send\command;
use Lib\send\Command;
use Lib\tool\StringTool;
use Lib\wx\pay_notify\order\ChargerOrder;
use Lib\wx\pay_notify\order\ChargerOrderTime;
use Log;
/**
* 充电命令
* Class ChargerCommand
* @package Lib\send\command
*/
class ChargerCommand extends Command
{
protected $headerCtrl = '04';
/**
* @var int
*/
private $type = 0;
/**
* @var int
*/
private $portLogicId;
/**l
* @var string
*/
private $outTradeNo;
/**
* @var int
*/
private $time;
/**
* ChargerCommand constructor.
* @param ChargerOrder $chargerOrder
* @throws \Exception
*/
public function __construct(ChargerOrder $chargerOrder)
{
$this->type = $chargerOrder->getChargerType();
// 获取端口的逻辑地址
$this->portLogicId = $chargerOrder->getPort()->getLogicNum();
$this->clientUid = $chargerOrder->getGateway()->getMacAddress();
$this->outTradeNo = $chargerOrder->getOrderId();
if ($this->type === 1) {
if ($chargerOrder instanceof ChargerOrderTime) {
$this->time = $chargerOrder->getChargerTime();
$this->clientUid = $chargerOrder->getGateway()->getMacAddress();
}
}
}
public function getMessageBody(): string
{
switch ($this->type) {
case 1 :
$this->messageBody = StringTool::padded($this->type, 2) . StringTool::padded($this->portLogicId, 2) . StringTool::padded($this->outTradeNo, 12) . StringTool::padded($this->time, 4);
break;
default:
break;
}
Log::debug('messageBody',[$this->messageBody]);
return $this->messageBody;
}
public function getClientId(): string
{
return $this->clientId;
}
public function getClientUid(): string
{
return $this->clientUid;
}
/**
* @return int
*/
public function getType(): int
{
return $this->type;
}
/**
* @param int $type
*/
public function setType(int $type)
{
$this->type = $type;
}
/**
* @return int
*/
public function getPortLogicId(): int
{
return $this->portLogicId;
}
/**
* @param int $portLogicId
*/
public function setPortLogicId(int $portLogicId)
{
$this->portLogicId = $portLogicId;
}
/**
* @return string
*/
public function getOutTradeNo(): string
{
return $this->outTradeNo;
}
/**
* @param string $outTradeNo
*/
public function setOutTradeNo(string $outTradeNo)
{
$this->outTradeNo = $outTradeNo;
}
/**
* @return int
*/
public function getTime(): int
{
return $this->time;
}
/**
* @param int $time
*/
public function setTime(int $time)
{
$this->time = $time;
}
/**
* @param mixed $sendContent
*/
public function setSendContent($sendContent)
{
$this->sendContent = $sendContent;
}
/**
* @param mixed $clientId
*/
public function setClientId($clientId)
{
$this->clientId = $clientId;
}
/**
* @param mixed $clientUid
*/
public function setClientUid($clientUid)
{
$this->clientUid = $clientUid;
}
}
\ No newline at end of file
Lib/send/command/ConfirmChargerCommand.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/6/19
* Time: 下午3:15
*/
namespace Lib\send\command;
use Lib\send\Command;
use Lib\tool\StringTool;
class ConfirmChargerCommand extends Command
{
protected $headerCtrl = '14';
/**
* @var int
*/
private $orderId;
/**
* @var string
*/
private $gatewayMac;
public function getMessageBody(): string
{
return StringTool::padded($this->orderId,12);
}
public function getClientId(): string
{
return $this->gatewayMac;
}
public function getClientUid(): string
{
return $this->gatewayMac;
}
/**
* @return int
*/
public function getOrderId(): int
{
return $this->orderId;
}
/**
* @param int $orderId
*/
public function setOrderId(int $orderId): void
{
$this->orderId = $orderId;
}
/**
* @return string
*/
public function getGatewayMac(): string
{
return $this->gatewayMac;
}
/**
* @param string $gatewayMac
*/
public function setGatewayMac(string $gatewayMac): void
{
$this->gatewayMac = $gatewayMac;
}
}
\ No newline at end of file
Lib/send/command/SimpleChargerCommand.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/6/7
* Time: 上午10:41
*/
namespace Lib\send\command;
use Lib\tool\StringTool;
use Lib\send\Command;
class SimpleChargerCommand extends Command
{
protected $headerCtrl = '04';
/**
* @var string
*/
private $gatewayMac;
/**
* @var int
*/
private $orderId;
/**
* @var int
*/
private $chargerTime;
/**
* @var int
*/
private $logicNum;
/**
* @var int
*/
private $type = 1;
public function getMessageBody(): string
{
return $this->messageBody = StringTool::padded($this->type, 2) . StringTool::padded($this->logicNum, 2) . StringTool::padded($this->orderId
, 12) . StringTool::padded($this->chargerTime, 4);
}
public function getClientId(): string
{
// TODO: Implement getClientId() method.
}
public function getClientUid(): string
{
return $this->gatewayMac;
// TODO: Implement getClientUid() method.
}
/**
* @return string
*/
public function getGatewayMac(): string
{
return $this->gatewayMac;
}
/**
* @param string $gatewayMac
*/
public function setGatewayMac(string $gatewayMac): void
{
$this->gatewayMac = $gatewayMac;
}
/**
* @return int
*/
public function getOrderId(): int
{
return $this->orderId;
}
/**
* @param int $orderId
*/
public function setOrderId(int $orderId): void
{
$this->orderId = $orderId;
}
/**
* @return int
*/
public function getChargerTime(): int
{
return $this->chargerTime;
}
/**
* @param int $chargerTime
*/
public function setChargerTime(int $chargerTime): void
{
$this->chargerTime = $chargerTime;
}
/**
* @return int
*/
public function getLogicNum(): int
{
return $this->logicNum;
}
/**
* @param int $logicNum
*/
public function setLogicNum(int $logicNum): void
{
$this->logicNum = $logicNum;
}
/**
* @return int
*/
public function getType(): int
{
return $this->type;
}
/**
* @param int $type
*/
public function setType(int $type): void
{
$this->type = $type;
}
}
\ No newline at end of file
Lib/send/command/StopChargerCommand.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/5/30
* Time: 上午10:45
*/
namespace Lib\send\command;
use Lib\tool\Crc;
use Lib\send\Command;
class StopChargerCommand extends Command
{
/**
* @var int
*/
private $orderId;
/**
* @var int
*/
private $logicNum;
/**
* @var string
*/
private $gatewayMac;
protected $headerCtrl = '05';
public function getMessageBody(): string
{
$logicNum = sprintf('%02x', $this->logicNum);
$orderId = sprintf('%012x', $this->orderId);
return $this->messageBody = $logicNum . $orderId;
}
public function getClientId(): string
{
// TODO: Implement getClientId() method.
}
public function getClientUid(): string
{
return $this->gatewayMac;
}
/**
* @return int
*/
public function getOrderId(): int
{
return $this->orderId;
}
/**
* @param int $orderId
*/
public function setOrderId(int $orderId): void
{
$this->orderId = $orderId;
}
/**
* @return int
*/
public function getLogicNum(): int
{
return $this->logicNum;
}
/**
* @param int $logicNum
*/
public function setLogicNum(int $logicNum): void
{
$this->logicNum = $logicNum;
}
/**
* @return string
*/
public function getGatewayMac(): string
{
return $this->gatewayMac;
}
/**
* @param string $gatewayMac
*/
public function setGatewayMac(string $gatewayMac): void
{
$this->gatewayMac = $gatewayMac;
}
/**
* @return string
*/
public function getHeaderCtrl(): string
{
return $this->headerCtrl;
}
/**
* @param string $headerCtrl
*/
public function setHeaderCtrl(string $headerCtrl): void
{
$this->headerCtrl = $headerCtrl;
}
}
\ No newline at end of file
Lib/tool/ArrayToXml.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: suhangyang
* Date: 2018/5/1
* Time: 下午1:20
*/
namespace Lib\tool;
class ArrayToXml
{
/**
* @var array
*/
private $data;
/**
* @var string
*/
private $xml = '';
/**
* ArrayToXml constructor.
* @param array $data
*
*/
public function __construct(array $data =[])
{
$this->data = $data;
}
/**
* @param $data
* @return string
*/
public function arrayToXml($data)
{
foreach ($data as $key => $value)
{
if(blank($value))
{
continue;
}
$this->xml.="<$key>";
if(is_array($value))
{
$this->arrayToXml($value);
}else{
$this->xml.="<![CDATA[$value]]></$key>";
}
}
return '<xml>'.$this->xml.'</xml>';
}
}
\ No newline at end of file
Lib/tool/Crc.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: suhangyang
* Date: 2018/4/25
* Time: 下午3:52
*/
namespace Lib\tool;
class Crc
{
const CRC_TABLE = [
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
];
/**
* @param $data
* @return int
*/
public static function crc($data)
{
$crc = 0xffffffff;
$size = strlen($data);
for($i=0;$i<$size;$i+=2)
{
$numHex = substr($data,$i,2);
$number = hexdec($numHex);
$tmp = ($crc^$number) & 0xff;
$crcRightMove = (hexdec(sprintf("%08x",$crc>>8)));
$crc = ($crcRightMove)^(self::CRC_TABLE[$tmp]);
}
$crc = $crc ^ 0xffffffff;
return sprintf('%08x',$crc);
}
}
\ No newline at end of file
Lib/tool/StringTool.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: suhangyang
* Date: 2018/5/7
* Time: 上午9:50
*/
namespace Lib\tool;
class StringTool
{
public static function padded(string $str,int $length,string $need = '0')
{
return sprintf("%0$length"."x",(int)$str);
}
}
\ No newline at end of file
bug_doc/7.12修订.md 0 → 100644
# 7.12修订
# 7.12修订
## 网关连接初始化
![avatar](/Users/banice/ubuntu/senthink/cdz_gateway/bug_doc/guide/gateway_init.jpg)
## 开始充电
### 细节说明
* 口子从离线状态转为非离线状态之前需要先进行订单的同步（**网关离线则口子状态被视为离线**）
* 下位机需要判断服务器是否确认订单已开始充电，若没有应及时停止口子供电，进入订单取消。
* 服务器下发结束充电的命令需要添加一项新数据（结束方式）
![开始充电](/Users/banice/ubuntu/senthink/cdz_gateway/bug_doc/guide/charger.png)
## 议题
1. 为口子同步订单修改协议中的同步口子命令
2. 修改协议中的结束充电命令，增加结束方式
3. 由于粘包导致的更换口子问题是否解决？
4. 口子上报状态一直为离线的错误，注意上报状态应当是在状态改变事件发生时。
bug_doc/通讯协议v2（应用协议).md 0 → 100644
# 通讯协议v2（应用协议)
# 通讯协议v2（应用协议)
## 同步口子
1.下位机->服务器<font color='red'> 同步口子增加了订单的同步</font>
|preamble|headerFlag|headerCtrl|length|nonce|startNum|count|totalCount|portMac|portState|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---|:---|:---:|:---:|:---:|:---:|
|协议头|是否加密|03|包长|随机字符|口子起始逻辑号(1byte)|包中口子数(1byte)|网关下口子总数(1byte)|口子mac地址(8bytes*n)|口子状态(n bytes)|crc|
2.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|startNum|count|totalCount|order_count|logic_num|order_id|time|...|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|03|包长|随机字符|起始逻辑号|包中口子数|网关口子总数|订单数(1 byte)|口子逻辑号(1 byte)|订单号(6 bytes)|剩余充电时间(2 bytes)||crc|
## 开始充电(按时间充电)
1.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|type|port|outTradeNo|time|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|04|包长|随机字符|01|口子逻辑号(1byte)|订单号(6bytes)|充电时间(2bytes)|crc|
2.下位机->服务器修改状态字段位置
|preamble|headerFlag|headerCtrl|length|nonce|type|port|state|outTradeNo|power|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---|:---:|:---:|
|协议头|是否加密|04|包长|随机字符|01|口子逻辑号(1byte)|状态(1byte)|订单号(6bytes)|当前口子用电量(4bytes)|crc|
3.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|outTradeNo|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|14|包长|随机字符|订单号(6bytes)|crc|
## 结束充电
<font color ='red'>添加结束类型字段，finish_type默认为0，服务器远程结束时下位机原样返回给服务器，下位机自主结束返回00</font>
1.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|port|outTradeNo|finish_type|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|05|包长|随机字符|端口逻辑号|订单号(6bytes)|结束类型(1byte)|crc|
2.下位机->服务器修改状态字段位置
|preamble|headerFlag|headerCtrl|length|nonce|type|port|state|outTradeNo|power|finish_type|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---|:---:|:---:|:---:|
|协议头|是否加密|05|包长|随机字符|01|口子逻辑号(1byte)|状态(1byte)|订单号(6bytes)|当前口子用电量(4bytes)|结束类型(1byte)crc|
3.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|port|outTradeNo|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|15|包长|随机字符|口子逻辑号|订单号(6bytes)|crc|
## 上报电表电量
1.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|06|包长|随机字符|crc|
2.下位机->服务器
|preamble|headerFlag|headerCtrl|length|nonce|powerCapacity|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|06|包长|随机字符|电表用电量(4bytes)|crc|
## 上报充电功率
* 位机->服务器
以下二选一
|preamble|headerFlag|headerCtrl|length|nonce|port|startTime|intervalTime|count|powerData|powerCapacity|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|07|包长|随机字符|口子逻辑号(1byte)|起始时间(4bytes)|间隔时间(1byte)|功率数据个数(1byte)|功率数据(2*n bytes)|用电量(4*n bytes)|crc|
|preamble|headerFlag|headerCtrl|length|nonce|port|powerData|powerCapacity|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|17|包长|随机字符|口子逻辑号(1 byte)|功率数据(2bytes)|用电量(4bytes)|crc|
## 口子状态
* 下位机->服务器(口子上线)
|preamble|headerFlag|headerCtrl|length|nonce|count|port|mac|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|08|包长|随机字符|上报口子个数(1byte)|口子逻辑地址(1*n bytes)|口子mac地址(8*n bytes|crc|
* 下位机->服务器(口子离线)
|preamble|headerFlag|headerCtrl|length|nonce|count|port|mac|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|09|包长|随机字符|上报口子个数(1byte)|口子逻辑地址(1*n bytes)|mac地址|crc|
## 设置参数
* HeaderCtrl : 0a
|字段名|长度|说明|
|:---:|:---:|:---:|
|invertal_time|2|设备上报数据间隔(秒)|
|getpriceconfig|1|获取计价配置时间间隔(秒)|
|powerupperlimit|2|功率上限|
|powersaturateinvertal_time|1|充满自停功率检测|
|extra_time|1|充满自停额外供电时间（单位分钟）|
|powerlowerlimit|1|功率下限|
|detect_time|1|功率上限检测时间|
## 上报一口子状态
1.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|mac|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|0b|包长|随机字符|口子mac地址|crc|
2. 下位机->服务器
|preamble|headerFlag|headerCtrl|length|nonce|port|mac|state|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|0b|包长|随机字符|口子逻辑号(1byte)|口子mac地址(8bytes)|状态(1byte)|crc|
## 逻辑地址同步
1.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|0c|包长|随机字符|crc|
2.下位机->服务器
|preamble|headerFlag|headerCtrl|length|nonce|startNum|count|mac|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|0d|包长|随机字符|逻辑地址起始序号(1byte)|包中mac地址个数(1byte)|mac地址(n*8 bytes)|crc|
3.服务器->下位机
|preamble|headerFlag|headerCtrl|length|nonce|startNum|count|mic|
|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
|协议头|是否加密|1d|包长|随机字符|逻辑起始序号|确认的口子数|crc|
## 状态位表(10进制)
<font color='red'>添加41，42状态码</font>
|state|说明|
|:---:|:---:|
|10|离线|
|11|空闲（在线）|
|12|正在充电|
|13|异常（充电失败）|
|14|插头脱落|
|30|计时结束|
|31|远程关闭|
|32|插头脱落|
|33|充满自停|
|34|功率超限|
|35|关闭失败|
|36|插头插上，正常充电|
|41|用户主动结束|
|42|插口脱落超时结束|
\ No newline at end of file
vendor/workerman/workerman/Protocols/Bintohex.php
...@@ -25,6 +25,7 @@ class Bintohex ...@@ -25,6 +25,7 @@ class Bintohex
$data = $data[1]; $data = $data[1];
$packageLength = strlen($data); $packageLength = strlen($data);
$packageLength/=2; $packageLength/=2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment