From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml | 1 +
screen-api/pom.xml | 2 +-
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 29 +++++++++++++++++++++++++++++
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java | 2 ++
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 6 ++++++
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 1 +
6 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/screen-api/pom.xml b/screen-api/pom.xml
index 76c0098..95b8190 100644
--- a/screen-api/pom.xml
+++ b/screen-api/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>4.0.1</version>
+ <version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
index 8763106..e5d19a1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UAVController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -138,4 +138,10 @@
return new ResultMessage();
}
+ @GetMapping("UAVUpdateTest")
+ public ResultMessage UAVUpdateTest( String batch){
+ historySecondUavService.UAVUpdateTest(batch);
+ return new ResultMessage();
+ }
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java b/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
index 7209030..a2053d6 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java
@@ -48,4 +48,6 @@
boolean UAVTest(BigDecimal lat, BigDecimal lon, String batch);
+
+ boolean UAVUpdateTest(String batch);
}
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 3853749..2d36dd7 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
@@ -399,4 +399,33 @@
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>10){
+ Integer digit = a21026D % 10;
+ 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;
+ }
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index b238e39..dfc648b 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -330,6 +330,7 @@
QueryWrapper<DeviceAdjustValue> wrapper1 = new QueryWrapper<>();
wrapper1.eq("mac",adjustForm.getMac());
wrapper1.eq ("sensor_code",adjustForm.getCode());
+ wrapper1.eq("is_delete",0);
Integer integer = deviceAdjustValueMapper.selectCount(wrapper1);
if (integer==0){
deviceAdjustValue.setValue(adjustForm.getAgehou());
diff --git a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
index 255ce4d..3bd431b 100644
--- a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
@@ -52,6 +52,7 @@
WHERE
de.monitor_point_id = #{id}
AND de.is_delete = 0
+ order by de.dev_num,de.id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0