Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
rx
Commits
4b86b646
Commit
4b86b646
authored
Aug 26, 2024
by
wujipeng
Browse files
查询七天内历史数据和当天历史数据
parent
b35c3bac
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
4b86b646
...
...
@@ -130,9 +130,14 @@
<version>
1.4.2
</version>
</dependency>
<!-- mongodb -->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-data-mongodb</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-mongodb
</artifactId>
<groupId>
com.ruzhoukj
</groupId>
<artifactId>
common-mongo
</artifactId>
<version>
1.0.0
</version>
</dependency>
</dependencies>
...
...
src/main/java/com/ruzhoukj/rx/controller/EquipmentController.java
View file @
4b86b646
...
...
@@ -2,6 +2,7 @@ package com.ruzhoukj.rx.controller;
import
com.ruzhoukj.rx.common.Result
;
import
com.ruzhoukj.rx.pojo.dto.EquipmentDTO
;
import
com.ruzhoukj.rx.pojo.vo.DeviceVO
;
import
com.ruzhoukj.rx.service.EquipmentService
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -37,9 +38,16 @@ public class EquipmentController {
return
Result
.
success
(
equipmentService
.
getDeviceInfoList
(
equipmentDTO
));
}
// @ApiOperation(value = "获取所有设备的最新一条数据")
// @PostMapping("/report/list")
// public Result getDeviceDataList() {
// return Result.success(equipmentService.getDeviceDataList());
// }
@ApiOperation
(
value
=
"根据设备id查询今天的信息"
)
@GetMapping
(
"/report/today/{deviceId}"
)
public
Result
getTodayByDeviceId
(
@PathVariable
String
deviceId
)
{
return
Result
.
success
(
equipmentService
.
getTodayByDeviceId
(
deviceId
));
}
@ApiOperation
(
value
=
"根据设备id查询今天的信息"
)
@PostMapping
(
"/report/former/page"
)
public
Result
getTodayByDeviceId
(
@RequestBody
EquipmentDTO
equipmentDTO
)
{
return
Result
.
success
(
equipmentService
.
getFormerByDeviceId
(
equipmentDTO
));
}
}
src/main/java/com/ruzhoukj/rx/dao/DeviceDao.java
View file @
4b86b646
...
...
@@ -5,6 +5,8 @@ import com.ruzhoukj.rx.pojo.vo.DeviceVO;
import
org.springframework.data.mongodb.repository.MongoRepository
;
import
org.springframework.stereotype.Component
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -15,5 +17,24 @@ public interface DeviceDao extends MongoRepository<DeviceEntity, String> {
DeviceVO
findTopByDeviceIdOrderByTimestampDesc
(
String
deviceId
);
// List<DeviceVO> findtopOrderByTimestampDescgroupByDeviceId();
/**
* 查询近七天内所有 deviceId 相同的数据
*
* @param deviceId 设备 ID
* @return List<DeviceVO>
*/
List
<
DeviceVO
>
findAllByDeviceIdAndTimestampGreaterThanEqualOrderByTimestamp
(
String
deviceId
,
Date
sevenDaysAgo
);
/**
* 查询今天内所有 deviceId 相同的数据
*
* @param deviceId 设备 ID
* @param start 今天开始的时间戳
* @param end 今天结束的时间戳
* @return List<DeviceVO>
*/
List
<
DeviceVO
>
findByDeviceIdAndTimestampBetweenOrderByTimestamp
(
String
deviceId
,
LocalDateTime
start
,
LocalDateTime
end
);
}
src/main/java/com/ruzhoukj/rx/pojo/dto/EquipmentDTO.java
View file @
4b86b646
package
com.ruzhoukj.rx.pojo.dto
;
import
com.ruzhoukj.rx.pojo.entity.EquipmentEntity
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
java.util.Date
;
/**
* @author wujipeng
* @version 1.0
...
...
@@ -17,4 +18,17 @@ public class EquipmentDTO extends EquipmentEntity {
@ApiModelProperty
(
value
=
"设备名称或路名"
)
private
String
name
;
@ApiModelProperty
(
value
=
"页码"
)
private
Integer
pageNum
=
1
;
@ApiModelProperty
(
value
=
"条数"
)
private
Integer
pageSize
=
10
;
@ApiModelProperty
(
value
=
"开始时间"
)
private
Date
startTime
;
@ApiModelProperty
(
value
=
"结束时间"
)
private
Date
endTime
;
}
src/main/java/com/ruzhoukj/rx/service/EquipmentService.java
View file @
4b86b646
...
...
@@ -2,6 +2,7 @@ package com.ruzhoukj.rx.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruzhoukj.rx.pojo.dto.EquipmentDTO
;
import
com.ruzhoukj.rx.pojo.entity.DeviceEntity
;
import
com.ruzhoukj.rx.pojo.entity.EquipmentEntity
;
import
com.ruzhoukj.rx.pojo.vo.DeviceVO
;
import
com.ruzhoukj.rx.pojo.vo.EquipmentVO
;
...
...
@@ -32,9 +33,18 @@ public interface EquipmentService extends IService<EquipmentEntity> {
*/
List
<
EquipmentVO
>
getDeviceInfoList
(
EquipmentDTO
equipmentDTO
);
// /**
// * 获取所有设备的最新一条数据
// * @return List<DeviceVO>
// */
// List<DeviceVO> getDeviceDataList();
/**
* 根据设备id查询今天的信息
*
* @return List<DeviceVO>
*/
List
<
DeviceVO
>
getTodayByDeviceId
(
String
deviceId
);
/**
* 根据设备id查询之前的信息
*
* @return List<DeviceVO>
*/
List
<
DeviceVO
>
getFormerByDeviceId
(
EquipmentDTO
equipmentDTO
);
}
src/main/java/com/ruzhoukj/rx/service/impl/EquipmentServiceImpl.java
View file @
4b86b646
package
com.ruzhoukj.rx.service.impl
;
import
ch.qos.logback.classic.spi.EventArgUtil
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruzhoukj.rx.common.NumberConstant
;
import
com.ruzhoukj.rx.dao.DeviceDao
;
...
...
@@ -13,6 +12,9 @@ import com.ruzhoukj.rx.service.EquipmentService;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
java.time.*
;
import
java.time.temporal.ChronoUnit
;
import
java.util.Date
;
import
java.util.List
;
/**
...
...
@@ -26,6 +28,7 @@ public class EquipmentServiceImpl
@Resource
DeviceDao
deviceDao
;
@Override
public
DeviceVO
getDeviceDataByDeviceId
(
String
deviceId
)
{
return
deviceDao
.
findTopByDeviceIdOrderByTimestampDesc
(
deviceId
);
...
...
@@ -35,7 +38,7 @@ public class EquipmentServiceImpl
public
EquipmentVO
getDeviceInfoByDeviceId
(
String
deviceId
)
{
EquipmentVO
equipmentVO
=
baseMapper
.
getDeviceInfoByDeviceId
(
deviceId
);
DeviceVO
deviceVO
=
deviceDao
.
findTopByDeviceIdOrderByTimestampDesc
(
deviceId
);
if
(
equipmentVO
!=
null
&&
deviceVO
!=
null
){
if
(
equipmentVO
!=
null
&&
deviceVO
!=
null
)
{
equipmentVO
.
setDeviceVO
(
deviceVO
);
}
return
equipmentVO
;
...
...
@@ -70,8 +73,23 @@ public class EquipmentServiceImpl
return
deviceInfoList
;
}
// @Override
// public List<DeviceVO> getDeviceDataList() {
// return deviceDao.findtopOrderByTimestampDescgroupByDeviceId();
// }
@Override
public
List
<
DeviceVO
>
getTodayByDeviceId
(
String
deviceId
)
{
// LocalDate today = LocalDate.now(ZoneId.systemDefault());
// LocalDateTime startOfDay = today.atStartOfDay();
// LocalDateTime endOfDay = today.plusDays(1).atStartOfDay().minusNanos(1);
// return deviceDao.findByDeviceIdAndTimestampBetween(deviceId, startOfDay, endOfDay);
LocalDate
today
=
LocalDate
.
now
(
ZoneId
.
systemDefault
());
LocalDateTime
startOfDay
=
today
.
atStartOfDay
().
plusHours
(
8
);
LocalDateTime
endOfDay
=
today
.
plusDays
(
1
).
atStartOfDay
().
plusHours
(
8
).
minusNanos
(
1
);
return
deviceDao
.
findByDeviceIdAndTimestampBetweenOrderByTimestamp
(
deviceId
,
startOfDay
,
endOfDay
);
}
@Override
public
List
<
DeviceVO
>
getFormerByDeviceId
(
EquipmentDTO
equipmentDTO
)
{
Date
sevenDaysAgo
=
Date
.
from
(
Instant
.
now
().
minus
(
7
,
ChronoUnit
.
DAYS
));
return
deviceDao
.
findAllByDeviceIdAndTimestampGreaterThanEqualOrderByTimestamp
(
equipmentDTO
.
getDeviceId
(),
sevenDaysAgo
);
}
}
src/main/java/com/ruzhoukj/rx/util/DateUtil.java
0 → 100644
View file @
4b86b646
This diff is collapsed.
Click to expand it.
src/main/resources/application.yml
View file @
4b86b646
...
...
@@ -39,4 +39,7 @@ jwt:
key
:
test
ttl
:
5400000
logging
:
level
:
org.springframework.data.mongodb.core.MongoTemplate
:
DEBUG
src/main/resources/com/ruzhoukj/rx/dao/DeviceDao.xml
View file @
4b86b646
...
...
@@ -2,7 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace=
"com.ruzhoukj.rx.dao.DeviceDao"
>
<select
id=
"findTopByDeviceIdOrderByTimestampDesc"
resultType=
"com.ruzhoukj.rx.pojo.vo.DeviceVO"
>
</select>
</mapper>
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