lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 15:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善

Browse Source
This commit is contained in:
lihongjie0209
2024-05-23 22:33:49 +08:00
parent 967de38619
commit 98274cb969
1 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java
View File

@@ -4,7 +4,6 @@ import cn.lihongjie.coal.base.dto.CommonQuery;
import cn.lihongjie.coal.base.dto.IdRequest;
import cn.lihongjie.coal.base.service.BaseService;
import cn.lihongjie.coal.common.Ctx;
import cn.lihongjie.coal.common.FreeMakerUtils;
import cn.lihongjie.coal.common.JpaUtils;
import cn.lihongjie.coal.dataCollector.service.DataCollectorService;
import cn.lihongjie.coal.dataCollectorLog.service.DataCollectorLogService;
@@ -89,45 +88,17 @@ public class WeightDeviceDataService
@SneakyThrows
public List<Map> checkLocalData(CheckLocalDataRequest requst) {
TypedQuery<String> query =
List<WeightDeviceEntity> devices =
em.createQuery(
FreeMakerUtils.render(
"""
select distinct d.device.dataCollector.appKey
from WeightDeviceDataEntity d where 1=1
<#if start??>
and d.minTime >= :start
</#if>
<#if end??>
and d.minTime <= :end
</#if>
""",
requst),
String.class);
JpaUtils.setQueryParameter(query, requst);
var datas = query.getResultList();
" from WeightDeviceEntity d where d.organizationId = :organizationId",
WeightDeviceEntity.class)
.setParameter("organizationId", Ctx.currentUser().getOrganizationId())
.getResultList();
List<Map> result = new ArrayList<>();
for (var device : devices) {
for (var appKey : datas) {
WeightDeviceEntity device = weightDeviceService.getDeviceByAppKey(appKey);
var appKey = device.getDataCollector().getAppKey();
TypedQuery<Tuple> sysSum =
em.createQuery(
"""