From d117d3af15dddc4f07baffa8b5bf6b727c05de7c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 15:48:14 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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 2d36dd7..0f2b128 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
@@ -27,6 +27,7 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
/**
* <p>
@@ -59,28 +60,27 @@
public List<Date> queryDate(Integer organizationId) {
//������������������
QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
+ //List<Integer> childrenId = new ArrayList<>();
+ List<Integer> children = organizationService.orgIdList(organizationId);
//���������������id
- List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
+ /*List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
List<Integer> childrenId = new ArrayList<>();
for (Organization child : children) {
childrenId.add(child.getId());
}
- childrenId.add(organizationId);
- queryWrapper.in("organization_id", childrenId);
+ childrenId.add(organizationId);*/
+ queryWrapper.in("organization_id", children);
//���������������������������180���
Date endDate = new Date();
Date startDate = DateUtils.addDays(endDate, -180);
queryWrapper.between("batch", startDate, endDate);
//������������������
- queryWrapper.select("DISTINCT batch");
+ queryWrapper.select("DISTINCT DATE_FORMAT(batch,'%Y-%m-%d') batch ");
queryWrapper.orderByDesc("batch");
//������������
List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
//������������Date������
- List<Date> result = new ArrayList<>();
- for (HistorySecondUav historySecondUav : historySecondUavs) {
- result.add(historySecondUav.getBatch());
- }
+ List<Date> result = historySecondUavs.stream().map(HistorySecondUav::getBatch).collect(Collectors.toList());
return result;
}
@@ -94,12 +94,9 @@
Date endDate = form.getEndDate();
QueryWrapper<HistorySecondUav> wrapper = new QueryWrapper<>();
//���������������id
- List<Organization> children = organizationService.getChildrenOrganizationsById(organizationId);
+ List<Integer> children = organizationService.orgIdList(organizationId);
List<Integer> childrenId = new ArrayList<>();
- for (Organization child : children) {
- childrenId.add(child.getId());
- }
- childrenId.add(organizationId);
+ childrenId.addAll(children);
childrenId.addAll(integerList);
wrapper.in("organization_id", childrenId);
//������������batch������������������������������������������������
@@ -413,13 +410,19 @@
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;
+
+ Double a34004 = Double.parseDouble(data.get("a34004").toString());
+ Double a34002 = Double.parseDouble(data.get("a34002").toString());
+ dataResult.put("a34002",Double.parseDouble(String.format("%.4f",a34004)));
+ dataResult.put("a34004",Double.parseDouble(String.format("%.4f",a34002)));
+
+ /* 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);
@@ -428,4 +431,14 @@
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