Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-api

catch/api/controller/Base.php

@@ -0,0 +1,39 @@
+<?php
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: wei
+ * @Date: 2022-06-09 14:39:53
+ * @LastEditors: wei
+ * @LastEditTime: 2022-06-09 15:43:08
+ */
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: wei
+ * @Date: 2022-06-09 14:39:53
+ * @LastEditors: wei
+ * @LastEditTime: 2022-06-09 15:35:57
+ */
+
+namespace catchAdmin\api\controller;
+use catchAdmin\permissions\model\Roles;
+use catchAdmin\permissions\model\Users as ModelUsers;
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use think\Db;
+
+class Base extends CatchController
+{ 
+  
+   public function __initialize()
+   {
+       var_dump('我测试一下');
+   }
+   
+   public function test()
+   {
+
+   }
+}

catch/api/controller/MaintenanceRecord.php

@@ -0,0 +1,32 @@
+<?php
+/*
+ * @Descripttion: 维保记录
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-06-09 16:27:35
+ * @LastEditors: likang
+ * @LastEditTime: 2022-06-09 16:38:19
+ */
+
+namespace catchAdmin\api\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+class MaintenanceRecord extends CatchController
+{
+    /**
+     * @Descripttion: 接收维保记录
+     * @name: likang
+     * @return {*}
+     */    
+    public function getMaintenanceRecord()
+    {
+        $data =  $_GET['data'];
+        
+
+    }
+
+
+    
+}

catch/api/controller/Tool.php

@@ -0,0 +1,57 @@
+<?php
+/*
+ * @Descripttion: 下发工具等相关信息
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-06-09 14:58:24
+ * @LastEditors: likang
+ * @LastEditTime: 2022-06-09 16:24:09
+ */
+
+namespace catchAdmin\api\controller;
+
+use catchAdmin\hydraulic\model\maintenancemapper;
+use catchAdmin\hydraulic\model\Wrench as ModelWrench;
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use PhpParser\Node\Expr\FuncCall;
+use Wrench;
+
+class Tool extends CatchController
+{
+    /**
+     * @Descripttion: 获取扳手列表
+     * @name: likang
+     * @return {*}
+     */    
+    public function getWrenchList()
+    {
+       $list =  ModelWrench::select();
+       return json_success('获取成功',$list);
+
+    }
+    /**
+     * @Descripttion: 获取工作位置列表
+     * @name: likang
+     * @return {*}
+     */    
+    public function getWorkLocal()
+    {
+        $list =  maintenancemapper::where('device_type',2)->select();
+        return json_success('获取成功',$list);
+    }
+    
+
+    public function getUserList(){
+     
+        if (!isset($_GET['imei']) ||  $_GET['imei']=='') {
+            json_fail('缺少设备IMEI号参数');
+        }
+        //检测imei号是否在数据库中
+
+
+        //请求成功返回数据
+       json_success('获取成功','');
+    }
+}

catch/api/controller/Users.php

@@ -1,34 +0,0 @@
-<?php
-/*
- * @Descripttion: 
- * @version: 
- * @Author: likang
- * @Date: 2022-06-09 13:50:20
- * @LastEditors: sueRimn
- * @LastEditTime: 2022-06-09 14:33:46
- */
-namespace catchAdmin\api\controller;
-
-use catchAdmin\permissions\controller\User;
-use catchAdmin\permissions\model\Roles;
-use catchAdmin\permissions\model\Users as ModelUsers;
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-use think\Db;
-
-class Users extends CatchController
-{ 
-    /**
-     * 获取所有用户信息
-     */
-    public function getAllUsers()
-    {   
-        
-        $users_id =  Roles::getUserIdByRoleIdentify('operator');
-        $ids =  implode(',',$users_id); 
-        $users = ModelUsers::where('id',$ids)->field("username,password")->select();
-
-    }
-
-}

catch/api/route.php

@@ -13,4 +13,5 @@
 $router->group(function () use ($router){
 	// api路由
 	$router->get('api/getUserList', '\catchAdmin\api\controller\Api@getUserList');
-});
+});
+$router->get('api/getUsers', '\catchAdmin\api\controller\Api@getUserList');

catch/email/controller/Email.php

@@ -4,8 +4,8 @@
  * @version: 1版本
  * @Author: 李康
  * @Date: 2022-06-07 10:16:15
- * @LastEditors: 李康
- * @LastEditTime: 2022-06-08 17:29:17
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2022-06-09 14:56:42
  */
 
 namespace catchAdmin\email\controller;
@@ -73,7 +73,7 @@ class Email extends CatchController
      */
     public function delete($id) : \think\Response
     {
-        return CatchResponse::success($this->emailModel->deleteBy($id));
+        return CatchResponse::success($this->emailModel->deleteBy($id,true));
     }
    
     /**