From 211807a00b62b4792b7664884e867215a2ddfa40 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Fri, 25 Oct 2024 18:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96ip=E5=9C=B0=E5=9D=80=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/model/Task.php    | 13 +++++++++++++
 app/api/controller/Ip.php   | 34 ++++++++++++++++++++++++++++++++++
 app/api/controller/User.php |  4 +++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 app/admin/model/Task.php
 create mode 100644 app/api/controller/Ip.php

diff --git a/app/admin/model/Task.php b/app/admin/model/Task.php
new file mode 100644
index 0000000..f790190
--- /dev/null
+++ b/app/admin/model/Task.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace app\admin\model;
+
+use app\common\model\TimeModel;
+
+class Task extends TimeModel
+{
+
+    protected $deleteTime = 'delete_time';
+
+    protected $defaultSoftDelete = '0';
+}
diff --git a/app/api/controller/Ip.php b/app/api/controller/Ip.php
new file mode 100644
index 0000000..1fa9813
--- /dev/null
+++ b/app/api/controller/Ip.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace app\api\controller;
+
+use app\admin\model\Ip as IpModel;
+use think\response\Json;
+
+class Ip extends ApiController
+{
+
+    public function getList(): Json
+    {
+        if (!$this->request->isPost()) {
+            return $this->renderError('不支持GET请求');
+        }
+        $data  = $this->postData();
+        $page  = isset($data['page']) && !empty($data['page']) ? $data['page'] : 1;
+        $limit = isset($data['limit']) && !empty($data['limit']) ? $data['limit'] : 20;
+
+        $IpModel = new IpModel();
+        $where   = ['status' => 1];
+        $list    = $IpModel->withoutField('update_time, delete_time, create_time, status')
+                           ->where($where)
+                           ->order('id desc')
+                           ->page($page, $limit)
+                           ->select()
+                           ->each(function ($item) {
+                               $item['expire_time'] = $item['expire_time'] ? date('Y-m-d H:i:s', $item['expire_time']) : '-';
+                               return $item;
+                           });
+        return $this->renderSuccess($list->toArray());
+    }
+
+}
diff --git a/app/api/controller/User.php b/app/api/controller/User.php
index e4d852e..9679917 100644
--- a/app/api/controller/User.php
+++ b/app/api/controller/User.php
@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\admin\model\Task;
 use app\admin\model\User as UserModel;
 use app\api\middleware\LcJWTAuth;
 use think\response\Json;
@@ -26,7 +27,8 @@ class User extends ApiController
         if ($row['gender']) {
             $row['gender'] = $model->genderArr[$row['gender']] ?? '';
         }
+        $row['task_count'] = Task::where([['assign_uid' , '=',  $row['uid']], ['status' ,'in', [1,2]]])->count();
         return $this->renderSuccess($row->toArray());
     }
 
-}
\ No newline at end of file
+}