Skip to content

C
cdz_gateway_v2
Commit f3957f24 by banice
Options

fix：逻辑号错误的问题，更换口子后的第二次开始充电脱落则将order改为waiting

parent dde7700a
Showing with 447 additions and 284 deletions
.idea/php.xml
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
<project version="4"> <project version="4">
<component name="PhpIncludePathManager"> <component name="PhpIncludePathManager">
<include_path> <include_path>
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" /> <path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" /> <path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/vendor/workerman/workerman" /> <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/workerman/mysql" /> <path value="$PROJECT_DIR$/vendor/workerman/mysql" />
<path value="$PROJECT_DIR$/vendor/workerman/workerman" />
<path value="$PROJECT_DIR$/vendor/workerman/gateway-worker" /> <path value="$PROJECT_DIR$/vendor/workerman/gateway-worker" />
<path value="$PROJECT_DIR$/vendor/psr/log" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
</include_path> </include_path>
</component> </component>
......
.idea/workspace.xml
...@@ -2,7 +2,21 @@ ...@@ -2,7 +2,21 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a4269ceb-5bf6-49dc-9b41-8690287f228c" name="Default" comment=""> <list default="true" id="a4269ceb-5bf6-49dc-9b41-8690287f228c" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/application/controller/setting/DeviceMacController.php" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" afterPath="$PROJECT_DIR$/.idea/php.xml" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/.staging" afterPath="$PROJECT_DIR$/.staging" />
<change beforePath="$PROJECT_DIR$/application/controller/accept/AccessController.php" afterPath="$PROJECT_DIR$/application/controller/accept/AccessController.php" />
<change beforePath="$PROJECT_DIR$/application/controller/business/charger/StartController.php" afterPath="$PROJECT_DIR$/application/controller/business/charger/StartController.php" />
<change beforePath="$PROJECT_DIR$/application/controller/business/port/StateController.php" afterPath="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
<change beforePath="$PROJECT_DIR$/application/controller/business/power/PowerController.php" afterPath="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<change beforePath="$PROJECT_DIR$/application/route/Api.php" afterPath="$PROJECT_DIR$/application/route/Api.php" />
<change beforePath="$PROJECT_DIR$/application/start_businessworker.php" afterPath="$PROJECT_DIR$/application/start_businessworker.php" />
<change beforePath="$PROJECT_DIR$/lib/Aes.php" afterPath="$PROJECT_DIR$/lib/Aes.php" />
<change beforePath="$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php" afterPath="$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php" />
<change beforePath="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" afterPath="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" />
<change beforePath="$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php" afterPath="$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php" />
<change beforePath="$PROJECT_DIR$/lib/log/Log.php" afterPath="$PROJECT_DIR$/lib/log/Log.php" />
</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" />
...@@ -19,106 +33,106 @@ ...@@ -19,106 +33,106 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Events.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.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="380"> <state relative-caret-position="2805">
<caret line="247" column="0" lean-forward="true" selection-start-line="247" selection-start-column="0" selection-end-line="247" selection-end-column="0" /> <caret line="191" column="26" lean-forward="false" selection-start-line="191" selection-start-column="26" selection-end-line="191" selection-end-column="26" />
<folding> <folding>
<element signature="e#1064#1118#0#PHP" expanded="false" /> <element signature="e#90#121#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Log.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Application.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/log/Log.php"> <entry file="file://$PROJECT_DIR$/src/Application.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473"> <state relative-caret-position="0">
<caret line="69" column="31" lean-forward="false" selection-start-line="69" selection-start-column="31" selection-end-line="69" selection-end-column="31" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Dockerfile" pinned="false" current-in-tab="true"> <file leaf-file-name="BroadcastToAgent.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/src/BroadcastToAgent.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="38" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="38" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Order.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Container.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php"> <entry file="file://$PROJECT_DIR$/src/Container.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="0">
<caret line="196" column="0" lean-forward="false" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".env" pinned="false" current-in-tab="false"> <file leaf-file-name="Api.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/application/route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465"> <state relative-caret-position="675">
<caret line="31" column="28" lean-forward="false" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" /> <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".staging" pinned="false" current-in-tab="false"> <file leaf-file-name="DeviceMacController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.staging"> <entry file="file://$PROJECT_DIR$/application/controller/setting/DeviceMacController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="180">
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
<folding /> <folding>
<element signature="e#133#171#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ShedMessage.php" pinned="false" current-in-tab="false"> <file leaf-file-name="BalanceController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/ShedMessage.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/BalanceController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705"> <state relative-caret-position="360">
<caret line="52" column="36" lean-forward="false" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" /> <caret line="30" column="35" lean-forward="false" selection-start-line="30" selection-start-column="35" selection-end-line="30" selection-end-column="35" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="OverController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Request.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php"> <entry file="file://$PROJECT_DIR$/src/request/Request.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412"> <state relative-caret-position="540">
<caret line="155" column="48" lean-forward="false" selection-start-line="155" selection-start-column="48" selection-end-line="155" selection-end-column="48" /> <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CapacityController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="OverController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/controller/business/power/CapacityController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="547">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="127" column="50" lean-forward="false" selection-start-line="127" selection-start-column="50" selection-end-line="127" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PowerController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="Bintohex.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="885"> <state relative-caret-position="582">
<caret line="130" column="46" lean-forward="false" selection-start-line="130" selection-start-column="46" selection-end-line="130" selection-end-column="46" /> <caret line="68" column="39" lean-forward="false" selection-start-line="68" selection-start-column="39" selection-end-line="68" selection-end-column="39" />
<folding> <folding />
<element signature="e#878#2655#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -146,6 +160,7 @@ ...@@ -146,6 +160,7 @@
<find>remain ch</find> <find>remain ch</find>
<find>remain c</find> <find>remain c</find>
<find>MESSAGE_PORT_SHED</find> <find>MESSAGE_PORT_SHED</find>
<find>04</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>$this-&gt;nowDate</replace> <replace>$this-&gt;nowDate</replace>
...@@ -160,10 +175,6 @@ ...@@ -160,10 +175,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/lib/cdz/order/state/ShedState.php" />
<option value="$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php" />
<option value="$PROJECT_DIR$/lib/remote/api/message/ChargerShedMessage.php" />
<option value="$PROJECT_DIR$/lib/remote/api/message/FinishByUserMessage.php" />
<option value="$PROJECT_DIR$/lib/remote/api/message/PowerExceedMessage.php" /> <option value="$PROJECT_DIR$/lib/remote/api/message/PowerExceedMessage.php" />
<option value="$PROJECT_DIR$/lib/remote/api/message/ShedMessage.php" /> <option value="$PROJECT_DIR$/lib/remote/api/message/ShedMessage.php" />
<option value="$PROJECT_DIR$/lib/remote/api/message/StartMessage.php" /> <option value="$PROJECT_DIR$/lib/remote/api/message/StartMessage.php" />
...@@ -189,28 +200,32 @@ ...@@ -189,28 +200,32 @@
<option value="$PROJECT_DIR$/application/controller/card/BalanceController.php" /> <option value="$PROJECT_DIR$/application/controller/card/BalanceController.php" />
<option value="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" /> <option value="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php" />
<option value="$PROJECT_DIR$/application/controller/setting/SettingController.php" /> <option value="$PROJECT_DIR$/application/controller/setting/SettingController.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/StartController.php" />
<option value="$PROJECT_DIR$/application/route/Api.php" />
<option value="$PROJECT_DIR$/application/controller/HeartController.php" /> <option value="$PROJECT_DIR$/application/controller/HeartController.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/OnlineController.php" /> <option value="$PROJECT_DIR$/application/controller/business/port/OnlineController.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/OfflineController.php" /> <option value="$PROJECT_DIR$/application/controller/business/port/OfflineController.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" />
<option value="$PROJECT_DIR$/application/Events.php" /> <option value="$PROJECT_DIR$/application/Events.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
<option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" /> <option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
<option value="$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php" /> <option value="$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" /> <option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
<option value="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<option value="$PROJECT_DIR$/.env" /> <option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/.staging" />
<option value="$PROJECT_DIR$/application/controller/accept/AccessController.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/Order.php" /> <option value="$PROJECT_DIR$/lib/cdz/order/Order.php" />
<option value="$PROJECT_DIR$/lib/log/Log.php" />
<option value="$PROJECT_DIR$/Dockerfile" /> <option value="$PROJECT_DIR$/Dockerfile" />
<option value="$PROJECT_DIR$/.staging" />
<option value="$PROJECT_DIR$/application/start_businessworker.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php" />
<option value="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
<option value="$PROJECT_DIR$/lib/Aes.php" />
<option value="$PROJECT_DIR$/lib/log/Log.php" />
<option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
<option value="$PROJECT_DIR$/application/controller/setting/DeviceMacController.php" />
<option value="$PROJECT_DIR$/application/route/Api.php" />
<option value="$PROJECT_DIR$/application/controller/accept/AccessController.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php" />
<option value="$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php" />
<option value="$PROJECT_DIR$/application/controller/business/charger/StartController.php" />
<option value="$PROJECT_DIR$/composer.json" />
</list> </list>
</option> </option>
</component> </component>
...@@ -228,23 +243,23 @@ ...@@ -228,23 +243,23 @@
</component> </component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true"> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true">
<include_path> <include_path>
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" /> <path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" /> <path value="$PROJECT_DIR$/vendor/vlucas/phpdotenv" />
<path value="$PROJECT_DIR$/vendor/workerman/workerman" /> <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/workerman/mysql" /> <path value="$PROJECT_DIR$/vendor/workerman/mysql" />
<path value="$PROJECT_DIR$/vendor/workerman/workerman" />
<path value="$PROJECT_DIR$/vendor/workerman/gateway-worker" /> <path value="$PROJECT_DIR$/vendor/workerman/gateway-worker" />
<path value="$PROJECT_DIR$/vendor/psr/log" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" /> <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" fullScreen="true"> <component name="ProjectFrameBounds">
<option name="x" value="4" /> <option name="x" value="191" />
<option name="y" value="23" /> <option name="y" value="28" />
<option name="width" value="1851" /> <option name="width" value="1612" />
<option name="height" value="1057" /> <option name="height" value="1057" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
...@@ -265,6 +280,7 @@ ...@@ -265,6 +280,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -274,13 +290,38 @@ ...@@ -274,13 +290,38 @@
</path> </path>
<path> <path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" /> <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="business" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="business" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="charger" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode" /> <item name="External Libraries" type="bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="Scope" /> <pane id="Scope" />
</panes> </panes>
</component> </component>
...@@ -339,24 +380,26 @@ ...@@ -339,24 +380,26 @@
<workItem from="1535101118300" duration="241000" /> <workItem from="1535101118300" duration="241000" />
<workItem from="1535169242819" duration="52420000" /> <workItem from="1535169242819" duration="52420000" />
<workItem from="1535770378527" duration="20000" /> <workItem from="1535770378527" duration="20000" />
<workItem from="1535770634212" duration="22337000" /> <workItem from="1535770634212" duration="32766000" />
<workItem from="1536506132086" duration="347000" />
<workItem from="1536480239577" duration="13159000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="231199000" /> <option name="totallyTimeSpent" value="255134000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1920" height="1080" extended-state="0" /> <frame x="191" y="28" width="1612" height="1057" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286991" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32848233" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969216" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23535253" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23535253" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19755058" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24140127" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
...@@ -380,410 +423,409 @@ ...@@ -380,410 +423,409 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager /> <breakpoint-manager>
<option name="time" value="1" />
</breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/ShedTimeoutState.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/charger/RequestController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="609">
<caret line="8" column="18" lean-forward="false" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" /> <caret line="110" column="49" lean-forward="false" selection-start-line="110" selection-start-column="49" selection-end-line="110" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/State.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/FailMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="326">
<caret line="8" column="18" lean-forward="false" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" /> <caret line="39" column="20" lean-forward="false" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/TimeoutState.php"> <entry file="file://$PROJECT_DIR$/src/route/Route.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="0">
<caret line="8" column="18" lean-forward="false" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.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="-1983"> <state relative-caret-position="90">
<caret line="23" column="1" lean-forward="false" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" /> <caret line="11" column="6" lean-forward="false" 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$/application/controller/card/charger/PowerController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/port/OnlineController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="975"> <state relative-caret-position="544">
<caret line="70" column="13" lean-forward="false" selection-start-line="70" selection-start-column="13" selection-end-line="70" selection-end-column="13" /> <caret line="60" column="47" lean-forward="false" selection-start-line="60" selection-start-column="47" selection-end-line="60" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/notice/Notice.php" /> <entry file="file://$PROJECT_DIR$/application/controller/business/port/OfflineController.php">
<entry file="file://$PROJECT_DIR$/src/BroadcastToAgent.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="814">
<caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" /> <caret line="99" column="19" lean-forward="false" selection-start-line="99" selection-start-column="19" selection-end-line="99" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/PowerExceedMessage.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerTimeoutMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="566">
<caret line="22" column="29" lean-forward="false" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" /> <caret line="78" column="41" lean-forward="true" selection-start-line="78" selection-start-column="41" selection-end-line="78" selection-end-column="41" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/OrderModel.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.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="31">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="24" column="20" lean-forward="false" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/rabbitmq/MyRabbitMq.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="0"> <state relative-caret-position="570">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="43" column="54" lean-forward="true" selection-start-line="43" selection-start-column="54" selection-end-line="43" selection-end-column="54" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/BillTmpModel.php"> <entry file="file://$PROJECT_DIR$/application/controller/Controller.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="105">
<caret line="14" column="37" lean-forward="false" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" /> <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/card/charger/OverController.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="585"> <state relative-caret-position="90">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" /> <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/card/charger/StartController.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206"> <state relative-caret-position="672">
<caret line="62" column="43" lean-forward="false" selection-start-line="62" selection-start-column="43" selection-end-line="62" selection-end-column="43" /> <caret line="123" column="0" lean-forward="false" selection-start-line="123" selection-start-column="0" selection-end-line="123" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/card/port/StateController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/power/CapacityController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/card/BalanceController.php"> <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ShedMessage.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448"> <state relative-caret-position="705">
<caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> <caret line="52" column="36" lean-forward="false" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/card/PayRuleController.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="386"> <state relative-caret-position="425">
<caret line="54" column="38" lean-forward="false" selection-start-line="54" selection-start-column="38" selection-end-line="54" selection-end-column="38" /> <caret line="196" column="0" lean-forward="false" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/card/charger/RequestController.php"> <entry file="file://$PROJECT_DIR$/application/controller/setting/SettingController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="609"> <state relative-caret-position="677">
<caret line="110" column="49" lean-forward="false" selection-start-line="110" selection-start-column="49" selection-end-line="110" selection-end-column="49" /> <caret line="71" column="21" lean-forward="false" selection-start-line="71" selection-start-column="21" selection-end-line="71" selection-end-column="21" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/FailMessage.php"> <entry file="file://$PROJECT_DIR$/composer.lock">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326"> <state relative-caret-position="-24">
<caret line="39" column="20" lean-forward="false" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="20" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/route/Route.php"> <entry file="file://$PROJECT_DIR$/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="46" lean-forward="false" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/station/gateway/port/Port.php"> <entry file="file://$PROJECT_DIR$/.staging">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259"> <state relative-caret-position="510">
<caret line="79" column="20" lean-forward="false" selection-start-line="79" selection-start-column="20" selection-end-line="79" selection-end-column="20" /> <caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/setting/SettingController.php"> <entry file="file://$PROJECT_DIR$/lib/StateCode.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585"> <state relative-caret-position="345">
<caret line="48" column="0" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> <caret line="28" column="27" lean-forward="false" selection-start-line="28" selection-start-column="27" selection-end-line="28" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/route/Api.php"> <entry file="file://$PROJECT_DIR$/lib/station/gateway/port/Port.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407"> <state relative-caret-position="240">
<caret line="36" column="32" lean-forward="false" selection-start-line="36" selection-start-column="32" selection-end-line="36" selection-end-column="32" /> <caret line="125" column="20" lean-forward="false" selection-start-line="125" selection-start-column="20" selection-end-line="125" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/ExceptionModel.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.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="3285">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="235" column="48" lean-forward="false" selection-start-line="235" selection-start-column="48" selection-end-line="235" selection-end-column="48" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/OnlineController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544"> <state relative-caret-position="990">
<caret line="60" column="47" lean-forward="false" selection-start-line="60" selection-start-column="47" selection-end-line="60" selection-end-column="47" /> <caret line="77" column="39" lean-forward="false" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="39" />
<folding /> <folding>
<element signature="e#2844#4687#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630"> <state relative-caret-position="390">
<caret line="48" column="0" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" /> <caret line="33" column="45" lean-forward="false" selection-start-line="33" selection-start-column="45" selection-end-line="33" selection-end-column="45" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/OfflineController.php"> <entry file="file://$PROJECT_DIR$/lib/Aes.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="814"> <state relative-caret-position="255">
<caret line="99" column="19" lean-forward="false" selection-start-line="99" selection-start-column="19" selection-end-line="99" selection-end-column="19" /> <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerTimeoutMessage.php"> <entry file="file://$PROJECT_DIR$/lib/log/Log.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="566"> <state relative-caret-position="364">
<caret line="78" column="41" lean-forward="true" selection-start-line="78" selection-start-column="41" selection-end-line="78" selection-end-column="41" /> <caret line="48" column="32" lean-forward="false" selection-start-line="48" selection-start-column="32" selection-end-line="48" selection-end-column="32" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/Events.php"> <entry file="file://$PROJECT_DIR$/start.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1707"> <state relative-caret-position="420">
<caret line="188" column="0" lean-forward="false" selection-start-line="188" selection-start-column="0" selection-end-line="188" selection-end-column="0" /> <caret line="28" column="36" lean-forward="false" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php"> <entry file="file://$PROJECT_DIR$/application/model/Model.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="379"> <state relative-caret-position="555">
<caret line="43" column="22" lean-forward="true" selection-start-line="43" selection-start-column="22" selection-end-line="43" selection-end-column="22" /> <caret line="42" column="28" lean-forward="false" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
<folding /> <folding>
<marker date="1534755589000" expanded="true" signature="594:633" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1534755589000" expanded="true" signature="921:961" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1534755589000" expanded="true" signature="1253:1293" ph="SELECT ${$co... ${$this-&gt;table}" />
<marker date="1534755589000" expanded="true" signature="1443:1476" ph="SELECT * FRO... ${$this-&gt;table}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/mysql/src/Connection.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31"> <state relative-caret-position="311">
<caret line="24" column="20" lean-forward="false" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" /> <caret line="1910" column="20" lean-forward="false" selection-start-line="1910" selection-start-column="20" selection-end-line="1910" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555"> <state relative-caret-position="379">
<caret line="42" column="99" lean-forward="false" selection-start-line="42" selection-start-column="99" selection-end-line="42" selection-end-column="99" /> <caret line="43" column="22" lean-forward="true" selection-start-line="43" selection-start-column="22" selection-end-line="43" selection-end-column="22" />
<folding> <folding />
<element signature="e#123#147#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/HeartController.php"> <entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="417">
<caret line="43" column="54" lean-forward="true" selection-start-line="43" selection-start-column="54" selection-end-line="43" selection-end-column="54" /> <caret line="269" column="62" lean-forward="true" selection-start-line="269" selection-start-column="62" selection-end-line="269" selection-end-column="62" />
<folding /> <folding>
<element signature="e#1064#1118#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1115"> <state relative-caret-position="325">
<caret line="106" column="32" lean-forward="false" selection-start-line="106" selection-start-column="32" selection-end-line="106" selection-end-column="32" /> <caret line="42" column="5" lean-forward="true" selection-start-line="42" selection-start-column="5" selection-end-line="42" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="489"> <state relative-caret-position="236">
<caret line="107" column="27" lean-forward="false" selection-start-line="107" selection-start-column="27" selection-end-line="107" selection-end-column="27" /> <caret line="269" column="42" lean-forward="false" selection-start-line="269" selection-start-column="42" selection-end-line="269" selection-end-column="42" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104"> <state relative-caret-position="584">
<caret line="195" column="58" lean-forward="false" selection-start-line="195" selection-start-column="58" selection-end-line="195" selection-end-column="58" /> <caret line="235" column="0" lean-forward="true" selection-start-line="235" selection-start-column="0" selection-end-line="235" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.php"> <entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.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="477">
<caret line="194" column="58" lean-forward="false" selection-start-line="194" selection-start-column="58" selection-end-line="194" selection-end-column="58" /> <caret line="105" column="0" lean-forward="true" selection-start-line="105" selection-start-column="0" selection-end-line="105" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_4.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1827"> <state relative-caret-position="832">
<caret line="359" column="79" lean-forward="true" selection-start-line="359" selection-start-column="79" selection-end-line="359" selection-end-column="79" /> <caret line="57" column="46" lean-forward="false" selection-start-line="57" selection-start-column="46" selection-end-line="57" selection-end-column="46" />
<folding> <folding />
<element signature="e#124#161#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.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="582"> <state relative-caret-position="461">
<caret line="68" column="39" lean-forward="false" selection-start-line="68" selection-start-column="39" selection-end-line="68" selection-end-column="39" /> <caret line="2820" column="26" lean-forward="false" selection-start-line="2820" selection-start-column="26" selection-end-line="2820" selection-end-column="26" />
<folding> <folding />
<element signature="e#128#144#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/Controller.php"> <entry file="file://$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105"> <state relative-caret-position="327">
<caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" /> <caret line="58" column="7" lean-forward="true" selection-start-line="58" selection-start-column="7" selection-end-line="58" selection-end-column="7" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/model/OrderExceptionModel.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="90"> <state relative-caret-position="210">
<caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" /> <caret line="14" column="5" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php"> <entry file="file://$PROJECT_DIR$/application/start_businessworker.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="672"> <state relative-caret-position="315">
<caret line="123" column="0" lean-forward="false" selection-start-line="123" selection-start-column="0" selection-end-line="123" selection-end-column="0" /> <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412"> <state relative-caret-position="465">
<caret line="155" column="48" lean-forward="false" selection-start-line="155" selection-start-column="48" selection-end-line="155" selection-end-column="48" /> <caret line="31" column="28" lean-forward="false" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/CapacityController.php"> <entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="582">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="68" column="39" lean-forward="false" selection-start-line="68" selection-start-column="39" selection-end-line="68" selection-end-column="39" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.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="885"> <state relative-caret-position="2805">
<caret line="130" column="46" lean-forward="false" selection-start-line="130" selection-start-column="46" selection-end-line="130" selection-end-column="46" /> <caret line="191" column="26" lean-forward="false" selection-start-line="191" selection-start-column="26" selection-end-line="191" selection-end-column="26" />
<folding> <folding>
<element signature="e#878#2655#0#PHP" expanded="false" /> <element signature="e#90#121#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/src/Application.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465"> <state relative-caret-position="0">
<caret line="31" column="28" lean-forward="false" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/remote/api/message/ShedMessage.php"> <entry file="file://$PROJECT_DIR$/src/BroadcastToAgent.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="705"> <state relative-caret-position="0">
<caret line="52" column="36" lean-forward="false" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.staging"> <entry file="file://$PROJECT_DIR$/src/Container.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525"> <state relative-caret-position="0">
<caret line="35" column="0" lean-forward="false" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php"> <entry file="file://$PROJECT_DIR$/application/route/Api.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="675">
<caret line="196" column="0" lean-forward="false" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" /> <caret line="46" column="0" lean-forward="false" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php"> <entry file="file://$PROJECT_DIR$/application/controller/setting/DeviceMacController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380"> <state relative-caret-position="180">
<caret line="247" column="0" lean-forward="true" selection-start-line="247" selection-start-column="0" selection-end-line="247" selection-end-column="0" /> <caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
<folding> <folding>
<element signature="e#1064#1118#0#PHP" expanded="false" /> <element signature="e#133#171#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lib/log/Log.php"> <entry file="file://$PROJECT_DIR$/application/controller/card/BalanceController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473"> <state relative-caret-position="360">
<caret line="69" column="31" lean-forward="false" selection-start-line="69" selection-start-column="31" selection-end-line="69" selection-end-column="31" /> <caret line="30" column="35" lean-forward="false" selection-start-line="30" selection-start-column="35" selection-end-line="30" selection-end-column="35" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Dockerfile"> <entry file="file://$PROJECT_DIR$/src/request/Request.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="540">
<caret line="0" column="38" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="38" /> <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="547">
<caret line="127" column="50" lean-forward="false" selection-start-line="127" selection-start-column="50" selection-end-line="127" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
.staging
...@@ -22,13 +22,13 @@ RABBIT_VHOST=cdz_gateway ...@@ -22,13 +22,13 @@ RABBIT_VHOST=cdz_gateway
REDIS_PORT=6379 REDIS_PORT=6379
LOG_LEVEL=debug LOG_LEVEL=debug
MESSAGE_API_URL=https://cdzback2.staging.senthink.com MESSAGE_API_URL=https://cdzback2.staging.senthink.com
MESSAGE_START=W-MxqrGTUD9K3FiP5WsZvOOam5LZdeCmFq7TqrZwoM4 MESSAGE_START=W-MxqrGTUD9K3FiP5WsZvooam5LZdeCmFq7TqrZwoM4
MESSAGE_FAIL=b9Q6ZeQ6qDpuxymHcvlh0tX1GFV1Pzc_o0DOLIsnRNg MESSAGE_FAIL=b9Q6ZeQ6qDpuxymHcvlh0tX1GFV1Pzc_o0DOLIsnRNg
MESSAGE_POWER_EXCEED=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA MESSAGE_POWER_EXCEED=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA
MESSAGE_FINISH_USER=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c MESSAGE_FINISH_USER=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c
MESSAGE_PORT_SHED=C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8 MESSAGE_PORT_SHED=C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8
MESSAGE_CHARGER_TIMEOUT=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c MESSAGE_CHARGER_TIMEOUT=mHD4sJPOYpYLcqWhQnRpJ-PQ99i_69tEZCK_w0NCI_c
MESSAGE_RELOAD=sCtztz8xYzsgR1IpZ5GohMuG9DScY500cI4VVEEwtg8 MESSAGE_RELOAD=sCtztz8xYzsgR1IpZ5GohMuG9DScY5OOcI4VVEEwtg8
MESSAGE_SHED_TIMEOUT=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA MESSAGE_SHED_TIMEOUT=euUQrXFejUeyyxJbfaZQaRQfnXSqi05XMFLNfIsC0vA
MESSAGE_CHARGER_SHED=MZH_wTlwMq1_GguqIRnldSbHEuyFZcqmC3Wtk7ylMD0 MESSAGE_CHARGER_SHED=MZH_wTlwMq1_GguqIRnldSbHEuyFZcqmC3Wtk7ylMD0
LOW_POWER_LIMIT=30 LOW_POWER_LIMIT=30
......
application/controller/accept/AccessController.php
...@@ -81,6 +81,8 @@ class AccessController extends Controller ...@@ -81,6 +81,8 @@ class AccessController extends Controller
$_SESSION['gateway_name'] = $gatewayModelResult['name']; $_SESSION['gateway_name'] = $gatewayModelResult['name'];
$_SESSION['gateway_id'] = $gatewayModelResult['id'];
//日志记录 //日志记录
$this->logRecord->setGatewayId($gatewayId); $this->logRecord->setGatewayId($gatewayId);
...@@ -171,16 +173,16 @@ class AccessController extends Controller ...@@ -171,16 +173,16 @@ class AccessController extends Controller
$portMacState = []; $portMacState = [];
if (strlen($this->message) < (12 * 2 + 9 * 2 * $count)) {
return;
}
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$mac = substr($this->message, $this->plc, 8 * 2); $mac = substr($this->message, $this->plc, 8 * 2);
$state = substr($this->message, $this->plc + ($count * 16 - 16 * $i + $i * 2), 2); $state = substr($this->message, $this->plc + ($count * 16 - 16 * $i + $i * 2), 2);
$this->plc += 16; $this->plc += 16;
$portMacState[$mac] = hexdec($state); $portMacState[$mac] = hexdec($state);
// $portMacState[$mac] = StateCode::PORT_OFFLINE;
} }
if (isset($_SESSION['port_mac_id']) == false) { if (isset($_SESSION['port_mac_id']) == false) {
...@@ -219,7 +221,7 @@ class AccessController extends Controller ...@@ -219,7 +221,7 @@ class AccessController extends Controller
$port->setStationId($_SESSION['station_id']); $port->setStationId($_SESSION['station_id']);
$port->updatePortState(); $port->updatePortState();
$portsLogicId[$logicStartTmp] = $portId; $portsLogicId[$logicStartTmp++] = $portId;
} }
\Events::exec(); \Events::exec();
...@@ -261,8 +263,6 @@ class AccessController extends Controller ...@@ -261,8 +263,6 @@ class AccessController extends Controller
$order->setOnlineTime(time()); $order->setOnlineTime(time());
if ($offlineReason == 1) { if ($offlineReason == 1) {
$orderState = new OfflinePowerState($order);
} else { } else {
$orderState = new OfflineNetState($order); $orderState = new OfflineNetState($order);
...@@ -277,6 +277,12 @@ class AccessController extends Controller ...@@ -277,6 +277,12 @@ class AccessController extends Controller
array_push($responseOrder, $logicNum . $orderId . $time); array_push($responseOrder, $logicNum . $orderId . $time);
} }
$port->setPortId($portId);
$port->setGatewayId($_SESSION['gateway_id']);
$port->setStationId($_SESSION['station_id']);
$port->setState(StateCode::PORT_CHARGER);
$port->updatePortState();
unset($order); unset($order);
......
application/controller/business/charger/StartController.php
...@@ -11,6 +11,7 @@ namespace Application\controller\business\charger; ...@@ -11,6 +11,7 @@ namespace Application\controller\business\charger;
use Application\controller\Controller; use Application\controller\Controller;
use Lib\cdz\order\Order; use Lib\cdz\order\Order;
use Lib\cdz\order\state\ChargerState;
use Lib\cdz\order\state\WaitingState; use Lib\cdz\order\state\WaitingState;
use Lib\Gateway; use Lib\Gateway;
use Lib\log\Log; use Lib\log\Log;
...@@ -54,16 +55,23 @@ class StartController extends Controller ...@@ -54,16 +55,23 @@ class StartController extends Controller
$order = new Order($orderId); $order = new Order($orderId);
if ($order->getOrderCache(\Events::getRedis()) == false) { if ($order->getOrderCache(\Events::getRedis()) == false) {
$this->response->send('04', sprintf('%012x', $orderId)); $this->response->send('14', sprintf('%012x', $orderId));
return; return;
} else {
$orderLogicId = $order->getPortLogicId();
//logicId 与订单中的实际不相同则已更换口子
if ($orderLogicId != hexdec($logic)) {
$this->response->send('14', sprintf('%012x', $orderId));
return;
}
} }
$order->setStartCapacity($capacity); $order->setStartCapacity($capacity);
if (Gateway::isUidOnline($order->getUserId()) === 1) { if (Gateway::isUidOnline($order->getUserId()) === 1) {
Gateway::sendToUid($order->getUserId(), json_encode(['code' => 10000])); Gateway::sendToUid($order->getUserId(), json_encode(['code' => 10000]));
} }
if (isset($_SESSION['agent_id'])) { if (isset($_SESSION['agent_id'])) {
Log::debug('agent_id' . $_SESSION['agent_id']); Log::debug('agent_id' . $_SESSION['agent_id']);
Log::debug(Gateway::isUidOnline($_SESSION['agent_id'])); Log::debug(Gateway::isUidOnline($_SESSION['agent_id']));
...@@ -78,24 +86,34 @@ class StartController extends Controller ...@@ -78,24 +86,34 @@ class StartController extends Controller
Log::debug('agent is offline'); Log::debug('agent is offline');
} }
} }
$lastState = $order->getStateCode();
$waitingState = new WaitingState($order);
$portId = $waitingState->getOrder()->getPortId(); // switch ($lastState) {
// case StateCode::WAITING:
$orderState = new WaitingState($order);
// break;
// case StateCode::PORT_CHARGER;
// $orderState = new ChargerState($order);
// break;
//
// }
$portId = $orderState->getOrder()->getPortId();
$this->logRecord->setPortId($portId); $this->logRecord->setPortId($portId);
switch ($state) { switch ($state) {
case StateCode::PORT_CHARGER: case StateCode::PORT_CHARGER:
$waitingState->toChargerState(); $orderState->toChargerState();
break; break;
case StateCode::PORT_EXCEPTION: case StateCode::PORT_EXCEPTION:
$waitingState->toExceptionState(); $orderState->toExceptionState();
break; break;
case StateCode::PORT_SHED: case StateCode::PORT_SHED:
$waitingState->toShedState(); $orderState->toShedState();
break; break;
case StateCode::FINISH_EXCEED: case StateCode::FINISH_EXCEED:
$waitingState->toPowerExceedState(); $orderState->toPowerExceedState();
break; break;
default: default:
......
application/controller/business/port/StateController.php
...@@ -10,6 +10,7 @@ namespace Application\controller\business\port; ...@@ -10,6 +10,7 @@ namespace Application\controller\business\port;
use Application\controller\Controller; use Application\controller\Controller;
use Application\model\DeviceModel;
use Lib\cdz\order\Order; use Lib\cdz\order\Order;
use Lib\cdz\order\state\ChargerState; use Lib\cdz\order\state\ChargerState;
use Lib\cdz\order\state\ExceptionState; use Lib\cdz\order\state\ExceptionState;
...@@ -44,12 +45,24 @@ class StateController extends Controller ...@@ -44,12 +45,24 @@ class StateController extends Controller
$mac = $this->request->get('mac'); $mac = $this->request->get('mac');
$state = hexdec($this->request->get('state')); $state = hexdec($this->request->get('state'));
if (isset($_SESSION['port_mac_id']) !== true) {
$deviceModel = new DeviceModel();
$portId = $deviceModel->getColumn('id', 'mac = ' . $mac);
if (isset($portId) === false || $portId == '') {
return;
}
} else {
$portsMacId = $_SESSION['port_mac_id']; $portsMacId = $_SESSION['port_mac_id'];
if (isset($portsMacId[$mac]) === false) { if (isset($portsMacId[$mac]) === false) {
return; return;
} }
$portId = $portsMacId[$mac]; $portId = $portsMacId[$mac];
}
$port = new Port($portId); $port = new Port($portId);
......
application/controller/business/power/PowerController.php
...@@ -72,10 +72,15 @@ class PowerController extends Controller ...@@ -72,10 +72,15 @@ class PowerController extends Controller
if ($order->getOrderCache(\Events::getRedis()) != false) { if ($order->getOrderCache(\Events::getRedis()) != false) {
if ($order->getStartCapacity() === -1) { if ($order->getStartCapacity() === -1) {
$orderModel = new OrderModel(); $orderModel = new OrderModel();
$startCapacity = $orderModel->getColumn('start_capacity', 'id = ' . $orderId);
if ($startCapacity == -1) {
$orderModel->update(['start_capacity' => $capacity], 'id = ' . $orderId); $orderModel->update(['start_capacity' => $capacity], 'id = ' . $orderId);
$saveOrderRedis = new OrderSaveRedis($order); $saveOrderRedis = new OrderSaveRedis($order);
$saveOrderRedis->save(['startCapacity']); $saveOrderRedis->save(['startCapacity']);
}
} else { } else {
$orderModel = new OrderModel(); $orderModel = new OrderModel();
$orderModel->update(['end_capacity' => $capacity], 'id = ' . $orderId); $orderModel->update(['end_capacity' => $capacity], 'id = ' . $orderId);
......
application/controller/setting/DeviceMacController.php 0 → 100644
<?php
/**
* Created by PhpStorm.
* User: banice
* Date: 2018/9/9
* Time: 下午5:01
*/
namespace Application\controller\setting;
use Application\controller\Controller;
use Application\model\DeviceModel;
use Application\model\GatewayModel;
use Lib\Gateway;
class DeviceMacController extends Controller
{
protected $parameterMap = [
'0E' => [
]
];
public function getAll()
{
if (isset($_SESSION['gateway_id']) === true) {
$gatewayId = $_SESSION['gateway_id'];
$deviceModel = new DeviceModel();
$devicesMac = $deviceModel->getAllColumns(['device_mac'], 'gateway_id = ' . $gatewayId);
$count = count($devicesMac);
$tmp = [];
foreach ($devicesMac as $deviceMac) {
array_push($tmp, $deviceMac['device_mac']);
}
$devicesMacStr = implode('', $tmp);
$this->response->send('0e', sprintf('%02x', $count) . $devicesMacStr);
}
}
}
\ No newline at end of file
application/route/Api.php
...@@ -42,6 +42,9 @@ class Api ...@@ -42,6 +42,9 @@ class Api
$this->add('34', 'card\charger\StartController@start'); $this->add('34', 'card\charger\StartController@start');
$this->add('35', 'card\charger\OverController@over'); $this->add('35', 'card\charger\OverController@over');
$this->add('0E', 'setting\DeviceMacController@getAll');
} }
......
application/start_businessworker.php
...@@ -15,14 +15,14 @@ $worker->count = 1; ...@@ -15,14 +15,14 @@ $worker->count = 1;
$worker->registerAddress = getenv('REGISTER_IP') . ':' . getenv('REGISTER_PORT'); $worker->registerAddress = getenv('REGISTER_IP') . ':' . getenv('REGISTER_PORT');
$logs = fopen('./storage/logs/business.log','w'); //$logs = fopen('./storage/logs/business.log','w');
fclose($logs); //fclose($logs);
\GatewayWorker\BusinessWorker::$stdoutFile = './storage/stdout.log'; //\GatewayWorker\BusinessWorker::$stdoutFile = './storage/stdout.log';
\GatewayWorker\BusinessWorker::$logFile = './storage/logs/business.log'; //\GatewayWorker\BusinessWorker::$logFile = './storage/logs/business.log';
if (!defined('GLOBAL_START')) { if (!defined('GLOBAL_START')) {
......
lib/Aes.php
...@@ -2,18 +2,19 @@ ...@@ -2,18 +2,19 @@
namespace Lib; namespace Lib;
class Aes{ class Aes
{
public static function encrypt($data,$key) public static function encrypt($data, $key)
{ {
return openssl_encrypt(hex2bin($data),'aes-128-ecb',hex2bin($key),1); return openssl_encrypt(hex2bin($data), 'aes-128-ecb', hex2bin($key), 1);
} }
public static function decrypt($data,$key) public static function decrypt($data, $key)
{ {
return openssl_decrypt(hex2bin($data),'aes-128-ecb',hex2bin($key),1); return openssl_decrypt(hex2bin($data), 'aes-128-ecb', hex2bin($key), 1);
} }
......
lib/cdz/order/save/OrderSaveRedis.php
...@@ -54,6 +54,9 @@ class OrderSaveRedis ...@@ -54,6 +54,9 @@ class OrderSaveRedis
} }
/**
*
*/
public function saveAll() public function saveAll()
{ {
$update = []; $update = [];
...@@ -82,5 +85,15 @@ class OrderSaveRedis ...@@ -82,5 +85,15 @@ class OrderSaveRedis
} }
/**
* @param array $keys
*/
public function deleteHashKey(array $keys)
{
call_user_func_array([$this->redis, 'hDel'], $keys);
}
} }
\ No newline at end of file
lib/cdz/order/state/ChargerState.php
...@@ -210,6 +210,7 @@ class ChargerState extends State ...@@ -210,6 +210,7 @@ class ChargerState extends State
$chargerFullMessage->setEndTime($this->nowDate); $chargerFullMessage->setEndTime($this->nowDate);
$chargerFullMessage->setStartTime($this->order->getStartTime()); $chargerFullMessage->setStartTime($this->order->getStartTime());
$chargerFullMessage->setPurchaseTime($this->order->getPurchaseTime()); $chargerFullMessage->setPurchaseTime($this->order->getPurchaseTime());
$chargerFullMessage->setUserId($this->order->getUserId());
$chargerFullMessage->setRemark($chargerFullMessage->getRemark() . '\n' . sprintf('%012x', $this->order->getId())); $chargerFullMessage->setRemark($chargerFullMessage->getRemark() . '\n' . sprintf('%012x', $this->order->getId()));
$sendMessage = new SendMessage(); $sendMessage = new SendMessage();
if ($sendMessage->request($chargerFullMessage) === false) { if ($sendMessage->request($chargerFullMessage) === false) {
......
lib/cdz/order/state/WaitingState.php
...@@ -223,6 +223,13 @@ class WaitingState extends State ...@@ -223,6 +223,13 @@ class WaitingState extends State
public function toShedState() public function toShedState()
{ {
$this->order->setStateCode(-1);
$orderSave = new OrderSaveRedis($this->order);
$orderSave->save(['stateCode']);
$orderSave->deleteHashKey(['startTime', 'startCapacity']);
Log::error('waiting state can not change to shed state'); Log::error('waiting state can not change to shed state');
} }
......
lib/log/Log.php
...@@ -65,7 +65,7 @@ class Log ...@@ -65,7 +65,7 @@ class Log
$gatewayMac = isset($_SESSION['gateway_mac']) ? $_SESSION['gateway_mac'] : 'null mac'; $gatewayMac = isset($_SESSION['gateway_mac']) ? $_SESSION['gateway_mac'] : 'null mac';
$handle = new RotatingFileHandler(self::LOG_NAME); $handle = new RotatingFileHandler(self::LOG_NAME, 30);
$output = "[%datetime%] [%$gatewayMac%].%level_name%: %message% %context% %extra%\n"; $output = "[%datetime%] [%$gatewayMac%].%level_name%: %message% %context% %extra%\n";
......
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