更新开始充，用电量错误

0b01c7ed · banice · 93410bf8 · 0b01c7ed · 0b01c7ed · 0b01c7ed
Commit 0b01c7ed authored Nov 16, 2018 by banice
19 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,19 +2,25 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="a4269ceb-5bf6-49dc-9b41-8690287f228c" name="Default" comment="">
+      <change beforePath="" afterPath="$PROJECT_DIR$/application/model/UserModel.php" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/application/Events.php" afterPath="$PROJECT_DIR$/application/Events.php" />
      <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/OverController.php" afterPath="$PROJECT_DIR$/application/controller/business/charger/OverController.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/power/PowerController.php" afterPath="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
+      <change beforePath="$PROJECT_DIR$/application/controller/business/port/OfflineController.php" afterPath="$PROJECT_DIR$/application/controller/business/port/OfflineController.php" />
+      <change beforePath="$PROJECT_DIR$/application/controller/business/port/OnlineController.php" afterPath="$PROJECT_DIR$/application/controller/business/port/OnlineController.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/card/BalanceController.php" afterPath="$PROJECT_DIR$/application/controller/card/BalanceController.php" />
+      <change beforePath="$PROJECT_DIR$/application/controller/card/PayRuleController.php" afterPath="$PROJECT_DIR$/application/controller/card/PayRuleController.php" />
+      <change beforePath="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" afterPath="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" />
      <change beforePath="$PROJECT_DIR$/application/controller/update/QueryController.php" afterPath="$PROJECT_DIR$/application/controller/update/QueryController.php" />
-      <change beforePath="$PROJECT_DIR$/application/route/Api.php" afterPath="$PROJECT_DIR$/application/route/Api.php" />
+      <change beforePath="$PROJECT_DIR$/application/model/CardModel.php" afterPath="$PROJECT_DIR$/application/model/CardModel.php" />
-      <change beforePath="$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.php" afterPath="$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.php" />
+      <change beforePath="$PROJECT_DIR$/lib/cdz/order/Order.php" afterPath="$PROJECT_DIR$/lib/cdz/order/Order.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/save/OrderSaveRedis.php" afterPath="$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php" />
-      <change beforePath="$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php" afterPath="$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php" />
-      <change beforePath="$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php" afterPath="$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.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/rabbitmq/PublishPortShed.php" afterPath="$PROJECT_DIR$/lib/rabbitmq/PublishPortShed.php" />
+      <change beforePath="$PROJECT_DIR$/lib/log/Log.php" afterPath="$PROJECT_DIR$/lib/log/Log.php" />
-      <change beforePath="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" afterPath="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
+      <change beforePath="$PROJECT_DIR$/lib/station/gateway/port/Port.php" afterPath="$PROJECT_DIR$/lib/station/gateway/port/Port.php" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
@@ -31,103 +37,101 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="AccessController.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="OverController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
+        <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="257">
+            <state relative-caret-position="0">
-              <caret line="362" column="44" lean-forward="false" selection-start-line="362" selection-start-column="44" selection-end-line="362" selection-end-column="44" />
+              <caret line="73" column="23" lean-forward="false" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="23" />
-              <folding>
+              <folding />
-                <element signature="e#1070#3662#0#PHP" expanded="false" />
-              </folding>
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="OfflinePowerState.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="SettingController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php">
+        <entry file="file://$PROJECT_DIR$/application/controller/setting/SettingController.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
+            <state relative-caret-position="1040">
-              <caret line="35" column="20" lean-forward="false" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
+              <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="ChargerState.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name=".env" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.php">
+        <entry file="file://$PROJECT_DIR$/.env">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1153">
+            <state relative-caret-position="272">
-              <caret line="352" column="5" lean-forward="false" selection-start-line="352" selection-start-column="5" selection-end-line="352" selection-end-column="5" />
+              <caret line="17" column="20" lean-forward="false" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="WaitingState.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="WaitingState.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php">
+        <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="411">
+            <state relative-caret-position="263">
-              <caret line="57" column="54" lean-forward="false" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
+              <caret line="236" column="0" lean-forward="false" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="Bintohex.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="OrderSaveRedis.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
+        <entry file="file://$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1088">
+            <state relative-caret-position="963">
-              <caret line="74" column="19" lean-forward="false" selection-start-line="74" selection-start-column="19" selection-end-line="74" selection-end-column="19" />
+              <caret line="69" column="23" lean-forward="false" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="WaitingState.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="State.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php">
+        <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/State.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="229">
+            <state relative-caret-position="128">
-              <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+              <caret line="13" column="15" lean-forward="false" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="OverController.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="StartController.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
+        <entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
+            <state relative-caret-position="574">
-              <caret line="108" column="70" lean-forward="false" selection-start-line="108" selection-start-column="70" selection-end-line="108" selection-end-column="70" />
+              <caret line="91" column="44" lean-forward="false" selection-start-line="91" selection-start-column="44" selection-end-line="91" selection-end-column="44" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="StartController.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="StateController.php" pinned="false" current-in-tab="false">
-        <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">
-            <state relative-caret-position="368">
+            <state relative-caret-position="1152">
-              <caret line="93" column="43" lean-forward="false" selection-start-line="93" selection-start-column="43" selection-end-line="93" selection-end-column="43" />
+              <caret line="88" column="33" lean-forward="false" selection-start-line="88" selection-start-column="33" selection-end-line="88" selection-end-column="33" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="QueryController.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="StateCode.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/controller/update/QueryController.php">
+        <entry file="file://$PROJECT_DIR$/lib/StateCode.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="460">
+            <state relative-caret-position="272">
-              <caret line="104" column="17" lean-forward="false" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+              <caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="Response.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/response/Response.php">
+        <entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
+            <state relative-caret-position="4730">
-              <caret line="80" column="20" lean-forward="false" selection-start-line="80" selection-start-column="20" selection-end-line="80" selection-end-column="20" />
+              <caret line="458" column="20" lean-forward="false" selection-start-line="458" selection-start-column="20" selection-end-line="458" selection-end-column="20" />
              <folding />
            </state>
          </provider>
@@ -162,8 +166,9 @@
      <find>setting mis</find>
      <find>can not find po</find>
      <find>update shed sta</find>
-      <find>-2</find>
+      <find>4</find>
      <find>43</find>
+      <find>-2</find>
    </findStrings>
    <replaceStrings>
      <replace>$this-&gt;nowDate</replace>
@@ -178,8 +183,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/lib/cdz/card_order/state/OfflineNetState.php" />
-        <option value="$PROJECT_DIR$/lib/cdz/card_order/state/OfflinePowerState.php" />
        <option value="$PROJECT_DIR$/lib/cdz/card_order/state/PowerExceedState.php" />
        <option value="$PROJECT_DIR$/lib/cdz/card_order/state/PowerFullState.php" />
        <option value="$PROJECT_DIR$/lib/cdz/card_order/state/ShedState.php" />
@@ -188,35 +191,22 @@
        <option value="$PROJECT_DIR$/application/controller/card/charger/OverController.php" />
        <option value="$PROJECT_DIR$/application/controller/card/charger/StartController.php" />
        <option value="$PROJECT_DIR$/application/controller/card/charger/PowerController.php" />
-        <option value="$PROJECT_DIR$/lib/station/gateway/port/Port.php" />
        <option value="$PROJECT_DIR$/lib/notice/Notice.php" />
        <option value="$PROJECT_DIR$/lib/remote/api/message/FailMessage.php" />
        <option value="$PROJECT_DIR$/application/model/BillTmpModel.php" />
-        <option value="$PROJECT_DIR$/application/controller/card/PayRuleController.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/setting/SettingController.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/OfflineController.php" />
        <option value="$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php" />
        <option value="$PROJECT_DIR$/Dockerfile" />
        <option value="$PROJECT_DIR$/application/start_businessworker.php" />
        <option value="$PROJECT_DIR$/lib/Aes.php" />
        <option value="$PROJECT_DIR$/application/controller/setting/DeviceMacController.php" />
-        <option value="$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php" />
        <option value="$PROJECT_DIR$/composer.json" />
-        <option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
-        <option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
        <option value="$PROJECT_DIR$/application/model/GatewayUpdateModel.php" />
        <option value="$PROJECT_DIR$/.env" />
-        <option value="$PROJECT_DIR$/lib/log/Log.php" />
        <option value="$PROJECT_DIR$/.staging" />
        <option value="$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php" />
-        <option value="$PROJECT_DIR$/application/Events.php" />
        <option value="$PROJECT_DIR$/application/controller/accept/CertifyController.php" />
-        <option value="$PROJECT_DIR$/lib/cdz/order/Order.php" />
-        <option value="$PROJECT_DIR$/application/controller/accept/AccessController.php" />
        <option value="$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php" />
        <option value="$PROJECT_DIR$/lib/cdz/order/state/OfflineNetState.php" />
        <option value="$PROJECT_DIR$/lib/rabbitmq/PublishPortShed.php" />
@@ -225,9 +215,24 @@
        <option value="$PROJECT_DIR$/application/route/Api.php" />
        <option value="$PROJECT_DIR$/application/controller/business/power/PowerController.php" />
        <option value="$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php" />
-        <option value="$PROJECT_DIR$/application/controller/update/QueryController.php" />
        <option value="$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.php" />
+        <option value="$PROJECT_DIR$/lib/station/gateway/port/Port.php" />
+        <option value="$PROJECT_DIR$/application/controller/business/port/OnlineController.php" />
+        <option value="$PROJECT_DIR$/application/controller/business/port/OfflineController.php" />
+        <option value="$PROJECT_DIR$/application/Events.php" />
+        <option value="$PROJECT_DIR$/application/controller/update/QueryController.php" />
+        <option value="$PROJECT_DIR$/application/controller/accept/AccessController.php" />
+        <option value="$PROJECT_DIR$/lib/log/Log.php" />
+        <option value="$PROJECT_DIR$/application/controller/card/PayRuleController.php" />
+        <option value="$PROJECT_DIR$/application/model/CardModel.php" />
+        <option value="$PROJECT_DIR$/application/model/UserModel.php" />
+        <option value="$PROJECT_DIR$/application/controller/card/charger/RequestController.php" />
+        <option value="$PROJECT_DIR$/application/controller/card/BalanceController.php" />
+        <option value="$PROJECT_DIR$/application/controller/business/charger/OverController.php" />
+        <option value="$PROJECT_DIR$/application/controller/business/port/StateController.php" />
+        <option value="$PROJECT_DIR$/lib/cdz/order/Order.php" />
        <option value="$PROJECT_DIR$/application/controller/business/charger/StartController.php" />
+        <option value="$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php" />
        <option value="$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php" />
      </list>
    </option>
@@ -259,10 +264,10 @@
      <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
    </include_path>
  </component>
-  <component name="ProjectFrameBounds" extendedState="1">
+  <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="x" value="60" />
+    <option name="x" value="83" />
-    <option name="y" value="72" />
+    <option name="y" value="23" />
-    <option name="width" value="1737" />
+    <option name="width" value="1772" />
    <option name="height" value="1057" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -283,8 +288,6 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -308,13 +311,6 @@
              <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="accept" 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>
@@ -338,47 +334,18 @@
              <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="setting" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="power" 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="update" 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="route" 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="lib" 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="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="cdz" 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="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
              <item name="cdz" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="card_order" 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="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="cdz" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="card_order" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="state" type="2a2b976b:PhpTreeStructureProvider$1" />
            </path>
            <path>
              <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
@@ -389,25 +356,14 @@
            </path>
            <path>
              <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="cdz_gateway_v2" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="lib" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="cdz" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="order" type="2a2b976b:PhpTreeStructureProvider$1" />
-              <item name="state" 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="src" type="2a2b976b:PhpTreeStructureProvider$1" />
-            </path>
-            <path>
-              <item name="cdz_gateway_v2" type="b2602c69:ProjectViewProjectNode" />
              <item name="External Libraries" type="bcb0276e:PhpExternalLibrariesNodePatcher$PatchedExternalLibrariesNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
+      <pane id="Scratches" />
+      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -415,7 +371,7 @@
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
    <property name="php.override.implement.member.chooser.php.doc" value="NONE" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
+    <property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
  </component>
  <component name="RecentsManager">
@@ -485,29 +441,43 @@
      <workItem from="1538645253886" duration="427000" />
      <workItem from="1538800587957" duration="586000" />
      <workItem from="1538959925312" duration="24349000" />
-      <workItem from="1539516651393" duration="9439000" />
+      <workItem from="1539516651393" duration="11468000" />
+      <workItem from="1539764644675" duration="3037000" />
+      <workItem from="1539770458463" duration="3819000" />
+      <workItem from="1540292474039" duration="507000" />
+      <workItem from="1540293175133" duration="1161000" />
+      <workItem from="1540629439710" duration="1582000" />
+      <workItem from="1540988037138" duration="2649000" />
+      <workItem from="1541315066483" duration="3924000" />
+      <workItem from="1541508238380" duration="5090000" />
+      <workItem from="1541592474176" duration="5435000" />
+      <workItem from="1541956856847" duration="76000" />
+      <workItem from="1541928666993" duration="3295000" />
+      <workItem from="1542028244933" duration="6952000" />
+      <workItem from="1542196746360" duration="3434000" />
+      <workItem from="1542290101741" duration="2358000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="349194000" />
+    <option name="totallyTimeSpent" value="394542000" />
  </component>
  <component name="ToolWindowManager">
-    <frame x="60" y="72" width="1737" height="1057" extended-state="1" />
+    <frame x="0" y="0" width="1920" height="1080" extended-state="0" />
+    <editor active="true" />
    <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2140575" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <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="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.07068607" sideWeight="0.5" order="8" 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="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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.06548856" 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.30147493" 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="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="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="File Transfer" 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="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="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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" 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.12993763" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -515,6 +485,7 @@
      <window_info id="Database Changes" 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="Thumbnails" 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="9" side_tool="false" content_ui="tabs" />
      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <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="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    </layout>
  </component>
@@ -526,410 +497,385 @@
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
-      <option name="time" value="1" />
+      <option name="time" value="3" />
    </breakpoint-manager>
    <watches-manager />
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/application/start_gateway.php">
+    <entry file="file://$PROJECT_DIR$/lib/rabbitmq/MyRabbitMq.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="624">
-          <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="44" column="20" lean-forward="false" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/start_register.php">
+    <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerReloadMessage.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="448">
-          <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="33" column="27" lean-forward="false" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/HeartController.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
+        <state relative-caret-position="522">
-          <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+          <caret line="173" column="27" lean-forward="false" selection-start-line="173" selection-start-column="27" selection-end-line="173" selection-end-column="27" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_3.php">
+    <entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="311">
+        <state relative-caret-position="1088">
-          <caret line="792" column="9" lean-forward="false" selection-start-line="792" selection-start-column="9" selection-end-line="792" selection-end-column="9" />
+          <caret line="74" column="19" lean-forward="false" selection-start-line="74" selection-start-column="19" selection-end-line="74" selection-end-column="19" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/.example">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="448">
-          <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="35" column="20" lean-forward="false" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerShedTimeOutMessage.php">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="1153">
-          <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="352" column="5" lean-forward="false" selection-start-line="352" selection-start-column="5" selection-end-line="352" selection-end-column="5" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/remote/api/message/Message.php">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="411">
-          <caret line="11" column="15" lean-forward="false" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
+          <caret line="57" column="54" lean-forward="false" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/model/GatewayModel.php">
+    <entry file="file://$PROJECT_DIR$/src/command/SendCommand.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
+        <state relative-caret-position="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" />
+          <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>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/model/GatewayUpdateModel.php">
+    <entry file="file://$PROJECT_DIR$/src/command/StopChargerCommand.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
+        <state relative-caret-position="0">
-          <caret line="16" column="1" lean-forward="false" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
+          <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>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/model/OrderPowerModel.php">
+    <entry file="file://$PROJECT_DIR$/src/request/Request.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
+        <state relative-caret-position="576">
-          <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="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/station/gateway/port/Port.php">
+    <entry file="file://$PROJECT_DIR$/src/response/Response.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1664">
+        <state relative-caret-position="1232">
-          <caret line="113" column="20" lean-forward="false" selection-start-line="113" selection-start-column="20" selection-end-line="113" selection-end-column="20" />
+          <caret line="80" column="20" lean-forward="false" selection-start-line="80" selection-start-column="20" selection-end-line="80" selection-end-column="20" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_9.php">
+    <entry file="file://$PROJECT_DIR$/lib/station/Station.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2960">
+        <state relative-caret-position="128">
-          <caret line="185" column="9" lean-forward="false" selection-start-line="185" selection-start-column="9" selection-end-line="185" selection-end-column="9" />
+          <caret line="13" column="10" lean-forward="false" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/business/power/ShutdownController.php">
+    <entry file="file://$PROJECT_DIR$/src/route/Route.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="160">
-          <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="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/Events.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
+        <state relative-caret-position="880">
-          <caret line="116" column="5" lean-forward="true" selection-start-line="116" selection-start-column="5" selection-end-line="116" selection-end-column="5" />
+          <caret line="92" column="48" lean-forward="false" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/start_businessworker.php">
+    <entry file="file://$PROJECT_DIR$/composer.json">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
+        <state relative-caret-position="144">
-          <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+          <caret line="9" column="10" lean-forward="false" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/setting/SettingController.php">
+    <entry file="file://$PROJECT_DIR$/start.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
+        <state relative-caret-position="384">
-          <caret line="47" column="24" lean-forward="false" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="24" />
+          <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/Gateway.php">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="311">
+        <state relative-caret-position="2896">
-          <caret line="876" column="27" lean-forward="false" selection-start-line="876" selection-start-column="27" selection-end-line="876" selection-end-column="27" />
+          <caret line="203" column="72" lean-forward="false" selection-start-line="203" selection-start-column="72" selection-end-line="203" selection-end-column="72" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/workerman/mysql/src/Connection.php">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
+        <state relative-caret-position="2640">
-          <caret line="1471" column="20" lean-forward="false" selection-start-line="1471" selection-start-column="20" selection-end-line="1471" selection-end-column="20" />
+          <caret line="181" column="51" lean-forward="false" selection-start-line="181" selection-start-column="51" selection-end-line="181" selection-end-column="51" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/model/Model.php">
+    <entry file="file://$PROJECT_DIR$/application/model/BillTmpModel.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="685">
+        <state relative-caret-position="176">
-          <caret line="107" column="51" lean-forward="false" selection-start-line="107" selection-start-column="51" selection-end-line="107" selection-end-column="51" />
+          <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <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>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/model/OrderModel.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/card/port/StateController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
+        <state relative-caret-position="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" />
+          <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>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/accept/CertifyController.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/card/charger/OverController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="824">
+        <state relative-caret-position="1280">
-          <caret line="92" column="48" lean-forward="false" selection-start-line="92" selection-start-column="48" selection-end-line="92" selection-end-column="48" />
+          <caret line="91" column="0" lean-forward="false" selection-start-line="91" selection-start-column="0" selection-end-line="91" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/log/Record.php">
+    <entry file="file://$PROJECT_DIR$/application/model/ExceptionModel.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="96">
-          <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="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/log/Log.php">
+    <entry file="file://$PROJECT_DIR$/application/model/DeviceModel.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
+        <state relative-caret-position="96">
-          <caret line="53" column="77" lean-forward="false" selection-start-line="53" selection-start-column="77" selection-end-line="53" selection-end-column="77" />
+          <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/setting/DeviceMacController.php">
+    <entry file="file://$PROJECT_DIR$/lib/station/gateway/Gateway.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
+        <state relative-caret-position="272">
-          <caret line="17" column="1" lean-forward="false" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
+          <caret line="22" column="20" lean-forward="false" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/.staging">
+    <entry file="file://$PROJECT_DIR$/application/controller/business/port/OfflineController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="512">
+        <state relative-caret-position="1248">
-          <caret line="32" column="64" lean-forward="false" selection-start-line="32" selection-start-column="64" selection-end-line="32" selection-end-column="64" />
+          <caret line="88" column="29" lean-forward="false" selection-start-line="88" selection-start-column="29" selection-end-line="88" selection-end-column="29" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerFullMessage.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/business/port/OnlineController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
+        <state relative-caret-position="1072">
-          <caret line="26" column="20" lean-forward="false" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
+          <caret line="75" column="29" lean-forward="false" selection-start-line="75" selection-start-column="29" selection-end-line="75" selection-end-column="29" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/.env">
+    <entry file="file://$PROJECT_DIR$/lib/station/gateway/port/Port.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
+        <state relative-caret-position="1248">
-          <caret line="31" column="64" lean-forward="false" selection-start-line="31" selection-start-column="64" selection-end-line="31" selection-end-column="64" />
+          <caret line="87" column="21" lean-forward="false" selection-start-line="87" selection-start-column="21" selection-end-line="87" selection-end-column="21" />
          <folding />
        </state>
      </provider>
    </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">
-        <state relative-caret-position="656">
+        <state relative-caret-position="30144">
-          <caret line="49" column="0" lean-forward="false" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
+          <caret line="1886" column="20" lean-forward="false" selection-start-line="1886" selection-start-column="20" selection-end-line="1886" selection-end-column="20" />
-          <folding>
-            <element signature="e#123#158#0#PHP" expanded="false" />
-          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/rabbitmq/PublishPortShed.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/update/QueryController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
+        <state relative-caret-position="494">
-          <caret line="23" column="37" lean-forward="false" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
+          <caret line="106" column="0" lean-forward="false" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/rabbitmq/MyRabbitMq.php">
+    <entry file="file://$PROJECT_DIR$/application/Events.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="624">
+        <state relative-caret-position="384">
-          <caret line="44" column="20" lean-forward="false" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="20" />
+          <caret line="45" column="53" lean-forward="false" selection-start-line="45" selection-start-column="53" selection-end-line="45" selection-end-column="53" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ChargerState.php">
+    <entry file="file://$PROJECT_DIR$/lib/log/Log.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4480">
+        <state relative-caret-position="96">
-          <caret line="302" column="11" lean-forward="false" selection-start-line="302" selection-start-column="11" selection-end-line="302" selection-end-column="11" />
+          <caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
-          <folding />
+          <folding>
+            <element signature="e#111#151#0#PHP" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/remote/api/message/ChargerReloadMessage.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
+        <state relative-caret-position="2405">
-          <caret line="33" column="27" lean-forward="false" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
+          <caret line="407" column="52" lean-forward="false" selection-start-line="407" selection-start-column="52" selection-end-line="407" selection-end-column="52" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/ShedState.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/card/charger/StartController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1488">
+        <state relative-caret-position="816">
-          <caret line="109" column="49" lean-forward="false" selection-start-line="109" selection-start-column="49" selection-end-line="109" selection-end-column="49" />
+          <caret line="60" column="28" lean-forward="false" selection-start-line="60" selection-start-column="28" selection-end-line="60" selection-end-column="28" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/State.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/card/charger/RequestController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
+        <state relative-caret-position="1440">
-          <caret line="36" column="20" lean-forward="false" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
+          <caret line="102" column="15" lean-forward="false" selection-start-line="102" selection-start-column="15" selection-end-line="102" selection-end-column="15" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php">
+    <entry file="file://$PROJECT_DIR$/application/route/Api.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
+        <state relative-caret-position="80">
-          <caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
+          <caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/card/PayRuleController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
+        <state relative-caret-position="352">
-          <caret line="344" column="20" lean-forward="false" selection-start-line="344" selection-start-column="20" selection-end-line="344" selection-end-column="20" />
+          <caret line="31" column="5" lean-forward="false" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/route/Route.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/card/BalanceController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="224">
-          <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="21" column="26" lean-forward="false" selection-start-line="21" selection-start-column="26" selection-end-line="21" selection-end-column="26" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/route/Api.php">
+    <entry file="file://$PROJECT_DIR$/application/model/UserModel.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
+        <state relative-caret-position="160">
-          <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="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/StateCode.php">
+    <entry file="file://$PROJECT_DIR$/application/model/CardModel.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
+        <state relative-caret-position="160">
-          <caret line="24" column="10" lean-forward="false" selection-start-line="24" selection-start-column="10" selection-end-line="24" selection-end-column="10" />
+          <caret line="15" column="1" lean-forward="false" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
-          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php">
+    <entry file="file://$PROJECT_DIR$/application/model/Model.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="583">
+        <state relative-caret-position="496">
-          <caret line="129" column="41" lean-forward="false" selection-start-line="129" selection-start-column="41" selection-end-line="129" selection-end-column="41" />
+          <caret line="36" column="20" lean-forward="false" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
-          <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>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/business/power/PowerController.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/card/charger/PowerController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="522">
+        <state relative-caret-position="0">
-          <caret line="173" column="27" lean-forward="false" selection-start-line="173" selection-start-column="27" selection-end-line="173" selection-end-column="27" />
+          <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>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/response/Response.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
+        <state relative-caret-position="0">
-          <caret line="80" column="20" lean-forward="false" selection-start-line="80" selection-start-column="20" selection-end-line="80" selection-end-column="20" />
+          <caret line="73" column="23" lean-forward="false" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="23" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/setting/SettingController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1088">
+        <state relative-caret-position="1040">
-          <caret line="74" column="19" lean-forward="false" selection-start-line="74" selection-start-column="19" selection-end-line="74" selection-end-column="19" />
+          <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/update/QueryController.php">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/State.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
+        <state relative-caret-position="128">
-          <caret line="104" column="17" lean-forward="false" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+          <caret line="13" column="15" lean-forward="false" selection-start-line="13" selection-start-column="15" selection-end-line="13" selection-end-column="15" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/accept/AccessController.php">
+    <entry file="file://$PROJECT_DIR$/application/controller/business/port/StateController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
+        <state relative-caret-position="1152">
-          <caret line="362" column="44" lean-forward="false" selection-start-line="362" selection-start-column="44" selection-end-line="362" selection-end-column="44" />
+          <caret line="88" column="33" lean-forward="false" selection-start-line="88" selection-start-column="33" selection-end-line="88" selection-end-column="33" />
-          <folding>
+          <folding />
-            <element signature="e#1070#3662#0#PHP" expanded="false" />
-          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/OfflinePowerState.php">
+    <entry file="file://$PROJECT_DIR$/.env">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
+        <state relative-caret-position="272">
-          <caret line="35" column="20" lean-forward="false" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
+          <caret line="17" column="20" lean-forward="false" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/ChargerState.php">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/order/Order.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1153">
+        <state relative-caret-position="4730">
-          <caret line="352" column="5" lean-forward="false" selection-start-line="352" selection-start-column="5" selection-end-line="352" selection-end-column="5" />
+          <caret line="458" column="20" lean-forward="false" selection-start-line="458" selection-start-column="20" selection-end-line="458" selection-end-column="20" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/cdz/card_order/state/WaitingState.php">
+    <entry file="file://$PROJECT_DIR$/lib/cdz/order/save/OrderSaveRedis.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="411">
+        <state relative-caret-position="963">
-          <caret line="57" column="54" lean-forward="false" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
+          <caret line="69" column="23" lean-forward="false" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/application/controller/business/charger/OverController.php">
+    <entry file="file://$PROJECT_DIR$/lib/StateCode.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
+        <state relative-caret-position="272">
-          <caret line="108" column="70" lean-forward="false" selection-start-line="108" selection-start-column="70" selection-end-line="108" selection-end-column="70" />
+          <caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/application/controller/business/charger/StartController.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
+        <state relative-caret-position="574">
-          <caret line="93" column="43" lean-forward="false" selection-start-line="93" selection-start-column="43" selection-end-line="93" selection-end-column="43" />
+          <caret line="91" column="44" lean-forward="false" selection-start-line="91" selection-start-column="44" selection-end-line="91" selection-end-column="44" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/lib/cdz/order/state/WaitingState.php">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
+        <state relative-caret-position="263">
-          <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+          <caret line="236" column="0" lean-forward="false" selection-start-line="236" selection-start-column="0" selection-end-line="236" selection-end-column="0" />
          <folding />
        </state>
      </provider>

--- a/application/Events.php
+++ b/application/Events.php
@@ -134,10 +134,11 @@ class Events
        $exceptionModel = new \Application\model\ExceptionModel();
        if (isset($_SESSION['station_id']) && isset($_SESSION['gateway_id'])) {
            $exceptionModel->insertRow([
-                'message' => '网关离线',
+                'message'    => '网关离线',
                'gateway_id' => $gatewayId,
                'station_id' => $stationId,
-                'type' => 1,
+                'type'       => 1,
+                'created_at' => date('Y-m-d H:i:s'),
            ]);
        }
@@ -163,8 +164,6 @@ class Events
        $orderExceptionModel = new \Application\model\OrderExceptionModel();
        $date = date('Y-m-d H:i:s');
        foreach ($portsId as $portId) {
            //所有端口状态设置为离线
@@ -177,10 +176,10 @@ class Events
            $exceptionModel->insertRow([
                'gateway_id' => $gatewayId,
                'station_id' => $stationId,
-                'port_id' => $portId,
+                'port_id'    => $portId,
-                'message' => '口子离线',
+                'message'    => '口子离线',
                'created_at' => $date,
-                'type' => 1,
+                'type'       => 1,
            ]);
            $portUsingOrderId = $port->getPortUsingOrderId();
@@ -197,10 +196,10 @@ class Events
                    $orderExceptionModel->insertRow([
-                        'order_id' => $order->getId(),
+                        'order_id'   => $order->getId(),
-                        'state' => \Lib\StateCode::PORT_OFFLINE,
+                        'state'      => \Lib\StateCode::PORT_OFFLINE,
                        'created_at' => date('Y-m-d H:i:s'),
-                        'desc' => '网关离线，订单离线',
+                        'desc'       => '网关离线，订单离线',
                    ]);
@@ -213,10 +212,10 @@ class Events
        $broadcastToAgent->broadcast([
            'notice_exception_code' => 15,
-            'gateway_id' => $gatewayId,
+            'gateway_id'            => $gatewayId,
-            'station_id' => $stationId,
+            'station_id'            => $stationId,
-            'station_name' => $stationName,
+            'station_name'          => $stationName,
-            'gateway_mac' => isset($_SESSION['gateway_mac']) ? $_SESSION['gateway_mac'] : '',
+            'gateway_mac'           => isset($_SESSION['gateway_mac']) ? $_SESSION['gateway_mac'] : '',
        ]);

--- a/application/controller/accept/AccessController.php
+++ b/application/controller/accept/AccessController.php
@@ -11,7 +11,9 @@ namespace Application\controller\accept;
 use Application\controller\Controller;
 use Application\model\DeviceModel;
+use Application\model\GatewayLogModel;
 use Application\model\GatewayModel;
+use Application\model\OrderExceptionModel;
 use Application\model\ParkModel;
 use Application\model\StationModel;
 use Lib\cdz\order\Order;
@@ -48,93 +50,95 @@ class AccessController extends Controller
    }
-    private function test($mac)
+//    private function test($mac)
-    {
+//    {
+//
+//
-        Gateway::bindUid($this->clientId, $mac);
+//        Gateway::bindUid($this->clientId, $mac);
+//
-        $_SESSION['gateway_mac'] = $mac;
+//        $_SESSION['gateway_mac'] = $mac;
-        $gatewayModel = new GatewayModel();
+//        $gatewayModel = new GatewayModel();
+//
+//
-        if (isset($_SESSION['gateway_mac'])) {
+//        if (isset($_SESSION['gateway_mac'])) {
-            if ($_SESSION['gateway_mac'] != $mac) {
+//            if ($_SESSION['gateway_mac'] != $mac) {
-                Gateway::closeClient($this->clientId);
+//                Gateway::closeClient($this->clientId);
+//
-            }
+//            }
+//
-            $gatewayModelResult = $gatewayModel->getColumns([
+//            $gatewayModelResult = $gatewayModel->getColumns([
-                'station_id',
+//                'station_id',
-                'id',
+//                'id',
-                'name',
+//                'name',
-                'type_id'
+//                'type_id'
-            ], 'mac_address = ' . "'$mac'");
+//            ], 'mac_address = ' . "'$mac'");
+//
-            if ($gatewayModelResult == false) {
+//            if ($gatewayModelResult == false) {
-                Gateway::closeClient($this->clientId);
+//                Gateway::closeClient($this->clientId);
-                return;
+//                return;
-            }
+//            }
-            $stationId = $gatewayModelResult['station_id'];
+//            $stationId = $gatewayModelResult['station_id'];
+//
-            $gatewayId = $gatewayModelResult['id'];
+//            $gatewayId = $gatewayModelResult['id'];
+//
-            $_SESSION['gateway_name'] = $gatewayModelResult['name'];
+//            $_SESSION['gateway_name'] = $gatewayModelResult['name'];
+//
-            $_SESSION['gateway_id'] = $gatewayModelResult['id'];
+//            $_SESSION['gateway_id'] = $gatewayModelResult['id'];
+//
-            $_SESSION['gateway_type'] = $gatewayModelResult['type_id'];
+//            $_SESSION['gateway_type'] = $gatewayModelResult['type_id'];
+//
-            $stationModel = new StationModel();
+//            $stationModel = new StationModel();
-            $stationData = $stationModel->getColumns([
+//            $stationData = $stationModel->getColumns([
-                'park_id',
+//                'park_id',
-                'name',
+//                'name',
-            ], 'id = ' . $stationId);
+//            ], 'id = ' . $stationId);
+//
-            if (isset($stationData['park_id']) && isset($stationData['name'])) {
+//            if (isset($stationData['park_id']) && isset($stationData['name'])) {
-                $parkId = $stationData['park_id'];
+//                $parkId = $stationData['park_id'];
-                $_SESSION['station_name'] = $stationData['name'];
+//                $_SESSION['station_name'] = $stationData['name'];
-                if (isset($parkId)) {
+//                if (isset($parkId)) {
-                    $parkModel = new ParkModel();
+//                    $parkModel = new ParkModel();
-                    $_SESSION['park_id'] = $parkId;
+//                    $_SESSION['park_id'] = $parkId;
-                    $agentId = $parkModel->getColumn('agent_id', 'id = ' . $parkId);
+//                    $agentId = $parkModel->getColumn('agent_id', 'id = ' . $parkId);
-                    if (isset($agentId)) {
+//                    if (isset($agentId)) {
-                        $_SESSION['agent_id'] = $agentId;
+//                        $_SESSION['agent_id'] = $agentId;
-                    }
+//                    }
+//
-                }
+//                }
+//
-            }
+//            }
+//
+//
-            $deviceModel = new DeviceModel();
+//            $deviceModel = new DeviceModel();
+//
-            $deviceModelResult = $deviceModel->getAllColumns([
+//            $deviceModelResult = $deviceModel->getAllColumns([
+//
-                'id',
+//                'id',
-                'device_mac',
+//                'device_mac',
-                'name',
+//                'name',
-            ], 'gateway_id = ' . $gatewayId);
+//                'status_id',
+//            ], 'gateway_id = ' . $gatewayId);
-            $tmp = [];
+//
-            $portsIdName = [];
+//            $tmp = [];
+//            $portsIdName = [];
-            foreach ($deviceModelResult as $item) {
+//            $portsStatus = [];
+//            foreach ($deviceModelResult as $item) {
-                $tmp[$item['device_mac']] = $item['id'];
+//
-                $portsIdName[$item['id']] = $item['name'];
+//                $tmp[$item['device_mac']] = $item['id'];
+//                $portsIdName[$item['id']] = $item['name'];
-            }
+//                $portsStatus[$item['id']] = $item['status_id'];
-            $_SESSION['port_id_name'] = $portsIdName;
+//            }
-            $_SESSION['port_mac_id'] = $tmp;
+//            $_SESSION['port_id_status'] = $portsStatus;
-            $_SESSION['port_id_mac'] = array_flip($tmp);
+//            $_SESSION['port_id_name'] = $portsIdName;
+//            $_SESSION['port_mac_id'] = $tmp;
-            $_SESSION['station_id'] = $stationId;
+//            $_SESSION['port_id_mac'] = array_flip($tmp);
-            $_SESSION['gateway_id'] = $gatewayId;
+//
-            $_SESSION['client_id'] = $this->clientId;
+//            $_SESSION['station_id'] = $stationId;
+//            $_SESSION['gateway_id'] = $gatewayId;
-        }
+//            $_SESSION['client_id'] = $this->clientId;
-    }
+//
+//        }
+//    }
    /**
     * 请求入网
@@ -212,19 +216,22 @@ class AccessController extends Controller
                'id',
                'device_mac',
                'name',
+                'status_id'
            ], 'gateway_id = ' . $gatewayId);
            $tmp = [];
            $portsIdName = [];
+            $portsStatus = [];
            foreach ($deviceModelResult as $item) {
                $tmp[$item['device_mac']] = $item['id'];
                $portsIdName[$item['id']] = $item['name'];
+                $portsStatus[$item['id']] = $item['status_id'];
            }
            $_SESSION['port_id_name'] = $portsIdName;
            $_SESSION['port_mac_id'] = $tmp;
+            $_SESSION['port_id_status'] = $portsStatus;
            $_SESSION['port_id_mac'] = array_flip($tmp);
            $_SESSION['station_id'] = $stationId;
@@ -300,6 +307,8 @@ class AccessController extends Controller
        }
        $logicStartTmp = $logicStart;
+        $portsIdStatus = $_SESSION['port_id_status'];
        foreach ($portMacState as $mac => $state) {
            $portId = isset($portsMacId[$mac]) ? $portsMacId[$mac] : false;
@@ -307,9 +316,14 @@ class AccessController extends Controller
                continue;
            }
            $port->setPortId($portId);
+            if (isset($portsIdStatus[$portId])) {
+                if ($portsIdStatus[$portId] === 8) {
+                    $state = 8;
+                }
+            }
            //设置端口状态
            $port->setState($state);
            $port->setGatewayId($_SESSION['gateway_id']);
@@ -339,6 +353,9 @@ class AccessController extends Controller
        $orderCount = '00';
+        $orderExceptionModel = new OrderExceptionModel();
+        $gatewayLod = new GatewayLogModel();
        foreach ($portsId as $portId) {
            $order = new Order();
@@ -370,13 +387,25 @@ class AccessController extends Controller
                $orderId = sprintf('%012x', $order->getId());
                $time = sprintf('%04x', $remainTime);
+                $orderExceptionModel->insertRow([
+                    'order_id'   => $orderId,
+                    'state'      => '1011',
+                    'created_at' => date('Y-m-d H:i:s'),
+                    'desc'       => '口子离线或断网后重新上线',
+                    'data'       => json_encode([
+                        'remain_time'    => $time,
+                        'offline_reason' => $offlineReason,
+                    ])
+                ]);
                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->setState(StateCode::PORT_CHARGER);
+            $port->setState($order->getStateCode());
            $port->updatePortState();

--- a/application/controller/business/charger/OverController.php
+++ b/application/controller/business/charger/OverController.php
@@ -27,9 +27,9 @@ class OverController extends Controller
    protected $parameterMap = [
        '05' => [
-            'type' => 1,
+            'type'     => 1,
            'logic_id' => 1,
-            'state' => 1,
+            'state'    => 1,
            'order_id' => 6,
            'capacity' => 4,
        ]
@@ -67,10 +67,12 @@ class OverController extends Controller
            if ($portId !== 0) {
                $this->logRecord->setPortId($portId);
            }
-            // 逻辑地址不相同则认为已经更换过口子
+//             逻辑地址不相同则认为已经更换过口子
-//            if ($logicId != $order->getPortLogicId()) {
+            if ($logicId != $order->getPortLogicId()) {
-//                $this->response->send('15', sprintf('%02x', $logicId) . sprintf('%012x', $orderId));
+                $this->response->send('15', sprintf('%02x', $logicId) . sprintf('%012x', $orderId));
-//            }
+                return;
+            }
            if (Gateway::isUidOnline($order->getUserId()) === 1) {
@@ -105,9 +107,9 @@ class OverController extends Controller
                        $orderModel = new OrderModel();
                        $orderModel->update([
-                            'is_stop' => StateCode::FINISH_REFUND,
+                            'is_stop'      => StateCode::FINISH_REFUND,
                            'end_capacity' => $order->getEndCapacity(),
-                            'end_time' => date('Y-m-d H:i:s'),
+                            'end_time'     => date('Y-m-d H:i:s'),
                        ], 'id = ' . $order->getId());
                        break;
@@ -149,10 +151,10 @@ class OverController extends Controller
                            $orderExceptionModel = new OrderExceptionModel();
                            $orderExceptionModel->insertRow([
-                                'order_id' => $orderId,
+                                'order_id'   => $orderId,
                                'created_at' => date('Y-m-d H:i:s'),
-                                'state' => '-1' . StateCode::CHANGE_PORT,
+                                'state'      => '-1' . StateCode::CHANGE_PORT,
-                                'desc' => '更换口子，' . $portId . '关闭成功',
+                                'desc'       => '更换口子，' . $portId . '关闭成功',
                            ]);
                            $this->logRecord->setDesc('更换口子，' . $portId . '关闭成功');

--- a/application/controller/business/charger/StartController.php
+++ b/application/controller/business/charger/StartController.php
@@ -46,14 +46,9 @@ class StartController extends Controller
        $logic = $this->getRequest()->get('logic_id');
        $state = hexdec($this->getRequest()->get('state'));
        $orderId = hexdec($this->getRequest()->get('order_id'));
        $this->logRecord->setOrderId($orderId);
        $capacity = hexdec($this->getRequest()->get('capacity'));
-        Log::debug('order_id-->' . $orderId);
-        Log::debug('capacity-->' . $capacity);
        if ($type == 1) {
            $order = new Order($orderId);
            if ($order->getOrderCache(\Events::getRedis()) == false) {
                $this->response->send('14', sprintf('%012x', $orderId));

--- a/application/controller/business/port/OfflineController.php
+++ b/application/controller/business/port/OfflineController.php
@@ -85,18 +85,21 @@ class OfflineController extends Controller
                Log::debug('offline port_id' . $portId);
                $port->setPortId($portId);
+                if ($port->isPortBan() === true) {
+                    continue;
+                }
                $port->setStationId($_SESSION['station_id']);
                $port->setGatewayId($_SESSION['gateway_id']);
                $port->setState(StateCode::PORT_OFFLINE);
                $port->updatePortState();
                // 记录口子离线
                $exceptionModel->insertRow([
-                    'message' => '口子离线',
+                    'message'    => '口子离线',
                    'gateway_id' => isset($_SESSION['gateway_id']) ? $_SESSION['gateway_id'] : '',
                    'station_id' => isset($_SESSION['station_id']) ? $_SESSION['station_id'] : '',
-                    'port_id' => $portId,
+                    'port_id'    => $portId,
                    'created_at' => date('Y-m-d H:i:s'),
-                    'type' => 1,
+                    'type'       => 1,
                ]);
            }
@@ -105,11 +108,11 @@ class OfflineController extends Controller
        $broadcastToAgent->broadcast([
            'notice_exception_code' => StateCode::PORT_OFFLINE,
-            'ports' => $offlinePorts,
+            'ports'                 => $offlinePorts,
-            'station_name' => $_SESSION['station_name'],
+            'station_name'          => $_SESSION['station_name'],
-            'gateway_name' => $_SESSION['gateway_name'],
+            'gateway_name'          => $_SESSION['gateway_name'],
-            'station_id' => $_SESSION['station_id'],
+            'station_id'            => $_SESSION['station_id'],
-            'gateway_id' => $_SESSION['gateway_id'],
+            'gateway_id'            => $_SESSION['gateway_id'],
        ]);
    }

--- a/application/controller/business/port/OnlineController.php
+++ b/application/controller/business/port/OnlineController.php
@@ -72,6 +72,9 @@ class OnlineController extends Controller
            if (isset($portsMacId[$portMac])) {
                $portId = $portsMacId[$portMac];
+                if ($port->isPortBan() === true) {
+                    continue;
+                }
                $port->setPortId($portId);
                $port->setStationId($_SESSION['station_id']);
                $port->setGatewayId($_SESSION['gateway_id']);
@@ -80,7 +83,7 @@ class OnlineController extends Controller
                // 记录口子上线
                $exceptionModel->insertRow([
-                    'port_id' => $portId,
+                    'port_id'    => $portId,
                    'gateway_id' => isset($_SESSION['gateway_id']) ? $_SESSION['gateway_id'] : '',
                    'station_id' => isset($_SESSION['station_id']) ? $_SESSION['station_id'] : '',
                    'created_at' => date('Y-m-d H:i:s'),

--- a/application/controller/business/port/StateController.php
+++ b/application/controller/business/port/StateController.php
@@ -29,8 +29,8 @@ class StateController extends Controller
        '0B' => [
            'port_logic' => 1,
-            'mac' => 8,
+            'mac'        => 8,
-            'state' => 1,
+            'state'      => 1,
        ]
    ];
@@ -68,7 +68,10 @@ class StateController extends Controller
        $port = new Port($portId);
+        if ($port->isPortBan() === true) {
+            return;
+        }
        $usingOrderId = $port->getPortUsingOrderId();
        if ($usingOrderId == false || $usingOrderId == '') {
@@ -83,6 +86,8 @@ class StateController extends Controller
            $order = new Order((int)$usingOrderId);
+            $order->setIsChangeState(true);
            if ($order->getOrderCache(\Events::getRedis()) == false) {
                $port->setState($state);

--- a/application/controller/card/BalanceController.php
+++ b/application/controller/card/BalanceController.php
@@ -11,6 +11,7 @@ namespace Application\controller\card;
 use Application\controller\Controller;
 use Application\model\CardModel;
+use Application\model\UserModel;
 class BalanceController extends Controller
 {
@@ -18,7 +19,7 @@ class BalanceController extends Controller
        '32' => [
-            'card_id' => 3
+            'card_id' => 4
        ]
    ];
@@ -32,14 +33,17 @@ class BalanceController extends Controller
        $cardModel = new CardModel();
-        $balance = $cardModel->getColumn('balance', 'card_number = ' . $cardId);
+        $userId = $cardModel->getColumn('user_id', 'card_number = ' . $cardId);
+        if (isset($userId)) {
+            $userModel = new  UserModel();
+            $balance = $userModel->getColumn('balance', 'id = ' . $userId);
+        }
        $balance = isset($balance) ? $balance : 0;
        $balance = sprintf('%08x', $balance);
-        var_dump($balance);
        $this->response->send('32', $cardId . $balance);
    }

--- a/application/controller/card/PayRuleController.php
+++ b/application/controller/card/PayRuleController.php
@@ -37,12 +37,7 @@ class PayRuleController extends Controller
            Gateway::closeClient($this->clientId);
        }
-        Log::debug($_SESSION['station_id']);
        $rule = $billingTmp->getColumn('context', 'id = ' . $_SESSION['station_id']);
-        Log::debug($rule);
        if (isset($rule)) {
            $rule = json_decode($rule, true);

--- a/application/controller/card/charger/RequestController.php
+++ b/application/controller/card/charger/RequestController.php
@@ -12,6 +12,7 @@ namespace Application\controller\card\charger;
 use Application\controller\Controller;
 use Application\model\CardModel;
 use Application\model\OrderModel;
+use Application\model\UserModel;
 use Lib\cdz\order\Order;
 use Lib\cdz\order\save\OrderSaveRedis;
 use Lib\log\Log;
@@ -22,11 +23,11 @@ class RequestController extends Controller
    protected $parameterMap = [
        '33' => [
-            'type' => 1,
+            'type'     => 1,
            'logic_id' => 1,
-            'card_id' => 3,
+            'card_id'  => 4,
-            'time' => 2,
+            'time'     => 2,
-            'price' => 2,
+            'price'    => 2,
        ],
    ];
@@ -61,14 +62,13 @@ class RequestController extends Controller
        $cardModel = new CardModel();
-        $balance = $cardModel->getColumn('balance', 'card_number = ' . $cardId);
+        $userId = $cardModel->getColumn('user_id', 'card_number = ' . $cardId);
-        Log::debug($balance);
+        if (isset($userId)) {
+            $userModel = new  UserModel();
-        if (isset($balance) === false || $balance == '') {
+            $balance = $userModel->getColumn('balance', 'id = ' . $userId);
-            return;
        }
+        $balance = isset($balance) ? $balance : 0;
        if ((int)$balance < (int)$price) {
            $orderId = 0;
@@ -84,15 +84,15 @@ class RequestController extends Controller
            $orderModel = new OrderModel();
            $outTradeNo = '3' . time() . $stationId . $portId . $gatewayId;
            $orderModel->insertRow([
-                'gateway_id' => $gatewayId,
+                'gateway_id'   => $gatewayId,
-                'station_id' => $stationId,
+                'station_id'   => $stationId,
-                'port_id' => $portId,
+                'port_id'      => $portId,
                'out_trade_no' => $outTradeNo,
-                'pay_amount' => $price,
+                'pay_amount'   => $price,
                'charger_time' => $time,
-                'created_at' => $date,
+                'created_at'   => $date,
-                'logic_num' => $logicId,
+                'logic_num'    => $logicId,
-                'pay_type' => 3,
+                'pay_type'     => 3,
                'station_name' => $stationName,
            ]);
            $orderId = $orderModel->getColumn('id', 'out_trade_no = ' . $outTradeNo);

--- a/application/controller/update/QueryController.php
+++ b/application/controller/update/QueryController.php
@@ -62,7 +62,6 @@ class QueryController extends Controller
        $hardwareVersion = $this->request->get('hardware_version');
        $softwareVersion = $this->request->get('software_version');
        $response = '';
-        Log::debug('session', Gateway::getSession($this->clientId));
        $gatewayType = isset($_SESSION['gateway_type']) ? $_SESSION['gateway_type'] : false;
@@ -74,14 +73,23 @@ class QueryController extends Controller
        $gatewayUpdateModel = new GatewayUpdateModel();
        $updateInfo = $gatewayUpdateModel->getColumns(['hardware_version', 'software_version', 'sign'], 'gateway_type = ' . $gatewayType);
-        if (count($updateInfo) !== 0) {
+        $returnCode = '10';
+        if ($gatewayType == 4 && $hardwareVersion == '01010201') {
+            $returnCode = '10';
+        } else if ($updateInfo == false) {
+            $returnCode = '10';
+        } else if (count($updateInfo) !== 0) {
            $updateHardwareVersion = $updateInfo['hardware_version'];
            $sign = $updateInfo['sign'];
 //            $updateSoftwareVersion = sprintf('%08x', $updateInfo['software_version']);
            $updateSoftwareVersion = sprintf($updateInfo['software_version']);
-            if ($updateHardwareVersion == $hardwareVersion && $updateSoftwareVersion == $softwareVersion) {
+            if ($updateHardwareVersion === null || $updateSoftwareVersion === null) {
+                $returnCode = '10';
+            } else if ($updateHardwareVersion == $hardwareVersion && $updateSoftwareVersion == $softwareVersion) {
                $returnCode = '10';
            } else {
@@ -93,7 +101,9 @@ class QueryController extends Controller
                if ($host === false) {
                    throw new \Exception('can not find download host');
                }
-                $downloadUrl = $host . '/update/' . $updateHardwareVersion . $updateSoftwareVersion . '.bin';
+                $downloadUrl = $host . '/gateway/' . $updateHardwareVersion . '_' . $updateSoftwareVersion . '.bin';
+                Log::debug($downloadUrl);
                $urlHex = '';
                for ($i = 0; $i < strlen($downloadUrl); $i++) {
@@ -115,7 +125,7 @@ class QueryController extends Controller
            $this->response->send('d1', $returnCode);
            return;
        }
-        $this->response->send('d1', '11');
+        $this->response->send('d1', $returnCode);
        return;

--- a/application/model/CardModel.php
+++ b/application/model/CardModel.php
@@ -12,5 +12,5 @@ namespace Application\model;
 class CardModel extends Model
 {
-    protected $table = 'cards';
+    protected $table = 'unreal_cards';
 }
\ No newline at end of file
--- a/application/model/UserModel.php
+++ b/application/model/UserModel.php
+<?php
+/**
+ * Created by PhpStorm.
+ * User: banice
+ * Date: 2018/11/14
+ * Time: 下午2:20
+ */
+namespace Application\model;
+class UserModel extends Model
+{
+    protected $table = 'wx_users';
+}
\ No newline at end of file
--- a/lib/cdz/order/Order.php
+++ b/lib/cdz/order/Order.php
@@ -18,6 +18,8 @@ class Order
    const ORDER_HASH_PREFIX = 'cdz:order:state:';
+    private $isChangeState = false;
    /**
     * @var int
     */
@@ -650,5 +652,21 @@ class Order
        $this->cardId = $cardId;
    }
+    /**
+     * @return bool
+     */
+    public function isChangeState(): bool
+    {
+        return $this->isChangeState;
+    }
+    /**
+     * @param bool $isChangeState
+     */
+    public function setIsChangeState(bool $isChangeState): void
+    {
+        $this->isChangeState = $isChangeState;
+    }
 }
\ No newline at end of file
--- a/lib/cdz/order/save/OrderSaveRedis.php
+++ b/lib/cdz/order/save/OrderSaveRedis.php
@@ -45,8 +45,6 @@ class OrderSaveRedis
            }
        }
-        Log::debug('update', $update);
        $this->redis->hMset($this->order->getCacheKeyName(), $update);
        $this->redis->expire($this->order->getCacheKeyName(), 60 * 60 * 24);

--- a/lib/cdz/order/state/WaitingState.php
+++ b/lib/cdz/order/state/WaitingState.php
@@ -107,7 +107,11 @@ class WaitingState extends State
        $this->order->setStateCode(12);
        \Events::pipe();
        $orderSaveRedis = new OrderSaveRedis($this->order);
-        $orderSaveRedis->save(['stateCode', 'startTime', 'startCapacity']);
+        if ($this->order->isChangeState() === false) {
+            $orderSaveRedis->save(['stateCode', 'startTime', 'startCapacity']);
+        } else {
+            $orderSaveRedis->save(['stateCode', 'startTime']);
+        }
        //更新口子状态
        $port = new Port();
@@ -137,11 +141,12 @@ class WaitingState extends State
            'start_time' => date('Y-m-d H:i:s', $this->order->getStartTime()),
        ];
        //更新订单状态
-        if ($this->order->getStartCapacity() !== -2) {
+        $startCapacity = $this->order->getStartCapacity();
+        if ($startCapacity !== -2 && $startCapacity > 0) {
            $update['start_capacity'] = (int)$this->order->getStartCapacity();
        }
        $orderModel = new OrderModel();
+        Log::debug('update_order_state -> ' . $this->order->getId(), $update);
        $orderModel->update($update, 'id = ' . $this->order->getId());
@@ -168,7 +173,8 @@ class WaitingState extends State
        $orderModel = new OrderModel();
        $orderModel->update([
-            'is_charger' => StateCode::PORT_EXCEPTION,
+            'is_charger'     => StateCode::PORT_EXCEPTION,
+            'start_capacity' => $this->order->getStartCapacity(),
        ], 'id = ' . $this->order->getId());
        //添加订单异常
@@ -227,22 +233,25 @@ class WaitingState extends State
    public function toShedState()
    {
-        $this->order->setStateCode(-1);
+        $orderModel = new OrderModel();
-        $orderSave = new OrderSaveRedis($this->order);
+        Log::debug('waiting to shed ->start_capacity' . $this->order->getStartCapacity());
-        $orderSave->save(['stateCode']);
+        if ($this->order->getStartCapacity() >= 0) {
-        $orderSave->deleteHashKey(['startTime', 'startCapacity']);
+            $orderModel->update([
+                'start_capacity' => (int)$this->order->getStartCapacity(),
+            ], 'id = ' . $this->order->getId());
-        $orderModel = new OrderModel();
+        }
+        Log::debug('update shed start_capacity' . $this->order->getId());
-        Log::debug('waiting to shed' . $this->order->getStartCapacity());
+        $this->order->setStateCode(-1);
-        $orderModel->update([
+        $orderSave = new OrderSaveRedis($this->order);
-            'start_capacity' => (int)$this->order->getStartCapacity(),
-        ], 'id = ' . $this->order->getId());
+        $orderSave->save(['stateCode']);
+//        $orderSave->deleteHashKey(['startTime', 'startCapacity']);
-        Log::debug('update shed start_capacity' . $this->order->getId());
    }

--- a/lib/log/Log.php
+++ b/lib/log/Log.php
@@ -9,7 +9,6 @@
 namespace Lib\log;
-use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;

--- a/lib/station/gateway/port/Port.php
+++ b/lib/station/gateway/port/Port.php
@@ -73,6 +73,22 @@ class Port
    }
+    public function isPortBan()
+    {
+        if (isset($_SESSION['port_id_status'])) {
+            $portIdStatus = $_SESSION['port_id_status'];
+            if (isset($portIdStatus[$this->portId])) {
+                if ($portIdStatus[$this->portId] === 8) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
    /**
     * 更新端口状态
     * @param int $orderId
@@ -98,7 +114,7 @@ class Port
        $portModel = new DeviceModel();
        $portModel->update([
-            'state' => $this->state,
+            'state'      => $this->state,
            'updated_at' => date('Y-m-d H:i:s')
        ], 'id = ' . $this->portId);