Commit 4b86b646 authored by wujipeng's avatar wujipeng
Browse files

查询七天内历史数据和当天历史数据

parent b35c3bac
...@@ -130,9 +130,14 @@ ...@@ -130,9 +130,14 @@
<version>1.4.2</version> <version>1.4.2</version>
</dependency> </dependency>
<!-- mongodb --> <!-- mongodb -->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-data-mongodb</artifactId>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>com.ruzhoukj</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId> <artifactId>common-mongo</artifactId>
<version>1.0.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -2,6 +2,7 @@ package com.ruzhoukj.rx.controller; ...@@ -2,6 +2,7 @@ package com.ruzhoukj.rx.controller;
import com.ruzhoukj.rx.common.Result; import com.ruzhoukj.rx.common.Result;
import com.ruzhoukj.rx.pojo.dto.EquipmentDTO; import com.ruzhoukj.rx.pojo.dto.EquipmentDTO;
import com.ruzhoukj.rx.pojo.vo.DeviceVO;
import com.ruzhoukj.rx.service.EquipmentService; import com.ruzhoukj.rx.service.EquipmentService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -37,9 +38,16 @@ public class EquipmentController { ...@@ -37,9 +38,16 @@ public class EquipmentController {
return Result.success(equipmentService.getDeviceInfoList(equipmentDTO)); return Result.success(equipmentService.getDeviceInfoList(equipmentDTO));
} }
// @ApiOperation(value = "获取所有设备的最新一条数据")
// @PostMapping("/report/list") @ApiOperation(value = "根据设备id查询今天的信息")
// public Result getDeviceDataList() { @GetMapping("/report/today/{deviceId}")
// return Result.success(equipmentService.getDeviceDataList()); 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));
}
} }
...@@ -5,6 +5,8 @@ import com.ruzhoukj.rx.pojo.vo.DeviceVO; ...@@ -5,6 +5,8 @@ import com.ruzhoukj.rx.pojo.vo.DeviceVO;
import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -15,5 +17,24 @@ public interface DeviceDao extends MongoRepository<DeviceEntity, String> { ...@@ -15,5 +17,24 @@ public interface DeviceDao extends MongoRepository<DeviceEntity, String> {
DeviceVO findTopByDeviceIdOrderByTimestampDesc(String deviceId); 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);
} }
package com.ruzhoukj.rx.pojo.dto; package com.ruzhoukj.rx.pojo.dto;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity; import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
/** /**
* @author wujipeng * @author wujipeng
* @version 1.0 * @version 1.0
...@@ -17,4 +18,17 @@ public class EquipmentDTO extends EquipmentEntity { ...@@ -17,4 +18,17 @@ public class EquipmentDTO extends EquipmentEntity {
@ApiModelProperty(value = "设备名称或路名") @ApiModelProperty(value = "设备名称或路名")
private String name; 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;
} }
...@@ -2,6 +2,7 @@ package com.ruzhoukj.rx.service; ...@@ -2,6 +2,7 @@ package com.ruzhoukj.rx.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.rx.pojo.dto.EquipmentDTO; 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.entity.EquipmentEntity;
import com.ruzhoukj.rx.pojo.vo.DeviceVO; import com.ruzhoukj.rx.pojo.vo.DeviceVO;
import com.ruzhoukj.rx.pojo.vo.EquipmentVO; import com.ruzhoukj.rx.pojo.vo.EquipmentVO;
...@@ -32,9 +33,18 @@ public interface EquipmentService extends IService<EquipmentEntity> { ...@@ -32,9 +33,18 @@ public interface EquipmentService extends IService<EquipmentEntity> {
*/ */
List<EquipmentVO> getDeviceInfoList(EquipmentDTO equipmentDTO); List<EquipmentVO> getDeviceInfoList(EquipmentDTO equipmentDTO);
// /** /**
// * 获取所有设备的最新一条数据 * 根据设备id查询今天的信息
// * @return List<DeviceVO> *
// */ * @return List<DeviceVO>
// List<DeviceVO> getDeviceDataList(); */
List<DeviceVO> getTodayByDeviceId(String deviceId);
/**
* 根据设备id查询之前的信息
*
* @return List<DeviceVO>
*/
List<DeviceVO> getFormerByDeviceId(EquipmentDTO equipmentDTO);
} }
package com.ruzhoukj.rx.service.impl; package com.ruzhoukj.rx.service.impl;
import ch.qos.logback.classic.spi.EventArgUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.rx.common.NumberConstant; import com.ruzhoukj.rx.common.NumberConstant;
import com.ruzhoukj.rx.dao.DeviceDao; import com.ruzhoukj.rx.dao.DeviceDao;
...@@ -13,6 +12,9 @@ import com.ruzhoukj.rx.service.EquipmentService; ...@@ -13,6 +12,9 @@ import com.ruzhoukj.rx.service.EquipmentService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.*;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -26,6 +28,7 @@ public class EquipmentServiceImpl ...@@ -26,6 +28,7 @@ public class EquipmentServiceImpl
@Resource @Resource
DeviceDao deviceDao; DeviceDao deviceDao;
@Override @Override
public DeviceVO getDeviceDataByDeviceId(String deviceId) { public DeviceVO getDeviceDataByDeviceId(String deviceId) {
return deviceDao.findTopByDeviceIdOrderByTimestampDesc(deviceId); return deviceDao.findTopByDeviceIdOrderByTimestampDesc(deviceId);
...@@ -35,7 +38,7 @@ public class EquipmentServiceImpl ...@@ -35,7 +38,7 @@ public class EquipmentServiceImpl
public EquipmentVO getDeviceInfoByDeviceId(String deviceId) { public EquipmentVO getDeviceInfoByDeviceId(String deviceId) {
EquipmentVO equipmentVO = baseMapper.getDeviceInfoByDeviceId(deviceId); EquipmentVO equipmentVO = baseMapper.getDeviceInfoByDeviceId(deviceId);
DeviceVO deviceVO = deviceDao.findTopByDeviceIdOrderByTimestampDesc(deviceId); DeviceVO deviceVO = deviceDao.findTopByDeviceIdOrderByTimestampDesc(deviceId);
if(equipmentVO != null && deviceVO != null){ if (equipmentVO != null && deviceVO != null) {
equipmentVO.setDeviceVO(deviceVO); equipmentVO.setDeviceVO(deviceVO);
} }
return equipmentVO; return equipmentVO;
...@@ -70,8 +73,23 @@ public class EquipmentServiceImpl ...@@ -70,8 +73,23 @@ public class EquipmentServiceImpl
return deviceInfoList; return deviceInfoList;
} }
// @Override @Override
// public List<DeviceVO> getDeviceDataList() { public List<DeviceVO> getTodayByDeviceId(String deviceId) {
// return deviceDao.findtopOrderByTimestampDescgroupByDeviceId(); // 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);
}
} }
This diff is collapsed.
...@@ -39,4 +39,7 @@ jwt: ...@@ -39,4 +39,7 @@ jwt:
key: test key: test
ttl: 5400000 ttl: 5400000
logging:
level:
org.springframework.data.mongodb.core.MongoTemplate: DEBUG
...@@ -2,7 +2,4 @@ ...@@ -2,7 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!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"> <mapper namespace="com.ruzhoukj.rx.dao.DeviceDao">
<select id="findTopByDeviceIdOrderByTimestampDesc" resultType="com.ruzhoukj.rx.pojo.vo.DeviceVO">
</select>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment