潘浩文 / fupai1 · 提交

转到一个项目

作者 潘浩文
提交 97a9db60b7e0a202f322a5cdf7578a3bf74e335b 1 个父辈 9164fa87
1 个管道 的构建 通过 耗费 0 秒

后台设备模块开发

内嵌 并排对比
正在显示 1 个修改的文件 包含 51 行增加 和 47 行删除
... ... @@ -46,47 +46,49 @@ class AdminLightController extends AdminBaseController
//接收搜索参数
$param = $this->request->param();
//添加搜索条件
$where=[];
$where = [];
$keyword = empty($param['keyword']) ? '' : $param['keyword'];
if (!empty($keyword)) {
$where['l.number'] = ['like', "%$keyword%"];
}
$status=empty($param['status']) ? '' : $param['status'];
$status = empty($param['status']) ? '' : $param['status'];
if (!empty($status)) {
$where['l.status'] = $status;
}
$data = Db::name('light')
->alias('l')
->join('temple t','l.temple_id=t.id')
->join('temple_area ta','l.area_id=ta.id')
->join('temple t', 'l.temple_id=t.id')
->join('temple_area ta', 'l.area_id=ta.id')
->where($where)
->field('l.*,t.address,t.name as tname,ta.name as taname,ta.light')
->order('l.create_time','desc')
->order('l.create_time', 'desc')
->paginate('10');
//向地址传参
$data->appends($param);
$this->assign('page',$data->render());
$this->assign('page', $data->render());
$this->assign('keyword', isset($param['keyword']) ? $param['keyword'] : '');
$this->assign('status', isset($param['status']) ? $param['status'] : '');
$this->assign('list', $data);
return $this->fetch();
}
public function index2(){
$id=$this->request->param('id');
public function index2()
{
$id = $this->request->param('id');
$data = Db::name('light')
->alias('l')
->join('temple t','l.temple_id=t.id')
->join('temple_area ta','l.area_id=ta.id')
->where('l.temple_id',$id)
->join('temple t', 'l.temple_id=t.id')
->join('temple_area ta', 'l.area_id=ta.id')
->where('l.temple_id', $id)
->field('l.*,t.address,t.name as tname,ta.name as taname,ta.light')
->order('l.create_time','desc')
->order('l.create_time', 'desc')
->paginate('10');
$this->assign('page',$data->render());
$this->assign('list',$data);
$this->assign('page', $data->render());
$this->assign('list', $data);
return $this->fetch();
}
/**
* 添加设备
* @adminMenu(
... ... @@ -102,48 +104,49 @@ class AdminLightController extends AdminBaseController
*/
public function add()
{
$address=Db::name('temple')->field('address')->distinct('true')->select();
$this->assign('address',$address);
$address = Db::name('temple')->field('address')->distinct('true')->select();
$this->assign('address', $address);
return $this->fetch();
}
//获取寺庙
public function getTemple(){
$address=$this->request->param('address');
$temple=Db::name('temple')->where('address',$address)->select()->toJson();
public function getTemple()
{
$address = $this->request->param('address');
$temple = Db::name('temple')->where('address', $address)->select()->toJson();
return $temple;
}
//获取寺庙下级区域
public function getTempleArea(){
$id=$this->request->param('id');
$temple=Db::name('temple_area')->where('temple_id',$id)->select()->toJson();
public function getTempleArea()
{
$id = $this->request->param('id');
$temple = Db::name('temple_area')->where('temple_id', $id)->select()->toJson();
return $temple;
}
//获取区域下所有位置
public function getLocation(){
$id=$this->request->param('id');
$data=Db::name('temple_area')->where('id',$id)->find();
$arr=[];
for ($r=1;$r<=$data['rows'];$r++){
for ($c=1;$c<=$data['columns'];$c++){
array_push($arr,"$r".','."$c");
public function getLocation()
{
$id = $this->request->param('id');
$data = Db::name('temple_area')->where('id', $id)->find();
$arr = [];
for ($r = 1; $r <= $data['rows']; $r++) {
for ($c = 1; $c <= $data['columns']; $c++) {
array_push($arr, "$r" . ',' . "$c");
}
}
print_r($arr);
$is_set=Db::name('light')->where('area_id',$id)->field('row,column')->select()->toArray();
foreach ($is_set as $k=>$v){
array_push($re,"$v[row]".','."$v[column]");
}
$is_set = Db::name('light')->where('area_id', $id)->field('row,column')->select()->toArray();
$re = [];
foreach ($is_set as $k => $v) {
array_push($re, "$v[row]" . ',' . "$v[column]");
}
print_r($is_set);
}
/**
* 添加设备提交
* @adminMenu(
... ... @@ -187,17 +190,18 @@ class AdminLightController extends AdminBaseController
$id = $this->request->param('id');
$data = Db::name('light')
->alias('l')
->join('temple t','t.id=l.temple_id')
->join('temple t', 't.id=l.temple_id')
->where('l.id', $id)
->field('l.*,t.name as tname,t.id as tid')
->find();
$temple=Db::name('temple')->select();
$this->assign('temple',$temple);
$area=Db::name('temple_area')->where('temple_id',$data['temple_id'])->select();
$this->assign('area',$area);
$temple = Db::name('temple')->select();
$this->assign('temple', $temple);
$area = Db::name('temple_area')->where('temple_id', $data['temple_id'])->select();
$this->assign('area', $area);
$this->assign('list', $data);
return $this->fetch();
}
/**
* 编辑设备提交
* @adminMenu(
... ... @@ -236,12 +240,12 @@ class AdminLightController extends AdminBaseController
public function delete()
{
$id = $this->request->param('id');
$re=Db::name('light_order')
$re = Db::name('light_order')
->alias('lo')
->join('light l','lo.light_id=l.id')
->where(['l.id'=>$id,'lo.end_time'=>['>',time()]])
->join('light l', 'lo.light_id=l.id')
->where(['l.id' => $id, 'lo.end_time' => ['>', time()]])
->find();
if ($re){
if ($re) {
$this->error('该设备有进行中的订单，不允许删除');
}
Db::name('light')->where('id', $id)->delete();
... ...