Commit 0fa9cdfd authored by zhoujun's avatar zhoujun

bug

parent 6041d9b4
Pipeline #2065 passed with stage
in 0 seconds
......@@ -97,6 +97,10 @@ class WarnController extends BaseController
public function getPeopleDel(Request $request)
{
$postData = $request->all();
$validate = Validator::make($postData, [
'id' => 'required|numeric'
]);
if ($validate->fails()) return $this->getErrorMsg('1001', config('msg.common.1001'));
try {
$data = $this->warnService->getPeopleDel($postData);
return $this->getSuccessMsg($data);
......@@ -105,5 +109,108 @@ class WarnController extends BaseController
}
}
/**
* 设置预警人状态
* @return array
* @date 2021/07/31
* @author live
*/
public function getPeopleSetStatus(Request $request)
{
$postData = $request->all();
$validate = Validator::make($postData, [
'id' => 'required|numeric',
'status' => 'required|numeric'
]);
if ($validate->fails()) return $this->getErrorMsg('1001', config('msg.common.1001'));
try {
$data = $this->warnService->getPeopleSetStatus($postData);
return $this->getSuccessMsg($data);
} catch (Exception $e) {
return $this->getErrorMsg($e->getCode(), $e->getMessage());
}
}
/**
* 新增预警配置
* @return array
* @date 2021/07/31
* @author live
*/
public function getConfigAdd(Request $request)
{
$postData = $request->all();
$validate = Validator::make($postData, [
'platform' => 'required|numeric',
'channel' => 'required|numeric',
'type' => 'required|numeric',
'oneWithdrawal' => 'required|numeric',
'dayWithdrawal' => 'required|numeric',
'userDayWithdrawal' => 'required|numeric'
]);
if ($validate->fails()) return $this->getErrorMsg('1001', config('msg.common.1001'));
try {
$data = $this->warnService->getConfigAdd($postData);
return $this->getSuccessMsg($data);
} catch (Exception $e) {
return $this->getErrorMsg($e->getCode(), $e->getMessage());
}
}
/**
* 预警配置列表
* @return array
* @date 2021/07/31
* @author live
*/
public function getConfigList()
{
}
/**
* 预警配置编辑
* @return array
* @date 2021/07/31
* @author live
*/
public function getConfigEdit()
{
}
/**
* 删除预警配置
* @return array
* @date 2021/07/31
* @author live
*/
public function getConfigDel()
{
}
/**
* 设置预警配置状态
* @return array
* @date 2021/07/31
* @author live
*/
public function getConfigSetStatus()
{
}
/**
* 批量设置预警状态
* @return array
* @date 2021/07/31
* @author live
*/
public function getConfigSetAllStatus()
{
}
}
\ No newline at end of file
<?php
namespace App\Models;
use App\Models\BaseModel;
use Illuminate\Database\Eloquent\SoftDeletes;
class WarnConfigModel extends BaseModel
{
use SoftDeletes;
protected $connection = 'mysql';
protected $table = 'club_warn_config';
}
......@@ -55,7 +55,7 @@ class UserService implements IUserService{
$users = AdminModel::when($key != '', function ($query) use ($key) {
return $query->where('name', 'like',$key.'%')->orWhere('real_name', 'like',$key.'%');
})->select('id','name','real_name','phone','email','created_at')->orderBy('id','DESC')->paginate($pagePerNum, ['*'], 'currentPage',$currentPage);
})->select('id','name','real_name','phone','email','status','created_at')->orderBy('id','DESC')->paginate($pagePerNum, ['*'], 'currentPage',$currentPage);
$array['totalNum'] = $users->total();
$array['totalPage'] = $users->lastPage();
foreach($users as $user){
......@@ -64,6 +64,7 @@ class UserService implements IUserService{
$tem['realName'] = $user->real_name;
$tem['phone'] = $user->phone;
$tem['email'] = $user->email;
$tem['status'] = $user->status;
$tem['created_at'] = Carbon::parse($user->created_at)->format('Y-m-d H:i:s');
$array['data'][] = $tem;
}
......
......@@ -10,4 +10,8 @@ interface IWarnService
public function getPeopleEdit($postData);//预警人编辑
public function getPeopleDel($postData); //预警人删除
public function getPeopleSetStatus($postData);//设置预警人状态
public function getConfigAdd($postData);//预警配置添加
}
\ No newline at end of file
......@@ -7,6 +7,7 @@ use Exception;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use App\Models\WarnPeopleModel;
use App\Models\WarnConfigModel;
use Illuminate\Support\Facades\Cache;
class WarnService implements IWarnService
......@@ -147,9 +148,16 @@ class WarnService implements IWarnService
if($list->status == $postData['status']) throw new Exception(config('msg.common.1009'), 1009);
$list->status = $postData['status'];
$list->addTime = $this->time;
$list->op_user = $postData['user'] ?? '';
$list->updated_at = $this->time;
if ($list->save()) return true;
throw new Exception(config('msg.common.1003'), 1003);
}
public function getConfigAdd($postData)
{
}
}
\ No newline at end of file
......@@ -106,7 +106,7 @@ class WhiteService implements IWhiteService
if($list->status == $postData['status']) throw new Exception(config('msg.common.1009'), 1009);
$list->status = $postData['status'];
$list->addTime = $this->time;
$list->add_time = $this->time;
if ($list->save()) return true;
throw new Exception(config('msg.common.1003'), 1003);
}
......
......@@ -43,6 +43,14 @@ Route::group(['namespace' => 'Api','middleware' => ['user.login']], function ()
Route::post('/people/list','WarnController@getPeopleList');//预警人列表
Route::post('/people/edit','WarnController@getPeopleEdit');//编辑预警人
Route::post('/people/del','WarnController@getPeopleDel');//删除预警人
Route::post('/people/set/status','WarnController@getPeopleSetStatus');//设置预警人状态
Route::post('/config/add','WarnController@getConfigAdd');//新增预警配置
Route::post('/config/list','WarnController@getConfigList');//预警配置列表
Route::post('/config/edit','WarnController@getConfigEdit');//编辑预警配置
Route::post('/config/del','WarnController@getConfigDel');//删除预警配置
Route::post('/config/set/status','WarnController@getConfigSetStatus');//设置预警配置状态
Route::post('/config/set/all/status','WarnController@getConfigSetAllStatus');//批量设置预警配置状态
});
Route::group(['prefix' => 'account'],function() {
......
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