From 559d6e06ca8cedb3225edd5be06526bc5945f630 Mon Sep 17 00:00:00 2001 From: tk Date: Mon, 8 Jul 2024 20:09:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?= =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AB=99=E7=82=B9=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=AB=99=E7=82=B9=20=E4=BF=AE=E6=94=B9=20=E3=80=90=E6=8F=8F=09?= =?UTF-8?q?=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AB=99=E7=82=B9=E9=BB=98=E8=AE=A4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0runing=E9=BB=98=E8=AE=A4=E5=80=BC=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=A6=82=E6=9E=9C=E6=9C=89=E9=A3=9E=E6=9C=BA?= =?UTF-8?q?=E5=9C=A8=E6=89=A7=E8=A1=8C=E4=BA=BA=E8=B0=81=E5=88=99=E6=89=93?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E9=A1=BA=E5=88=A9=E7=9A=84=E8=AF=9D=E8=B7=9F?= =?UTF-8?q?=E4=B9=9F=E6=9B=B4=E6=96=B0runing=E5=AD=97=E6=AE=B5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=20=09[?= =?UTF-8?q?=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09=E6=9D=9F?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # 类型 包含: # feat：新功能（feature） # fix：修补bug # docs：文档（documentation） # style： 格式（不影响代码运行的变动） # refactor：重构（即不是新增功能，也不是修改bug的代码变动） # test：增加测试 # chore：构建过程或辅助工具的变动 --- .../MpApi/Controller/PlaneController.class.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/FlyCube/MpApi/Controller/PlaneController.class.php b/FlyCube/MpApi/Controller/PlaneController.class.php index d186f77..4865c17 100644 --- a/FlyCube/MpApi/Controller/PlaneController.class.php +++ b/FlyCube/MpApi/Controller/PlaneController.class.php @@ -197,6 +197,7 @@ class PlaneController extends PublicController $data['sitename'] = $_REQUEST['sitename']; if ($_REQUEST['bindroute']) { $data['bind_route'] = $_REQUEST['bindroute']; + $data['runing'] = str_replace([' ', '\t', '\n', '\r', '\0', '\x0B'], ',', $_REQUEST['bindroute']); //初始化runing字段 } else { $data['bind_route'] = null; } @@ -250,6 +251,7 @@ class PlaneController extends PublicController $data['sitename'] = $_REQUEST['sitename']; if ($_REQUEST['bindroute']) { $data['bind_route'] = $_REQUEST['bindroute']; + $data['runing'] = str_replace([' ', '\t', '\n', '\r', '\0', '\x0B'], ',', $_REQUEST['bindroute']); //初始化runing字段 } else { $data['bind_route'] = null; } @@ -261,6 +263,20 @@ class PlaneController extends PublicController $id = $_REQUEST['id']; $where['id'] = $id; $where['shop_id'] = $_REQUEST['shop_id']; + //检查当前站点是否有飞机正在执行任务 有则打断 不进行更新 + $field = array('runing'); + $tempCheck = $rsDb->where($where)->field($field)->find(); + if (!empty($tempCheck['runing'])) { + // 将 runing 字段的字符串按逗号分割成数组 + $runingArray = explode(',', $tempCheck['runing']); + // 去除空元素和空格 + $runingArray = array_map('trim', array_filter($runingArray)); + // 检查数组是否有值 + if (!empty($runingArray)) { + exit(json_encode(array('status' => 0, 'msg' => '此站点有飞机正在执行任务。待任务结束后再试！'))); + } + } + // 更新站点 if ($rsDb->where($where)->save($data) || $_REQUEST['size']) { //创建二维码 if ($token = $this->getAccessToken()) {