liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

Compare commits

base: liutk:212d35d29bbb37b2cbdeb4337b3179d35c337792
Branches Tags
liutk:main
liutk:develop
...
compare: liutk:dbfef0a79230fde2403bfed47e1bff64fcd7f902
Branches Tags
liutk:main
liutk:develop

2 Commits
212d35d29b ... dbfef0a792

Author SHA1 Message Date
vine_liutk dbfef0a792 取消自动喷雾写死时间 2023-09-07 17:13:00 +08:00
vine_liutk 4d4d02a2d7 调整 2023-09-07 17:12:19 +08:00
2 changed files with 71 additions and 50 deletions
Show Stats Expand all files Collapse all files

1
app/Console/Commands/MqttPenwuPlan.php
View File

@ -38,7 +38,6 @@ class MqttPenwuPlan extends Command
//获取所有喷雾监控点，对应的自动喷雾配置 //获取所有喷雾监控点，对应的自动喷雾配置
$deviceList = Device::where('type', Device::TYPE_ATOMIZING)->get(); $deviceList = Device::where('type', Device::TYPE_ATOMIZING)->get();
$time = now()->format('H:i');//获取当前时间（时，分） $time = now()->format('H:i');//获取当前时间（时，分）
$time = '01:00';
foreach($deviceList as $device){ foreach($deviceList as $device){
$_config = $device->extends ?? []; $_config = $device->extends ?? [];
if($_config && $_config['is_enable']){//判断该配置是否开启 if($_config && $_config['is_enable']){//判断该配置是否开启

120
app/Models/Region.php
View File

@ -77,71 +77,93 @@ class Region extends Model
], ],
]; ];
if($region?->monitorModes){ if($region?->monitorModes){
$tabHad = [];
foreach($region->monitorModes as $monitorMode){ foreach($region->monitorModes as $monitorMode){
switch($monitorMode->type) switch($monitorMode->type)
{ {
case MonitorMode::TYPE_MONITOR: case MonitorMode::TYPE_MONITOR:
$tabs[] = [//有监控设备才有 if(!in_array(MonitorMode::TYPE_MONITOR, $tabHad)){
'title' => '监控视频', $tabs[] = [//有监控设备才有
'value' => 'monitor', 'title' => '监控视频',
'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-monitor?region_id='.$region->id)), 'value' => 'monitor',
'unmountOnExit' => true,//每次切换tab都要销毁 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-monitor?region_id='.$region->id)),
'sort' => 1, 'unmountOnExit' => true,//每次切换tab都要销毁
]; 'sort' => 1,
];
$tabHad[] = MonitorMode::TYPE_MONITOR;
}
break; break;
case MonitorMode::TYPE_SOIL: case MonitorMode::TYPE_SOIL:
$tabs[] = [//有土壤设备才有 if(!in_array(MonitorMode::TYPE_SOIL, $tabHad)){
'title' => '土壤数据', $tabs[] = [//有土壤设备才有
'value' => 'soil', 'title' => '土壤数据',
'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-soil?region_id='.$region->id)), 'value' => 'soil',
'unmountOnExit' => true,//每次切换tab都要销毁 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-soil?region_id='.$region->id)),
'sort' => 2, 'unmountOnExit' => true,//每次切换tab都要销毁
]; 'sort' => 2,
];
$tabHad[] = MonitorMode::TYPE_SOIL;
}
break; break;
case MonitorMode::TYPE_WATER_QUALITY: case MonitorMode::TYPE_WATER_QUALITY:
$tabs[] = [//有水质设备才有 if(!in_array(MonitorMode::TYPE_WATER_QUALITY, $tabHad)){
'title' => '水质数据', $tabs[] = [//有水质设备才有
'value' => 'quality', 'title' => '水质数据',
'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-water?region_id='.$region->id)), 'value' => 'quality',
'unmountOnExit' => true,//每次切换tab都要销毁 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-water?region_id='.$region->id)),
'sort' => 3, 'unmountOnExit' => true,//每次切换tab都要销毁
]; 'sort' => 3,
];
$tabHad[] = MonitorMode::TYPE_WATER_QUALITY;
}
break; break;
case MonitorMode::TYPE_METEOROLOGICAL: case MonitorMode::TYPE_METEOROLOGICAL:
$tabs[] = [//有气象设备才有 if(!in_array(MonitorMode::TYPE_METEOROLOGICAL, $tabHad)){
'title' => '气象数据', $tabs[] = [//有气象设备才有
'value' => 'meteorological', 'title' => '气象数据',
'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-meteorological?region_id='.$region->id)), 'value' => 'meteorological',
'unmountOnExit' => true,//每次切换tab都要销毁 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-meteorological?region_id='.$region->id)),
'sort' => 4, 'unmountOnExit' => true,//每次切换tab都要销毁
]; 'sort' => 4,
];
$tabHad[] = MonitorMode::TYPE_METEOROLOGICAL;
}
break; break;
case MonitorMode::TYPE_AIR: case MonitorMode::TYPE_AIR:
$tabs[] = [//有通风设备才有 if(!in_array(MonitorMode::TYPE_AIR, $tabHad)){
'title' => '通风设备', $tabs[] = [//有通风设备才有
'value' => 'air', 'title' => '通风设备',
'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-air?region_id='.$region->id)), 'value' => 'air',
'unmountOnExit' => true,//每次切换tab都要销毁 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-air?region_id='.$region->id)),
'sort' => 5, 'unmountOnExit' => true,//每次切换tab都要销毁
]; 'sort' => 5,
];
$tabHad[] = MonitorMode::TYPE_AIR;
}
break; break;
case MonitorMode::TYPE_ATOMIZING: case MonitorMode::TYPE_ATOMIZING:
$tabs[] = [//有喷雾设备才有 if(!in_array(MonitorMode::TYPE_ATOMIZING, $tabHad)){
'title' => '喷雾设备', $tabs[] = [//有喷雾设备才有
'value' => 'atomizing', 'title' => '喷雾设备',
'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-atomizing?region_id='.$region->id)), 'value' => 'atomizing',
'unmountOnExit' => true,//每次切换tab都要销毁 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-atomizing?region_id='.$region->id)),
'sort' => 6, 'unmountOnExit' => true,//每次切换tab都要销毁
]; 'sort' => 6,
];
$tabHad[] = MonitorMode::TYPE_ATOMIZING;
}
break; break;
case MonitorMode::TYPE_INSECT: case MonitorMode::TYPE_INSECT:
$tabs[] = [ if(!in_array(MonitorMode::TYPE_INSECT, $tabHad)){
'title' => '虫情监测', $tabs[] = [
'value' => 'insect', 'title' => '虫情监测',
'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-insect?region_id='.$region->id)), 'value' => 'insect',
'unmountOnExit' => true,//每次切换tab都要销毁 'tab'=>\amisMake()->Service()->schemaApi(admin_url('custom-region-insect?region_id='.$region->id)),
'sort' => 6, 'unmountOnExit' => true,//每次切换tab都要销毁
]; 'sort' => 6,
];
$tabHad[] = MonitorMode::TYPE_INSECT;
}
break; break;
} }
continue; continue;