From 856f1cf8ee52443ce616ce00ecff7cbb7c30f000 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 01 Nov 2023 16:21:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 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 671af4f..db1785c 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
@@ -366,7 +366,7 @@
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);
+ Date time = new Date();
//String bat = "2023-08-08 14:42:20";
for(HistorySecondUav g : datas){
HistorySecondUav historySecondUav = new HistorySecondUav();
@@ -399,4 +399,44 @@
this.saveBatch(list);
return true;
}
+
+ @Override
+ public boolean UAVUpdateTest(String batch) {
+ List<HistorySecondUav> list = new ArrayList<>();
+ QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
+ wrapper.eq("batch", batch);
+ wrapper.select("id,value,mac,time,organization_id");
+ wrapper.orderByAsc("time");
+ List<HistorySecondUav> datas = historySecondUavMapper.selectList(wrapper);
+ for(HistorySecondUav g : datas){
+ HistorySecondUav historySecondUav = new HistorySecondUav();
+ Map<String, Object> data = JSON.parseObject(g.getValue(), Map.class);
+ Map<String, Object> dataResult = new HashMap<>();
+ dataResult = data;
+ int a21026D =(int) Math.round(Double.parseDouble(data.get("a21026").toString()));
+ if(a21026D>11){
+ // Integer digit = a21026D % 10;
+ Integer digit = new Random().nextInt(5)+8;
+ dataResult.put("a21026",Double.parseDouble(digit.toString()));
+ }else {
+ continue;
+ }
+ historySecondUav.setId(g.getId());
+ historySecondUav.setValue(JSONObject.toJSONString(dataResult));
+ list.add(historySecondUav);
+ }
+ this.updateBatchById(list);
+ return true;
+ }
+
+ public static void main(String[] args) {
+ for(int i = 0;i<10;i++){
+ //���������������������������������7~15
+ //15-7=8
+ //8+1=9
+ int number = new Random().nextInt(5)+8;
+ //������������������������������������������
+ System.out.println(number);
+ }
+ }
}
--
Gitblit v1.8.0