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

Compare commits

base: liutk:6a50ba85dc622d9a3ae9876a5e8f10159d5f72b9
Branches Tags
liutk:main
liutk:develop
..
compare: liutk:a405f7cf33864c7de1bdf3e1f6fdb1c4ae1c99e4
Branches Tags
liutk:main
liutk:develop

No commits in common. "6a50ba85dc622d9a3ae9876a5e8f10159d5f72b9" and "a405f7cf33864c7de1bdf3e1f6fdb1c4ae1c99e4" have entirely different histories.
6a50ba85dc ... a405f7cf33

2 changed files with 1 additions and 10 deletions
Show Stats Expand all files Collapse all files

5
app/Http/Controllers/Api/MonitorModeController.php
View File

@ -64,10 +64,7 @@ class MonitorModeController extends Controller
} }
} }
break; break;
case MonitorMode::TYPE_INSECT://虫情设备 case MonitorMode::TYPE_INSECT://虫情设备-todo
$startTime = now()->subDays(7)->startOfDay()->format('Y-m-d H:i:s');
$endTime = now()->subDays(1)->endOfDay()->format('Y-m-d H:i:s');
$data = (new DeviceService())->getMonitorModeDeviceData($monitor, $startTime, $endTime);
break; break;
default: default:
break; break;

6
app/Services/Admin/DeviceService.php
View File

@ -259,12 +259,6 @@ class DeviceService extends BaseService
$fieldNameMap = MonitorMode::fieldMap(MonitorMode::TYPE_SOIL); $fieldNameMap = MonitorMode::fieldMap(MonitorMode::TYPE_SOIL);
$fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_SOIL); $fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_SOIL);
break; break;
case MonitorMode::TYPE_INSECT:
$dayliyReportQuery = FarmWormReport::query();
$reportQuery = FarmWormReport::query();
$fieldNameMap = MonitorMode::fieldMap(MonitorMode::TYPE_INSECT);
$fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_INSECT);
break;
} }
$monitorMode->load('devices'); $monitorMode->load('devices');
$fieldMap = []; $fieldMap = [];