From 5489c2cc4d35970ca8fe4d30cf8ac374eef17ca4 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 31 八月 2024 18:02:39 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java index 2c81aa9..89cf4d0 100644 --- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java +++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java @@ -1,14 +1,21 @@ package com.ruoyi.integration.mongodb.service.impl; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData; import com.ruoyi.integration.iotda.constant.IotConstant; import com.ruoyi.integration.mongodb.service.UploadRealTimeMonitoringDataService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Set; @Service public class UploadRealTimeMonitoringDataServiceImpl implements UploadRealTimeMonitoringDataService { @@ -31,9 +38,39 @@ public List<UploadRealTimeMonitoringData> findAll() { return mongoTemplate.findAll(UploadRealTimeMonitoringData.class); } + + + /** + * 根据订单号查询监控数据 + * @param code + * @return + */ + @Override + public List<UploadRealTimeMonitoringData> getDataByOrderCode(String code) { + Query query = new Query(); + if(StringUtils.isNotEmpty(code)){ + query.addCriteria(Criteria.where("transaction_serial_number").is(code)); + } + List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = mongoTemplate.find( + query.with(Sort.by("create_time")) + , UploadRealTimeMonitoringData.class); + return uploadRealTimeMonitoringData; + } @Override - public R<UploadRealTimeMonitoringData> findByIdR(String id) { - return R.ok(mongoTemplate.findById(id, UploadRealTimeMonitoringData.class)); + public List<UploadRealTimeMonitoringData> getDataAll(Set<String> values, Integer page, Integer size) { + Query query = new Query(); + if (!values.isEmpty()){ + query.addCriteria(Criteria.where("transaction_serial_number").in(values)); + } + // 设置分页 + Pageable pageable = PageRequest.of(page, size); + query.with(pageable); + + List<UploadRealTimeMonitoringData> uploadRealTimeMonitoringData = mongoTemplate.find( + query.with(Sort.by("create_time")) + , UploadRealTimeMonitoringData.class); + return uploadRealTimeMonitoringData; } + } -- Gitblit v1.7.1