From 7e2f3abca2f5bb83459f809b8e7195b361e0a372 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 12:00:30 +0800
Subject: [PATCH] ci:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index fd65fa6..627b26a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -1,6 +1,7 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.*;
import com.moral.api.mapper.HistorySecondUavMapper;
@@ -161,6 +162,7 @@
dateMap.put("startTime", slotStartDate);
dateMap.put("endTime", slotEndDate);
dateMap.put("batch", mKey);
+ dateMap.put("total",mValue.size());
timeSlots.add(dateMap);
});
});
@@ -348,4 +350,46 @@
}
}
+ @Override
+ public boolean UAVTest(BigDecimal lat, BigDecimal lon, String batch) {
+ List<HistorySecondUav> list = new ArrayList<>();
+
+ QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
+ wrapper.eq("batch", batch);
+ wrapper.select("value,mac,time,organization_id");
+ wrapper.orderByAsc("time");
+ List<HistorySecondUav> datas = historySecondUavMapper.selectList(wrapper);
+ Date time =DateUtils.addDays(datas.get(2).getTime(),0);
+ //String bat = "2023-08-08 14:42:20";
+ for(HistorySecondUav g : datas){
+ HistorySecondUav historySecondUav = new HistorySecondUav();
+ historySecondUav.setTime(DateUtils.addDays(g.getTime(),0));
+ historySecondUav.setMac(g.getMac());
+ historySecondUav.setBatch(time);
+ historySecondUav.setOrganizationId(g.getOrganizationId());
+ Map<String, Object> data = JSON.parseObject(g.getValue(), Map.class);
+ Map<String, Object> dataResult = new HashMap<>();
+ dataResult = data;
+ dataResult.put("flylat",Objects.isNull(data.get("flylat"))||data.get("flylat").toString().equals("0")?0d:Double.parseDouble(String.format("%.10f",Double.parseDouble(data.get("flylat").toString())+lat.doubleValue())));
+ dataResult.put("flylon",Objects.isNull(data.get("flylon"))||data.get("flylon").toString().equals("0")?0d:Double.parseDouble(String.format("%.10f",Double.parseDouble(data.get("flylon").toString())+lon.doubleValue())));
+ /*if(Objects.nonNull(data.get("a21026"))&& !data.get("a21026").toString().equals("0")){
+ Double a21026D = Double.parseDouble(data.get("a21026").toString());
+ if( a21026D>15){
+ a21026D = a21026D -10;
+ }
+ dataResult.put("a21026",Double.parseDouble(String.format("%.4f",a21026D)));
+ }
+ if(Objects.nonNull(data.get("a21004"))&& !data.get("a21004").toString().equals("0")){
+ Double a21024D = Double.parseDouble(data.get("a21004").toString());
+ if( a21024D>100){
+ a21024D = a21024D -100;
+ }
+ dataResult.put("a21004",Double.parseDouble(String.format("%.4f",a21024D)));
+ }*/
+ historySecondUav.setValue(JSONObject.toJSONString(dataResult));
+ list.add(historySecondUav);
+ }
+ this.saveBatch(list);
+ return true;
+ }
}
--
Gitblit v1.8.0