明树Git Lab
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
L
letian_backend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zengfanpei
letian_backend
Commits
a90fdc1d
Commit
a90fdc1d
authored
Sep 11, 2024
by
zengfanpei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
9ff558d6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
3 deletions
+32
-3
README.md
README.md
+5
-0
statisticsController.js
controller/statisticsController.js
+27
-3
No files found.
README.md
View file @
a90fdc1d
...
...
@@ -20,6 +20,11 @@
1. 待完成excel导出 -- 这个要看前端做管理端菜单管理,需要知道在那个菜单 对应哪个表
2. 农业投入品表的增删改查 已完成
硬件入场:
1. 需要确认每一个设备的设备信息:名称、设备编号、设备类型
2. 需要确认每一个设备 对应的 每一个地块的位置信息
3. 需要确认每一个种类设备 上传的信息 接口调试
4.
```
...
...
controller/statisticsController.js
View file @
a90fdc1d
...
...
@@ -17,7 +17,15 @@ async function getSMCChangeTrend(req, res, next) {
};
if
((
req
.
body
.
startTime
&&
req
.
body
.
endTime
))
{
search
.
time
=
{
$gte
:
new
Date
(
req
.
body
.
startTime
),
$lte
:
new
Date
(
req
.
body
.
endTime
)
}
let
endTime
=
new
Date
(
req
.
body
.
endTime
);
endTime
.
setHours
(
23
);
endTime
.
setMinutes
(
59
);
endTime
.
setSeconds
(
59
);
let
startTime
=
new
Date
(
req
.
body
.
startTime
);
startTime
.
setHours
(
0
);
startTime
.
setMinutes
(
0
);
startTime
.
setSeconds
(
0
);
search
.
time
=
{
$gt
:
new
Date
(
req
.
body
.
startTime
),
$lte
:
endTime
}
}
if
(
req
.
body
.
land
)
{
let
devs
=
await
DB
.
Device
.
find
({
land
:
req
.
body
.
land
}).
lean
().
exec
();
...
...
@@ -65,7 +73,15 @@ async function getWSChangeTrend(req, res, next) {
};
if
((
req
.
body
.
startTime
&&
req
.
body
.
endTime
))
{
search
.
time
=
{
$gte
:
new
Date
(
req
.
body
.
startTime
),
$lte
:
new
Date
(
req
.
body
.
endTime
)
}
let
endTime
=
new
Date
(
req
.
body
.
endTime
);
endTime
.
setHours
(
23
);
endTime
.
setMinutes
(
59
);
endTime
.
setSeconds
(
59
);
let
startTime
=
new
Date
(
req
.
body
.
startTime
);
startTime
.
setHours
(
0
);
startTime
.
setMinutes
(
0
);
startTime
.
setSeconds
(
0
);
search
.
time
=
{
$gt
:
new
Date
(
req
.
body
.
startTime
),
$lte
:
endTime
}
}
let
aggr
=
[
{
...
...
@@ -102,7 +118,15 @@ async function getIPSChangeTrend(req, res, next) {
};
if
((
req
.
body
.
startTime
&&
req
.
body
.
endTime
))
{
search
.
time
=
{
$gte
:
new
Date
(
req
.
body
.
startTime
),
$lte
:
new
Date
(
req
.
body
.
endTime
)
}
let
endTime
=
new
Date
(
req
.
body
.
endTime
);
endTime
.
setHours
(
23
);
endTime
.
setMinutes
(
59
);
endTime
.
setSeconds
(
59
);
let
startTime
=
new
Date
(
req
.
body
.
startTime
);
startTime
.
setHours
(
0
);
startTime
.
setMinutes
(
0
);
startTime
.
setSeconds
(
0
);
search
.
time
=
{
$gt
:
new
Date
(
req
.
body
.
startTime
),
$lte
:
endTime
}
}
let
aggr
=
[
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment