Skip to content

C
cdz_gateway
Commit 19488bd7 by BANice
Options

测试前

parent 3e0246fa
Showing with 83 additions and 111 deletions
.idea/workspace.xml
......@@ -5,47 +5,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="00edf348-0453-4317-8d2b-bf5eb8ea4b7a" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/Application/Controller/SettingController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Model/ConfigModel.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Model/ExceptionModel.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Model/OrderExceptionModel.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Model/StationModel.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerFinishMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerRefundMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/MessageData.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/PortShedMessage.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/api/message/Push.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/log/DeviceLog.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/state/StateCode.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Lib/wx/User.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/cdzGateway.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/cdzGateway.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/AccessController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/AccessController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/CertifyController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/CertifyController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/HeartController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/HeartController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/PortController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PortController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Controller/PowerController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Controller/PowerController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Events.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Events.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Middleware/AuthMiddleware.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Middleware/AuthMiddleware.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Model.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Model.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/Gateway.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Gateway.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/Log.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Log.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/Response.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/Response.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/port/Port.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/port/Port.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Lib/redis/RedisKey.php" beforeDir="false" afterPath="$PROJECT_DIR$/Lib/redis/RedisKey.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Route/Api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Route/Api.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/start.php" beforeDir="false" afterPath="$PROJECT_DIR$/start.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/ClassLoader.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_psr4.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_real.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_real.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/autoload_static.php" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/autoload_static.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/composer/installed.json" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/composer/installed.json" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -77,7 +39,7 @@
<file leaf-file-name="Events.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<state relative-caret-position="276">
<caret line="193" lean-forward="true" selection-start-line="193" selection-end-line="193" />
<folding>
<element signature="e#94#106#0#PHP" expanded="true" />
......@@ -86,40 +48,40 @@
</provider>
</entry>
</file>
<file leaf-file-name="Controller.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller.php">
<file leaf-file-name="PortModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Model/PortModel.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="PortController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2265">
<caret line="161" column="20" selection-start-line="161" selection-start-column="20" selection-end-line="161" selection-end-column="20" />
<state relative-caret-position="726">
<caret line="218" column="90" lean-forward="true" selection-start-line="218" selection-start-column="90" selection-end-line="218" selection-end-column="90" />
<folding>
<element signature="e#119#131#0#PHP" expanded="true" />
<element signature="e#131#158#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DeviceLog.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Lib/log/DeviceLog.php">
<file leaf-file-name="Api.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Route/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
<state relative-caret-position="285">
<caret line="27" column="52" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" />
<folding>
<element signature="e#113#155#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PortModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Model/PortModel.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="PortController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<file leaf-file-name="Bintohex.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="431">
<caret line="233" column="48" selection-start-line="233" selection-start-column="48" selection-end-line="233" selection-end-column="48" />
<folding>
<element signature="e#131#158#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="-385">
<caret line="8" selection-start-line="8" selection-end-line="8" />
</state>
</provider>
</entry>
......@@ -227,7 +189,6 @@
<option value="$PROJECT_DIR$/Application/Model.php" />
<option value="$PROJECT_DIR$/Lib/Log.php" />
<option value="$PROJECT_DIR$/Lib/port/Port.php" />
<option value="$PROJECT_DIR$/Route/Api.php" />
<option value="$PROJECT_DIR$/Application/Controller.php" />
<option value="$PROJECT_DIR$/Application/Model/ConfigModel.php" />
<option value="$PROJECT_DIR$/Lib/api/message/ChargerStartMessage.php" />
......@@ -248,6 +209,7 @@
<option value="$PROJECT_DIR$/Application/Controller/AccessController.php" />
<option value="$PROJECT_DIR$/Application/Events.php" />
<option value="$PROJECT_DIR$/Application/Controller/PortController.php" />
<option value="$PROJECT_DIR$/Route/Api.php" />
</list>
</option>
</component>
......@@ -339,6 +301,11 @@
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="Route" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
</path>
<path>
......@@ -352,15 +319,15 @@
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="gateway-worker" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="cdz_gateway" type="b2602c69:ProjectViewProjectNode" />
<item name="cdz_gateway" type="462c0819:PsiDirectoryNode" />
<item name="vendor" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="gateway-worker" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="workerman" type="462c0819:PsiDirectoryNode" />
<item name="Protocols" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -419,12 +386,12 @@
<workItem from="1528162550658" duration="19510000" />
<workItem from="1528264483144" duration="56097000" />
<workItem from="1529386475275" duration="15536000" />
<workItem from="1530073528657" duration="3797000" />
<workItem from="1530073528657" duration="5482000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="269110000" />
<option name="totallyTimeSpent" value="270795000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -445,7 +412,7 @@
<window_info anchor="bottom" id="File Transfer" order="8" weight="0.32870865" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.3197556" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.3191035" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.9242262" visible="true" weight="0.23883067" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
......@@ -567,13 +534,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-340">
<caret line="8" selection-start-line="8" selection-end-line="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Lib/api/message/ChargerExceedMessage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
......@@ -605,16 +565,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Route/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="29" column="66" selection-start-line="29" selection-start-column="66" selection-end-line="29" selection-end-column="66" />
<folding>
<element signature="e#113#155#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/SettingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
......@@ -797,6 +747,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="193" lean-forward="true" selection-start-line="193" selection-end-line="193" />
<folding>
<element signature="e#94#106#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PowerController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-867">
......@@ -807,26 +767,33 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Events.php">
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="193" lean-forward="true" selection-start-line="193" selection-end-line="193" />
<state relative-caret-position="726">
<caret line="218" column="90" lean-forward="true" selection-start-line="218" selection-start-column="90" selection-end-line="218" selection-end-column="90" />
<folding>
<element signature="e#94#106#0#PHP" expanded="true" />
<element signature="e#131#158#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Controller/PortController.php">
<entry file="file://$PROJECT_DIR$/Route/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="431">
<caret line="233" column="48" selection-start-line="233" selection-start-column="48" selection-end-line="233" selection-end-column="48" />
<state relative-caret-position="285">
<caret line="27" column="52" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" />
<folding>
<element signature="e#131#158#0#PHP" expanded="true" />
<element signature="e#113#155#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/workerman/workerman/Protocols/Bintohex.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-385">
<caret line="8" selection-start-line="8" selection-end-line="8" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
Application/Controller/PortController.php
......@@ -128,11 +128,10 @@ class PortController extends Controller
}
foreach ($offlinePortId as $portId)
{
foreach ($offlinePortId as $portId) {
$exceptionModel = new ExceptionModel();
$exceptionModel->insertRow(['message' => '口子离线','port_id' => $portId,'type' => 1,'created_at' => date('Y-m-d H:i:s'),'station_id' => $_SESSION['station_id']]);
$exceptionModel->insertRow(['message' => '口子离线', 'port_id' => $portId, 'type' => 1, 'created_at' => date('Y-m-d H:i:s'), 'station_id' => $_SESSION['station_id']]);
unset($exceptionModel);
......@@ -201,7 +200,7 @@ class PortController extends Controller
$userId = $port->getPortUsingId(\Events::getRedis(), $portId);
$orderId = $port->getPortUsingOrderId(\Events::getRedis(),$portId);
$orderId = $port->getPortUsingOrderId(\Events::getRedis(), $portId);
//服务器下发充电命令给下位机并将口子状态设置为-1，如果口子未插上下位机返回14，这种情况下口子依然被视为等待充电不改变状态，保持-1，但需要推送消息
......@@ -232,11 +231,18 @@ class PortController extends Controller
$exceptionModel = new ExceptionModel();
//fixme 为满足将订单充电的异常写入exception表中
if($state === StateCode::PORT_EXCEPTION || $state === StateCode::PORT_SHED) {
if ($state === StateCode::PORT_EXCEPTION || $state === StateCode::PORT_SHED) {
$message = [StateCode::PORT_EXCEPTION => '功率超限', StateCode::PORT_SHED => '插口脱落'];
try {
$message = [StateCode::PORT_EXCEPTION => '功率超限',StateCode::PORT_SHED => '插口脱落'];
$exceptionModel->insertRow(['type' => 2, 'message' => '订单号:' . $orderId . "($message[$state])", 'created_at' => date('Y-m-d H:i:s'), 'station_id' => $_SESSION['station_id'], 'gateway_id' => $_SESSION['gateway_id']]);
} catch (\Exception $exception) {
Log::error($exception->getMessage());
}
$exceptionModel->insertRow(['type' => 2, 'message' => '订单号:'.$orderId."($message[$state])", 'created_at' => date('Y-m-d H:i:s')]);
}
if ($state !== StateCode::PORT_CHARGER) {
......@@ -256,16 +262,14 @@ class PortController extends Controller
switch ($state) {
case StateCode::PORT_CHARGER:
if($lastState ==14 )
{
if ($lastState == 14) {
$orderModel = new OrderModel();
$result = $orderModel->getColumns(['port_name','station_name','created_at','charger_time','order_amount'],'id = '.$orderId);
$result = $orderModel->getColumns(['port_name', 'station_name', 'created_at', 'charger_time', 'order_amount'], 'id = ' . $orderId);
if(count($result) !== 0)
{
if (count($result) !== 0) {
try {
......@@ -282,19 +286,17 @@ class PortController extends Controller
$push = new Push();
$push->push($chargerStartMessage, $userId);
}catch (\Exception $exception)
{
} catch (\Exception $exception) {
Log::error($exception->getMessage());
}
}else{
} else {
Log::error('订单插头断开后开始充电未找到订单',['order_id' => $orderId]);
Log::error('订单插头断开后开始充电未找到订单', ['order_id' => $orderId]);
}
}
break;
......@@ -355,7 +357,7 @@ class PortController extends Controller
$exceptionModel = new ExceptionModel();
$exceptionModel->insertRow(['type' => 1,'message' => '口子离线','port_id' => $portId,'created_at' => date('Y-m-d H:i:s'),'station_id' => $_SESSION['station_id']]);
$exceptionModel->insertRow(['type' => 1, 'message' => '口子离线', 'port_id' => $portId, 'created_at' => date('Y-m-d H:i:s'), 'station_id' => $_SESSION['station_id']]);
$port->offline([$portId]);
......
Application/Events.php
......@@ -216,6 +216,7 @@ class Events
$gatewayId = $_SESSION['gateway_id'];
$insert = ['message' => '网关离线', 'gateway_id' => $gatewayId, 'type' => 1,'created_at' => date('Y-m-d H:i:s')];
if(isset($_SESSION['station_id']))
......
Route/Api.php
......@@ -21,7 +21,9 @@ class Api
public static function boot()
{
static::add('00','HeartController@heart',[new AuthMiddleware(),new HasMacMiddleware()]);
// static::add('00','HeartController@heart',[new AuthMiddleware(),new HasMacMiddleware()]);
static::add('00','HeartController@heart');
static::add('01','CertifyController@certify');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment