update
This commit is contained in:
parent
4536b2962b
commit
5f8d491f7d
@ -14,18 +14,33 @@
|
||||
1=>'5分钟',2=>'15分钟',3=>'30分钟',4=>'1小时',5=>'2小时',6=>'1天'
|
||||
};
|
||||
if(time() > strtotime($v['remind_time'])){
|
||||
Db::name('oa_message')->insert([
|
||||
'title' => '您有一条新的日程安排提醒',
|
||||
'template' => 0,
|
||||
'content' => '您的日程安排还有'.$date.'开始,请合理安排时间',
|
||||
'from_uid' => 0,
|
||||
'to_uid' => $v['admin_id'],
|
||||
'type' => 1,
|
||||
'send_time' => time(),
|
||||
'status' => 1,
|
||||
'is_draft' => 1,
|
||||
]);
|
||||
Db::startTrans();
|
||||
try {
|
||||
Db::name('oa_message')->insert([
|
||||
'title' => '您有一条新的日程安排提醒',
|
||||
'content' => '您的日程安排还有'.$date.'开始,请合理安排时间',
|
||||
'from_uid' => 0,
|
||||
'to_uid' => $v['admin_id'],
|
||||
'read_time' => 0,
|
||||
'create_time' => time(),
|
||||
'data_id' => $v['id'],
|
||||
'req_url' => '/adminapi/works.rcbg.oa_plan/detail'
|
||||
]);
|
||||
OaPlan::where('id',$v['id'])->update(['is_remind'=>1]);
|
||||
Db::commit();
|
||||
continue;
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
dump($e->getMessage());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
$message_count = Db::name('oa_message')->where([
|
||||
['to_uid','=',$this->adminId],
|
||||
['read_time','=',0],
|
||||
['delete_time','=',null],
|
||||
])->count();
|
||||
return $this->success('ok',['message_count'=>$message_count]);
|
||||
}
|
||||
}
|
107
app/adminapi/controller/works/OaMessageController.php
Normal file
107
app/adminapi/controller/works/OaMessageController.php
Normal file
@ -0,0 +1,107 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | likeadmin快速开发前后端分离管理后台(PHP版)
|
||||
// +----------------------------------------------------------------------
|
||||
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
|
||||
// | 开源版本可自由商用,可去除界面版权logo
|
||||
// | gitee下载:https://gitee.com/likeshop_gitee/likeadmin
|
||||
// | github下载:https://github.com/likeshop-github/likeadmin
|
||||
// | 访问官网:https://www.likeadmin.cn
|
||||
// | likeadmin团队 版权所有 拥有最终解释权
|
||||
// +----------------------------------------------------------------------
|
||||
// | author: likeadminTeam
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
|
||||
namespace app\adminapi\controller\works;
|
||||
|
||||
|
||||
use app\adminapi\controller\BaseAdminController;
|
||||
use app\adminapi\lists\works\OaMessageLists;
|
||||
use app\adminapi\logic\works\OaMessageLogic;
|
||||
use app\adminapi\validate\works\OaMessageValidate;
|
||||
|
||||
|
||||
/**
|
||||
* 系统消息控制器
|
||||
* Class OaMessageController
|
||||
* @package app\adminapi\controller\works
|
||||
*/
|
||||
class OaMessageController extends BaseAdminController
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取系统消息列表
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function lists()
|
||||
{
|
||||
return $this->dataLists(new OaMessageLists());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 添加系统消息
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
// public function add()
|
||||
// {
|
||||
// $params = (new OaMessageValidate())->post()->goCheck('add');
|
||||
// $result = OaMessageLogic::add($params);
|
||||
// if (true === $result) {
|
||||
// return $this->success('添加成功', [], 1, 1);
|
||||
// }
|
||||
// return $this->fail(OaMessageLogic::getError());
|
||||
// }
|
||||
|
||||
|
||||
/**
|
||||
* @notes 编辑系统消息
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
// public function edit()
|
||||
// {
|
||||
// $params = (new OaMessageValidate())->post()->goCheck('edit');
|
||||
// $result = OaMessageLogic::edit($params);
|
||||
// if (true === $result) {
|
||||
// return $this->success('编辑成功', [], 1, 1);
|
||||
// }
|
||||
// return $this->fail(OaMessageLogic::getError());
|
||||
// }
|
||||
|
||||
|
||||
/**
|
||||
* @notes 删除系统消息
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function delete()
|
||||
{
|
||||
$params = (new OaMessageValidate())->post()->goCheck('delete');
|
||||
OaMessageLogic::delete($params);
|
||||
return $this->success('删除成功', [], 1, 1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取系统消息详情
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function detail()
|
||||
{
|
||||
$params = (new OaMessageValidate())->goCheck('detail');
|
||||
$result = OaMessageLogic::detail($params);
|
||||
return $this->data($result);
|
||||
}
|
||||
|
||||
}
|
83
app/adminapi/lists/works/OaMessageLists.php
Normal file
83
app/adminapi/lists/works/OaMessageLists.php
Normal file
@ -0,0 +1,83 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | likeadmin快速开发前后端分离管理后台(PHP版)
|
||||
// +----------------------------------------------------------------------
|
||||
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
|
||||
// | 开源版本可自由商用,可去除界面版权logo
|
||||
// | gitee下载:https://gitee.com/likeshop_gitee/likeadmin
|
||||
// | github下载:https://github.com/likeshop-github/likeadmin
|
||||
// | 访问官网:https://www.likeadmin.cn
|
||||
// | likeadmin团队 版权所有 拥有最终解释权
|
||||
// +----------------------------------------------------------------------
|
||||
// | author: likeadminTeam
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\adminapi\lists\works;
|
||||
|
||||
|
||||
use app\adminapi\lists\BaseAdminDataLists;
|
||||
use app\common\model\works\OaMessage;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
|
||||
|
||||
/**
|
||||
* 系统消息列表
|
||||
* Class OaMessageLists
|
||||
* @package app\adminapi\listsworks
|
||||
*/
|
||||
class OaMessageLists extends BaseAdminDataLists implements ListsSearchInterface
|
||||
{
|
||||
private $where = [];
|
||||
|
||||
/**
|
||||
* @notes 设置搜索条件
|
||||
* @return \string[][]
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function setSearch(): array
|
||||
{
|
||||
return [
|
||||
'%like%' => ['title'],
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取系统消息列表
|
||||
* @return array
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\DbException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function lists(): array
|
||||
{
|
||||
$params = $this->request->get(['start_time','end_time']);
|
||||
if(!empty($params['start_time']) && !empty($params['end_time'])){
|
||||
$this->where[] = ['create_time','between',[strtotime($params['start_time']),strtotime($params['end_time'])]];
|
||||
}
|
||||
return OaMessage::where($this->searchWhere)->where($this->where)->where('to_uid',$this->adminId)
|
||||
->field(['id', 'title', 'content', 'read_time', 'create_time'])
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()->each(function($data){
|
||||
$data['is_read'] = empty($data['read_time']) ? '未读' : '已读';
|
||||
})
|
||||
->toArray();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取系统消息数量
|
||||
* @return int
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function count(): int
|
||||
{
|
||||
return OaMessage::where($this->searchWhere)->where($this->where)->where('to_uid',$this->adminId)->count();
|
||||
}
|
||||
|
||||
}
|
121
app/adminapi/logic/works/OaMessageLogic.php
Normal file
121
app/adminapi/logic/works/OaMessageLogic.php
Normal file
@ -0,0 +1,121 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | likeadmin快速开发前后端分离管理后台(PHP版)
|
||||
// +----------------------------------------------------------------------
|
||||
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
|
||||
// | 开源版本可自由商用,可去除界面版权logo
|
||||
// | gitee下载:https://gitee.com/likeshop_gitee/likeadmin
|
||||
// | github下载:https://github.com/likeshop-github/likeadmin
|
||||
// | 访问官网:https://www.likeadmin.cn
|
||||
// | likeadmin团队 版权所有 拥有最终解释权
|
||||
// +----------------------------------------------------------------------
|
||||
// | author: likeadminTeam
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\adminapi\logic\works;
|
||||
|
||||
|
||||
use app\common\model\auth\Admin;
|
||||
use app\common\model\works\OaMessage;
|
||||
use app\common\logic\BaseLogic;
|
||||
use think\facade\Db;
|
||||
|
||||
|
||||
/**
|
||||
* 系统消息逻辑
|
||||
* Class OaMessageLogic
|
||||
* @package app\adminapi\logic\works
|
||||
*/
|
||||
class OaMessageLogic extends BaseLogic
|
||||
{
|
||||
|
||||
|
||||
/**
|
||||
* @notes 添加系统消息
|
||||
* @param array $params
|
||||
* @return bool
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public static function add(array $params): bool
|
||||
{
|
||||
Db::startTrans();
|
||||
try {
|
||||
OaMessage::create([
|
||||
'title' => $params['title'],
|
||||
'content' => $params['content'],
|
||||
'from_uid' => $params['from_uid'],
|
||||
'to_uid' => $params['to_uid'],
|
||||
'read_time' => $params['read_time'],
|
||||
'create_time' => $params['create_time']
|
||||
]);
|
||||
|
||||
Db::commit();
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
self::setError($e->getMessage());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 编辑系统消息
|
||||
* @param array $params
|
||||
* @return bool
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public static function edit(array $params): bool
|
||||
{
|
||||
Db::startTrans();
|
||||
try {
|
||||
OaMessage::where('id', $params['id'])->update([
|
||||
'title' => $params['title'],
|
||||
'content' => $params['content'],
|
||||
'from_uid' => $params['from_uid'],
|
||||
'to_uid' => $params['to_uid'],
|
||||
'read_time' => $params['read_time'],
|
||||
'create_time' => $params['create_time']
|
||||
]);
|
||||
|
||||
Db::commit();
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
Db::rollback();
|
||||
self::setError($e->getMessage());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 删除系统消息
|
||||
* @param array $params
|
||||
* @return bool
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public static function delete(array $params): bool
|
||||
{
|
||||
return OaMessage::destroy($params['id']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取系统消息详情
|
||||
* @param $params
|
||||
* @return array
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public static function detail($params): array
|
||||
{
|
||||
$data = OaMessage::findOrEmpty($params['id']);
|
||||
$data['to_user_name'] = Admin::where('id',$data['to_uid'])->value('name');
|
||||
OaMessage::where('id',$params['id'])->update(['read_time'=>time()]);
|
||||
return $data->toArray();
|
||||
}
|
||||
|
||||
}
|
104
app/adminapi/validate/works/OaMessageValidate.php
Normal file
104
app/adminapi/validate/works/OaMessageValidate.php
Normal file
@ -0,0 +1,104 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | likeadmin快速开发前后端分离管理后台(PHP版)
|
||||
// +----------------------------------------------------------------------
|
||||
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
|
||||
// | 开源版本可自由商用,可去除界面版权logo
|
||||
// | gitee下载:https://gitee.com/likeshop_gitee/likeadmin
|
||||
// | github下载:https://github.com/likeshop-github/likeadmin
|
||||
// | 访问官网:https://www.likeadmin.cn
|
||||
// | likeadmin团队 版权所有 拥有最终解释权
|
||||
// +----------------------------------------------------------------------
|
||||
// | author: likeadminTeam
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\adminapi\validate\works;
|
||||
|
||||
|
||||
use app\common\validate\BaseValidate;
|
||||
|
||||
|
||||
/**
|
||||
* 系统消息验证器
|
||||
* Class OaMessageValidate
|
||||
* @package app\adminapi\validate\works
|
||||
*/
|
||||
class OaMessageValidate extends BaseValidate
|
||||
{
|
||||
|
||||
/**
|
||||
* 设置校验规则
|
||||
* @var string[]
|
||||
*/
|
||||
protected $rule = [
|
||||
'id' => 'require',
|
||||
'title' => 'require',
|
||||
'from_uid' => 'require',
|
||||
'to_uid' => 'require',
|
||||
'read_time' => 'require',
|
||||
'create_time' => 'require',
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
* 参数描述
|
||||
* @var string[]
|
||||
*/
|
||||
protected $field = [
|
||||
'id' => 'id',
|
||||
'title' => '消息主题',
|
||||
'from_uid' => '发送人id',
|
||||
'to_uid' => '接收人id',
|
||||
'read_time' => '阅读时间',
|
||||
'create_time' => '创建时间',
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
* @notes 添加场景
|
||||
* @return OaMessageValidate
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function sceneAdd()
|
||||
{
|
||||
return $this->only(['title','from_uid','to_uid','read_time','create_time']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 编辑场景
|
||||
* @return OaMessageValidate
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function sceneEdit()
|
||||
{
|
||||
return $this->only(['id','title','from_uid','to_uid','read_time','create_time']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 删除场景
|
||||
* @return OaMessageValidate
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function sceneDelete()
|
||||
{
|
||||
return $this->only(['id']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 详情场景
|
||||
* @return OaMessageValidate
|
||||
* @author likeadmin
|
||||
* @date 2024/05/29 14:04
|
||||
*/
|
||||
public function sceneDetail()
|
||||
{
|
||||
return $this->only(['id']);
|
||||
}
|
||||
|
||||
}
|
34
app/common/model/works/OaMessage.php
Normal file
34
app/common/model/works/OaMessage.php
Normal file
@ -0,0 +1,34 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | likeadmin快速开发前后端分离管理后台(PHP版)
|
||||
// +----------------------------------------------------------------------
|
||||
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
|
||||
// | 开源版本可自由商用,可去除界面版权logo
|
||||
// | gitee下载:https://gitee.com/likeshop_gitee/likeadmin
|
||||
// | github下载:https://github.com/likeshop-github/likeadmin
|
||||
// | 访问官网:https://www.likeadmin.cn
|
||||
// | likeadmin团队 版权所有 拥有最终解释权
|
||||
// +----------------------------------------------------------------------
|
||||
// | author: likeadminTeam
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\common\model\works;
|
||||
|
||||
|
||||
use app\common\model\BaseModel;
|
||||
use think\model\concern\SoftDelete;
|
||||
|
||||
|
||||
/**
|
||||
* 系统消息模型
|
||||
* Class OaMessage
|
||||
* @package app\common\model\works
|
||||
*/
|
||||
class OaMessage extends BaseModel
|
||||
{
|
||||
use SoftDelete;
|
||||
protected $name = 'oa_message';
|
||||
protected $deleteTime = 'delete_time';
|
||||
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user