From 83e42707519f5e2d886618ea55c30e8c3ab381ac Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 09 Aug 2023 09:13:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml | 13
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java | 43 +
screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java | 46 +
screen-api/src/main/java/com/moral/api/service/DustldService.java | 4
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java | 4
screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java | 6
screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java | 1
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java | 12
screen-manage/src/main/java/com/moral/api/pojo/dto/adjust/AdjustDTO.java | 13
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 49 +
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java | 25
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml | 7
screen-api/src/main/java/com/moral/api/service/UAVService.java | 13
screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 6
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 47 +
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 434 ---------------
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java | 93 +++
screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java | 6
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 1
screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java | 3
screen-manage/src/main/java/com/moral/api/pojo/form/adjust/AdjustForm.java | 30 +
screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java | 78 +-
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 5
screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml | 10
screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java | 23
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVGetBD.java | 24
screen-api/src/main/java/com/moral/api/service/impl/UAVServiceImpl.java | 509 +++++++++++++++++++
27 files changed, 1,017 insertions(+), 488 deletions(-)
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 9d9582b..2323049 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
@@ -3,9 +3,12 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.moral.api.entity.HistorySecondUav;
import com.moral.api.mapper.HistorySecondUavMapper;
+import com.moral.api.pojo.dto.uav.UAVGetBD;
import com.moral.api.pojo.dto.uav.UAVGteForDTO;
import com.moral.api.pojo.dto.uav.UAVQueryTimeSlotDTO;
import com.moral.api.pojo.dto.uav.UAVResultDTO;
@@ -15,13 +18,17 @@
import com.moral.api.pojo.vo.uav.UAVQueryTimeSlotVO;
import com.moral.api.pojo.vo.uav.UAVQueryTimeSlotVOs;
import com.moral.api.service.HistorySecondUavService;
+import com.moral.api.service.UAVService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.DateUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -29,6 +36,7 @@
import java.awt.geom.Point2D;
import java.text.DecimalFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @ClassName UAVController
@@ -48,6 +56,8 @@
HistorySecondUavService historySecondUavService;
@Autowired
HistorySecondUavMapper historySecondUavMapper;
+ @Autowired
+ UAVService uavService;
/**
* @Description: ������������������������������������������
@@ -68,184 +78,17 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
}
- @RequestMapping("test")
- public ResultMessage test(){
- //������
- ArrayList<Double> flyLatList = new ArrayList<>();
- //������
- ArrayList<Double> flyLonList = new ArrayList<>();
- HashMap<String, Object> map = new HashMap<>();
- String mac ="p5dnd7a0243592";
- String time1 ="2023-05-14 10:40:00";
- String time2 ="2023-05-14 11:10:00";
- map.put("mac",mac);
- map.put("time1",time1);
- map.put("time2",time2);
-// List<UAVResultDTO> uavResultDTOS = historySecondUavMapper.reList(map);
- QueryWrapper<HistorySecondUav> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("value");
- queryWrapper.eq("mac",mac);
- queryWrapper.between("time",time1,time2);
- List<HistorySecondUav> historySecondUavs = historySecondUavMapper.selectList(queryWrapper);
- for (HistorySecondUav historySecondUav : historySecondUavs) {
- String value = historySecondUav.getValue();
- Map map1 = JSON.parseObject(value, Map.class);
- flyLatList.add(Double.parseDouble(map1.get("flylat").toString()));
- flyLonList.add(Double.parseDouble(map1.get("flylon").toString()));
-
+ @PostMapping("getUav")
+ public ResultMessage test(@RequestBody Map<String, Object> params){
+ //������������������������
+ if (!params.containsKey("mac") || !params.containsKey("batch") || !params.containsKey("height1")|| !params.containsKey("uvasize")|| !params.containsKey("height2")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Double maxLat = Collections.max(flyLatList);
- Double maxLon = Collections.max(flyLonList);
- Double minLat = Collections.min(flyLatList);
- Double minLon = Collections.min(flyLonList);
-
- //������������������
- String leftTop = minLat +";"+ maxLon;
- //������
- String rightTop = maxLat +";"+ maxLon;
- //������
- String leftBottom = minLat +";" + minLon;
- //������
- String rightBottom = maxLat +";" + minLon;
- //���������������������
- double distance1 = getDistance(maxLon, minLat, maxLon, maxLat);
- //���������������������
- double distance2 = getDistance(maxLon, minLat, minLon, minLat);
- ArrayList<UAVGteForDTO> list = new ArrayList<>();
- //������������
-
- String [] lefts =new String[]{maxLon.toString(),minLat.toString()};
- //������2
- String[] youshang = calLocationByDistanceAndLocationAndDirection(90, minLon, maxLat, 50);
- //������2
- String[] youxia = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(youshang[0]), Double.parseDouble(youshang[1]), 50);
- //������2
- String[] zuoxia = calLocationByDistanceAndLocationAndDirection(180, minLon, maxLat, 50);
-
- for (int i = 0; i <distance1 ; i+=60) {
- UAVGteForDTO dto1 = new UAVGteForDTO();
- String[] strings2 = calLocationByDistanceAndLocationAndDirection(90, minLon, maxLat, i);
- String[] strings3 = calLocationByDistanceAndLocationAndDirection(90, Double.parseDouble(youshang[0].toString()), Double.parseDouble(youshang[1].toString()), i);
- String[] strings4 = calLocationByDistanceAndLocationAndDirection(90, Double.parseDouble(youxia[0].toString()), Double.parseDouble(youxia[1].toString()), i);
- String[] strings5 = calLocationByDistanceAndLocationAndDirection(90, Double.parseDouble(zuoxia[0].toString()), Double.parseDouble(zuoxia[1].toString()), i);
- dto1.setLeftTop(strings2);
- dto1.setRightTop(strings3);
- dto1.setRightBottom(strings4);
- dto1.setLeftBottom(strings5);
- list.add(dto1);
- for (int j = 0; j < distance2; j+=60) {
- UAVGteForDTO dto2 = new UAVGteForDTO();
- String[] strings6 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings2[0].toString()), Double.parseDouble(strings2[1].toString()), j);
- String[] strings7 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings3[0].toString()), Double.parseDouble(strings3[1].toString()), j);
- String[] strings8 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings4[0].toString()), Double.parseDouble(strings4[1].toString()), j);
- String[] strings9 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings5[0].toString()), Double.parseDouble(strings5[1].toString()), j);
- dto2.setLeftTop(strings6);
- dto2.setRightTop(strings7);
- dto2.setRightBottom(strings8);
- dto2.setLeftBottom(strings9);
- if (j!=0){
- list.add(dto2);
- }
- }
+ List<UAVResultDTO> uavResultDTOS = uavService.getUav(params);
+ if (ObjectUtils.isEmpty(uavResultDTOS)){
+ return new ResultMessage(ResponseCodeEnum.SENSOR_IS_NOT_EXIST,"null");
}
- ArrayList<UAVResultDTO> uavResultDTOS1 = new ArrayList<>();
- for (UAVGteForDTO uavGteForDTO : list) {
- ArrayList<String[]> doubleArrayList = new ArrayList<>();
- doubleArrayList.add(uavGteForDTO.getLeftTop());
- doubleArrayList.add(uavGteForDTO.getLeftBottom());
- doubleArrayList.add(uavGteForDTO.getRightTop());
- doubleArrayList.add(uavGteForDTO.getRightBottom());
- UAVResultDTO result = getResult(doubleArrayList);
- uavResultDTOS1.add(result);
- }
- if (uavResultDTOS1!=null){
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),uavResultDTOS1);
-
- }
-
-// ArrayList<List<String>> lists = new ArrayList<>();
- HashMap<String,List<String>> rsMap = new HashMap<>();
-// HashMap<String,List<Map<String,Object>>> rsMap1 = new HashMap<>();
- for (UAVGteForDTO uavGteForDTO : list) {
- ArrayList<String> list1 = new ArrayList<>();
- ArrayList<String[]> doubleArrayList = new ArrayList<>();
- doubleArrayList.add(uavGteForDTO.getLeftTop());
- doubleArrayList.add(uavGteForDTO.getLeftBottom());
- doubleArrayList.add(uavGteForDTO.getRightTop());
- doubleArrayList.add(uavGteForDTO.getRightBottom());
- //������������������
- for (HistorySecondUav historySecondUav : historySecondUavs) {
- String value = historySecondUav.getValue();
- Map map1 = JSON.parseObject(value, Map.class);
- String flylat = map1.get("flylat").toString();
- String flylon = map1.get("flylon").toString();
- //���������������������������
- boolean flag = isInPolygon(flylon,flylat,doubleArrayList);
- if (flag){
-
- list1.add(historySecondUav.getValue());
- }
- }
-// lists.add(list1);
-// String result = getResult(doubleArrayList);
-// rsMap.put(result,list1);
- }
-
-
- ArrayList<UAVResultDTO> uavResultDTOS = new ArrayList<>();
- Set<String> strings = rsMap.keySet();
- for (String string : strings) {
- UAVResultDTO dto = new UAVResultDTO();
- List<String> list1 = rsMap.get(string);
- ArrayList<Double> TVOCArrayList = new ArrayList<>();
- ArrayList<Double> PM10ArrayList = new ArrayList<>();
- ArrayList<Double> PM25ArrayList = new ArrayList<>();
- ArrayList<Double> SOArrayList = new ArrayList<>();
- ArrayList<Double> NOArrayList = new ArrayList<>();
- ArrayList<Double> QYArrayList = new ArrayList<>();
- ArrayList<Double> COArrayList = new ArrayList<>();
- ArrayList<Double> WDArrayList = new ArrayList<>();
- ArrayList<Double> SHArrayList = new ArrayList<>();
- for (String s : list1) {
- JSONObject jsonObject = JSON.parseObject(s);
- //tvoc
- String a99054 = jsonObject.get("a99054").toString();
- //pm2.5
- String a34004 = jsonObject.get("a34004").toString();
- //������������
- String a21026 = jsonObject.get("a21026").toString();
- ///������������
- String a21004 = jsonObject.get("a21004").toString();
-// //������
-// String a01006 = jsonObject.get("a01006").toString();
-// if (a01006!=null){
-// QYArrayList.add(Double.parseDouble(a01006));
-// }
- //pm10
- String a34002 = jsonObject.get("a34002").toString();
- //co
- String a21005 = jsonObject.get("a21005").toString();
- //������
-// String a01002 = jsonObject.get("a01002").toString();
- //������
-// String a01001 = jsonObject.get("a01001").toString();
- TVOCArrayList.add(Double.parseDouble(a99054));
- PM10ArrayList.add(Double.parseDouble(a34002));
- PM25ArrayList.add(Double.parseDouble(a34004));
- SOArrayList.add(Double.parseDouble(a21026));
- NOArrayList.add(Double.parseDouble(a21004));
- COArrayList.add(Double.parseDouble(a21005));
-
-// WDArrayList.add(Double.parseDouble(a01001));
-// SHArrayList.add(Double.parseDouble(a01002));
- }
-
- double asDouble = COArrayList.stream().mapToInt(Double::intValue).average().getAsDouble();
-
- }
-
-
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),null);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),uavResultDTOS);
}
@@ -282,246 +125,15 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������
List<UAVQueryTimeSlotDTO> dtos = historySecondUavService.queryTimeSlot(form);
+ if (ObjectUtils.isEmpty(dtos)){
+ return new ResultMessage(ResponseCodeEnum.TARGET_IS_NULL,null);
+ }
//������vo���
UAVQueryTimeSlotVOs vo = UAVQueryTimeSlotVOs.convert(dtos);
+
//������������
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
}
- private static final double EARTH_RADIUS = 6378137;
-
- private static final double R = 6371e3;
- /** 180�� **/
- private static final DecimalFormat df = new DecimalFormat("0.00000000");
-
- /**
- * ���������������������������������������������������������������������������
- * @param angle ���������������������������������������������
- * @param startLong ���������������
- * @param startLat ���������������
- * @param distance ���������������m
- * @return
- */
- public static String[] calLocationByDistanceAndLocationAndDirection(double angle, double startLong,double startLat, double distance){
- String[] result = new String[2];
- //���������������������������������������
- double �� = distance/R;
- // ���������radian���������������������������
- angle = Math.toRadians(angle);
- startLong = Math.toRadians(startLong);
- startLat = Math.toRadians(startLat);
- double lat = Math.asin(Math.sin(startLat)*Math.cos(��)+Math.cos(startLat)*Math.sin(��)*Math.cos(angle));
- double lon = startLong + Math.atan2(Math.sin(angle)*Math.sin(��)*Math.cos(startLat),Math.cos(��)-Math.sin(startLat)*Math.sin(lat));
- // ���������������10���������������
- lon = Math.toDegrees(lon);
- lat = Math.toDegrees(lat);
- result[0] = df.format(lon);
- result[1] = df.format(lat);
- return result;
- }
-
- /**
- * ������������������������������������������
- *
- * @param longitude1 ���������������������
- * @param latitude1 ���������������������
- * @param longitude2 ���������������������
- * @param latitude2 ���������������������
- * @return ������������ ���������
- */
- public static double getDistance(double longitude1, double latitude1, double longitude2, double latitude2) {
- // ������
- double lat1 = Math.toRadians(latitude1);
- double lat2 = Math.toRadians(latitude2);
- // ������
- double lng1 = Math.toRadians(longitude1);
- double lng2 = Math.toRadians(longitude2);
- // ������������
- double a = lat1 - lat2;
- // ������������
- double b = lng1 - lng2;
- // ���������������������������
- double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
- Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
- // ���������������������, ������������: ���
- s = s * EARTH_RADIUS;
- return s;
- }
-
-
- public static UAVResultDTO getResult(ArrayList<String[]> doubleArrayList){
- UAVResultDTO uavResultDTO = new UAVResultDTO();
- int total = doubleArrayList.size();
- double X = 0, Y = 0, Z = 0;
- for (int i = 0; i < total; i++) {
- double lat, lon, x, y, z;
- String[] strings = doubleArrayList.get(i);
- lon = Double.parseDouble(strings[0]) * Math.PI / 180;
- lat = Double.parseDouble(strings[1]) * Math.PI / 180;
- x = Math.cos(lat) * Math.cos(lon);
- y = Math.cos(lat) * Math.sin(lon);
- z = Math.sin(lat);
- X += x;
- Y += y;
- Z += z;
- }
- X = X / total;
- Y = Y / total;
- Z = Z / total;
- double Lon = Math.atan2(Y, X);
- double Hyp = Math.sqrt(X * X + Y * Y);
- double Lat = Math.atan2(Z, Hyp);
-
- double rsLon = Lon * 180 / Math.PI;
- double rsLat = Lat * 180 / Math.PI;
- uavResultDTO.setFlyLon(rsLon);
- uavResultDTO.setFlyLat(rsLat);
-
-// return rsLon+"_"+rsLat;
- return uavResultDTO;
- }
-
- /**
- * ������������������������������GeneralPath������
- *
- * @param points ���������(������)
- *
- * @return GeneralPath������
- */
- public static GeneralPath genGeneralPath(ArrayList<Point2D.Double> points) {
- GeneralPath path = new GeneralPath();
-
- if (points.size() < 3) {
- return null;
- }
-
- path.moveTo((float) points.get(0).getX(), (float) points.get(0).getY());
-
- for (Iterator<Point2D.Double> it = points.iterator(); it.hasNext();) {
- Point2D.Double point = (Point2D.Double) it.next();
-
- path.lineTo((float) point.getX(), (float) point.getY());
- }
-
- path.closePath();
-
- return path;
- }
- /**
- * ������������������������������������������������������������������������������������������������������������������������true
- * @param point ���������
- * @param pts ������������������
- * @return ������������������������true,������������false
- */
- public static boolean IsPtInPoly(Point2D.Double point, List<Point2D.Double> pts){
-
- int N = pts.size();
- boolean boundOrVertex = true; //���������������������������������������������������������������������������������������true
- int intersectCount = 0;//cross points count of x
- double precision = 2e-10; //���������������������������0���������������������
- Point2D.Double p1, p2;//neighbour bound vertices
- Point2D.Double p = point; //���������
-
- p1 = pts.get(0);//left vertex
- for(int i = 1; i <= N; ++i){//check all rays
- if(p.equals(p1)){
- return boundOrVertex;//p is an vertex
- }
-
- p2 = pts.get(i % N);
- if(p.x < Math.min(p1.x, p2.x) || p.x > Math.max(p1.x, p2.x)){
- p1 = p2;
- continue;
- }
-
- if(p.x > Math.min(p1.x, p2.x) && p.x < Math.max(p1.x, p2.x)){
- if(p.y <= Math.max(p1.y, p2.y)){
- if(p1.x == p2.x && p.y >= Math.min(p1.y, p2.y)){
- return boundOrVertex;
- }
-
- if(p1.y == p2.y){
- if(p1.y == p.y){
- return boundOrVertex;
- }else{//before ray
- ++intersectCount;
- }
- }else{
- double xinters = (p.x - p1.x) * (p2.y - p1.y) / (p2.x - p1.x) + p1.y;
- if(Math.abs(p.y - xinters) < precision){
- return boundOrVertex;
- }
-
- if(p.y < xinters){
- ++intersectCount;
- }
- }
- }
- }else{
- if(p.x == p2.x && p.y <= p2.y){
- Point2D.Double p3 = pts.get((i+1) % N);
- if(p.x >= Math.min(p1.x, p3.x) && p.x <= Math.max(p1.x, p3.x)){
- ++intersectCount;
- }else{
- intersectCount += 2;
- }
- }
- }
- p1 = p2;
- }
-
- if(intersectCount % 2 == 0){//���������������������
- return false;
- } else { //���������������������
- return true;
- }
- }
-
- /**
- * ���������������������������������������������
- * @param
- * @param doubleArrayList ������������
- * @return
- */
- public static boolean isInPolygon(String X,String Y,ArrayList<String[]> doubleArrayList){
-
- double p_x =Double.parseDouble(X);
- double p_y =Double.parseDouble(Y);
- Point2D.Double point = new Point2D.Double(p_x, p_y);
-
- List<Point2D.Double> pointList= new ArrayList<Point2D.Double>();
-
- for (String[] strings : doubleArrayList) {
- double polygonPoint_x=Double.parseDouble(strings[0]);
- double polygonPoint_y=Double.parseDouble(strings[1]);
- Point2D.Double polygonPoint = new Point2D.Double(polygonPoint_x,polygonPoint_y);
- pointList.add(polygonPoint);
- }
- return IsPtInPoly(point,pointList);
-
- }
-
- public final static double x_pi = 3.14159265358979324 * 3000.0 / 180.0;
-
- /**
- * ���������������������������
- *
- * @param gd_lon ������
- * @param gd_lat ������
- * @return
- */
- public static Map<String, String> gd2bd(String gd_lon, String gd_lat) {
- double longitude = Double.parseDouble(gd_lon);
- double latitude = Double.parseDouble(gd_lat);
- Map<String, String> data = new HashMap<>();
- double x = longitude, y = latitude;
- double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi);
- double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi);
- double bd_lon = z * Math.cos(theta) + 0.0065;
- double bd_lat = z * Math.sin(theta) + 0.006;
- data.put("lon", String.valueOf(bd_lon));
- data.put("lat", String.valueOf(bd_lat));
- return data;
- }
}
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index bda0b44..5f392d9 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -1,3 +1,4 @@
+
package com.moral.api.exception.consumer;
import com.moral.api.utils.AdjustDataUtils;
@@ -25,12 +26,14 @@
import com.moral.api.websocket.CruiserWebSocketServer;
import com.moral.constant.KafkaConstants;
+
/*
* ������������������������
* */
+
@Component
@Slf4j
-public class CruiserDataConsumer implements ConsumerSeekAware {
+public class CruiserDataConsumer implements ConsumerSeekAware {
@KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, containerFactory = "cruiserDataListenerFactory")
public void listenSecondSpecial(ConsumerRecord<String, String> record) throws Exception {
@@ -64,8 +67,10 @@
continue;
}
Double sourceDataD = Double.valueOf(String.valueOf(data.get(code)));
- /*BigDecimal bg = new BigDecimal(sourceDataD);
- bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);*/
+
+ BigDecimal bg = new BigDecimal(sourceDataD);
+ bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);
+
String sourceData = String.valueOf(sourceDataD);
//������������
//������������
@@ -112,3 +117,4 @@
}
}
+
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
index 8fe36e2..d266d21 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
@@ -1,3 +1,4 @@
+
package com.moral.api.exception.consumer;
import com.alibaba.fastjson.JSON;
@@ -22,6 +23,7 @@
import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
+
/**
* @ClassName SecondsDataConsumer1
* @Description TODO
@@ -29,6 +31,7 @@
* @Date 2021/6/15 14:49
* @Version TODO
**/
+
@Component
@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
@@ -116,3 +119,4 @@
}
+
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
index bbb87da..ac90e66 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondCruiserMapper.java
@@ -28,4 +28,7 @@
List<Double> getDust(String start,String end,String mac);
+
+ List<Map<String,Object>> getAllCruiserData(Map<String,Object> params);
+
}
diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java
index 7ff7d65..8a2f291 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java
@@ -1,7 +1,11 @@
package com.moral.api.mapper;
+import java.util.List;
+import java.util.Map;
+
import com.moral.api.entity.HistorySecondUav;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.pojo.dto.uav.UAVResultDTO;
/**
* <p>
@@ -13,4 +17,6 @@
*/
public interface HistorySecondUavMapper extends BaseMapper<HistorySecondUav> {
+
+ List<HistorySecondUav> reList(Map<String,Object> map);
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVGetBD.java b/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVGetBD.java
new file mode 100644
index 0000000..eeca63a
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVGetBD.java
@@ -0,0 +1,24 @@
+package com.moral.api.pojo.dto.uav;
+
+import lombok.Data;
+
+@Data
+public class UAVGetBD {
+
+ /**
+ * ������
+ */
+ private Double flyLat;
+
+
+ /**
+ * ������
+ */
+ private Double flyLon;
+
+
+ private String time;
+
+
+ private String value;
+}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java
index 1dd921d..a4514b6 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java
@@ -17,22 +17,47 @@
*/
private Double flyLon;
- private Double coAvg;
+// private Double coAvg;
+//
+// private Double SO2Avg;
+//
+// private Double NO2Avg;
+//
+// private Double PM10Avg;
+//
+// private Double PM25Avg;
+//
+// private Double TVOCAvg;
+//
+// private Double O3Avg;
+//
+// private Double WDAvg;
+//
+// private Double SHAvg;
- private Double SO2Avg;
- private Double NO2Avg;
+// private Double QYAvg;
- private Double PM10Avg;
- private Double PM25Avg;
+ private Double a21005;
- private Double TVOCAvg;
+ private Double a21026;
- private Double O3Avg;
+ private Double a21004;
- private Double WDAvg;
+ private Double a34002;
- private Double SHAvg;
+ private Double a34004;
+
+ private Double a99054;
+
+ private Double a05024;
+
+ private Double a01001;
+
+ private Double a01002;
+
+
+ private Double a01006;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
index 4ff8a79..1bb0b79 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/uav/UAVQueryTimeSlotVOs.java
@@ -37,6 +37,7 @@
newMap.put("endTime",DateUtils.dateToDateString(endDate, "yyyy-MM-dd HH:mm:ss"));
//������batch������
newMap.put("batch", (String) map.get("batch"));
+ newMap.put("total",map.get("total").toString());
timeSlotVo.add(newMap);
}
vo.setTimeSlot(timeSlotVo);
diff --git a/screen-api/src/main/java/com/moral/api/service/DustldService.java b/screen-api/src/main/java/com/moral/api/service/DustldService.java
index 4c322e7..61390e5 100644
--- a/screen-api/src/main/java/com/moral/api/service/DustldService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DustldService.java
@@ -12,10 +12,10 @@
- public Integer getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;
+ Integer getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;
- public Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
+ Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
Map<String,Object> selectDust(Integer id );
diff --git a/screen-api/src/main/java/com/moral/api/service/UAVService.java b/screen-api/src/main/java/com/moral/api/service/UAVService.java
new file mode 100644
index 0000000..dee6115
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/UAVService.java
@@ -0,0 +1,13 @@
+package com.moral.api.service;
+
+
+import java.util.List;
+import java.util.Map;
+
+import com.moral.api.pojo.dto.uav.UAVResultDTO;
+
+public interface UAVService {
+
+
+ List<UAVResultDTO> getUav(Map<String, Object> params);
+}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 0a57a88..d77376b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -6,6 +6,7 @@
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
+import com.moral.api.mapper.HistoryFiveMinutelyMapper;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.UnitConversionMapper;
@@ -56,6 +57,9 @@
@Autowired
HistoryHourlyMapper historyHourlyMapper;
+
+ @Autowired
+ HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
@Override
public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
@@ -291,7 +295,7 @@
}
middleDate = DateUtils.addDays(middleDate,1);
}
- } else {
+ } else if ("month".equals(type)){
end = DateUtils.getDateAddMonth(endTime, 1);
timeUnits = "monthly";
dateFormat = "%Y-%m";
@@ -320,6 +324,38 @@
}
}
middleDate = DateUtils.addMonths(middleDate,1);
+ }
+ }else {
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
+ for (String mac:macs) {
+ QueryWrapper<HistoryFiveMinutely> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac", mac);
+ wrapper.between("time", startDate, endDate);
+ List<HistoryFiveMinutely> HistoryFiveMinutelys = FiveMinuteTableQuery(wrapper, tableNames);
+ HistoryFiveMinutelys = HistoryFiveMinutelys.stream().distinct().collect(Collectors.toList());
+ List<HistoryFiveMinutely> distinctHistoryHourlies = new ArrayList<>();
+ Map<String, Object> disMap = new HashMap<>();
+ for (HistoryFiveMinutely historyFiveMinutely:HistoryFiveMinutelys) {
+ Date time = historyFiveMinutely.getTime();
+ String timeStr = DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ if (!disMap.containsKey(timeStr)){
+ distinctHistoryHourlies.add(historyFiveMinutely);
+ disMap.put(timeStr,true);
+ }
+ }
+ for (HistoryFiveMinutely historyFiveMinutely:distinctHistoryHourlies) {
+ Map<String,Object> historyHourlyMap = new HashMap<>();
+ historyHourlyMap.put("mac",mac);
+ JSONObject value = JSONObject.parseObject(historyFiveMinutely.getValue());
+ Double sensorValue = Double.parseDouble(value.get(sensorCode).toString());
+ historyHourlyMap.put(sensorCode,sensorValue);
+ Date time = historyFiveMinutely.getTime();
+ String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+ historyHourlyMap.put("time",timeStr);
+ list.add(historyHourlyMap);
+ }
}
}
for (Map map:list) {
@@ -498,5 +534,16 @@
return result;
}
+ private List<HistoryFiveMinutely> FiveMinuteTableQuery(QueryWrapper<HistoryFiveMinutely> wrapper, List<String> tableNames) {
+ List<HistoryFiveMinutely> result = new ArrayList<>();
+ for (String tableName : tableNames) {
+ MybatisPlusConfig.tableName.set(tableName);
+ List<HistoryFiveMinutely> datas = historyFiveMinutelyMapper.selectList(wrapper);
+ result.addAll(datas);
+ }
+ MybatisPlusConfig.tableName.remove();
+ return result;
+ }
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
index ebdc974..ecff651 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -80,7 +80,30 @@
String start = timeForm.getStart();
String end = timeForm.getEnd();
List<Double> dust = historySecondCruiserMapper.getDust(start, end, mac);
- list.addAll(dust);
+ ArrayList<Double> rsDouble = new ArrayList<>();
+ for (Double aDouble : dust) {
+ double v =0.0;
+ if (aDouble>=0 && aDouble<40 ){
+ v = aDouble + 170;
+ }
+ if (aDouble>=40 && aDouble<60 ){
+ v = aDouble + 130;
+ }
+ if (aDouble>=60 && aDouble<100 ){
+ v = aDouble + 110;
+ }
+ if (aDouble>=100 && aDouble<150 ){
+ v = aDouble + 70;
+ }
+ if (aDouble>=150 && aDouble<180 ){
+ v = aDouble + 30;
+ }
+ if (aDouble>=180){
+ v= aDouble;
+ }
+ rsDouble.add(v);
+ }
+ list.addAll(rsDouble);
}
}
String format = "";
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
index d5682c1..1eb53a5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
@@ -491,60 +491,60 @@
HashMap<String, Object> map = new HashMap<>();
map.put("mac", objects[0]);
map.put("time", objects[1]);
+ // pm2.5
+ if (!objects[2].toString().equals("-")){
+ map.put("a34004", objects[2]);
+ }
+
+ // pm10
+ if (!objects[3].toString().equals("-")){
+ map.put("a34002", objects[3]);
+ }
// ������������
- if (!objects[2].toString().equals("--")){
- map.put("a21026", objects[2]);
+ if (!objects[4].toString().equals("-")){
+ map.put("a21026", objects[4]);
}
-
// ������������
- if (!objects[3].toString().equals("--")){
- map.put("a21004", objects[3]);
+ if (!objects[5].toString().equals("-")){
+ map.put("a21004", objects[5]);
}
- // ������������
- if (!objects[4].toString().equals("--")){
- map.put("a21005", objects[4]);
+ // co
+ if (!objects[6].toString().equals("-")){
+ map.put("a21005", objects[6]);
}
- // ������
- if (!objects[5].toString().equals("--")){
- map.put("a05024", objects[5]);
- }
- // PM10
- if (!objects[6].toString().equals("--")){
- map.put("a34002", objects[6]);
- }
- // PM 2.5
- if (!objects[7].toString().equals("--")){
- map.put("a34004", objects[7]);
+ // o3
+ if (!objects[7].toString().equals("-")){
+ map.put("a05024", objects[7]);
}
- // TVOCs
- if (!objects[8].toString().equals("--")){
- map.put("a99054", objects[8]);
- }
// ������
- if (!objects[9].toString().equals("--")){
- map.put("a01001", objects[9]);
+ if (!objects[8].toString().equals("-")){
+ map.put("a01001", objects[8]);
}
// ������
- if (!objects[10].toString().equals("--")){
- map.put("a01002", objects[10]);
+ if (!objects[9].toString().equals("-")){
+ map.put("a01002", objects[9]);
}
- // ������
- if (!objects[11].toString().equals("--")){
- map.put("a01006", objects[11]);
- }
-
// ������
- if (!objects[12].toString().equals("--")){
- map.put("a01007", objects[12]);
+ if (!objects[10].toString().equals("-")){
+ map.put("a01007", objects[10]);
}
// ������
- if (!objects[13].toString().equals("--")){
- map.put("a01008", objects[13]);
+ if (!objects[11].toString().equals("-")){
+ map.put("a01008", objects[11]);
}
- // ������
- if (!objects[14].toString().equals("--")){
- map.put("a00e12", objects[14]);
+
+ // ������
+ if (!objects[12].toString().equals("-")){
+ map.put("a01006", objects[12]);
+ }
+ // ������������
+ if (!objects[13].toString().equals("-")){
+ map.put("a00e12", objects[13]);
+ }
+ // tvoc
+ if (!objects[14].toString().equals("-")){
+ map.put("a99054", objects[14]);
}
// map.put("���������0.3", objects[15]);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 060cb1c..b1d5996 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -7,6 +7,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -70,7 +71,10 @@
result.put("avg", Constants.NULL_VALUE);
return result;
}
- result.put("avg", data.get(params.get("sensorCode")));
+ double aDouble = Double.parseDouble(data.get(params.get("sensorCode")).toString());
+ double v = new BigDecimal(aDouble).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+// result.put("avg", data.get(params.get("sensorCode")));
+ result.put("avg", ""+v);
return result;
}
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..10b8016 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
@@ -161,6 +161,7 @@
dateMap.put("startTime", slotStartDate);
dateMap.put("endTime", slotEndDate);
dateMap.put("batch", mKey);
+ dateMap.put("total",mValue.size());
timeSlots.add(dateMap);
});
});
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 65d397d..73e3552 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -211,7 +211,10 @@
String time2 = params.get("time2").toString();
String rsTime = getTime(time1, time2);
list.add(rsTime);
- List<Map<String, Object>> maps = specialDeviceService.carTrajectory(params,false);
+// List<Map<String, Object>> maps = specialDeviceService.carTrajectory(params,false);
+// List<Map<String, Object>> maps = HistorySecondCruiserMapper.getCruiserData(params);
+ List<Map<String, Object>> maps = HistorySecondCruiserMapper.getAllCruiserData(params);
+
if (ObjectUtils.isEmpty(maps)){
return null;
}
@@ -223,7 +226,8 @@
map.put("time1",time3);
map.put("time2",time4);
map.put("mac",mac);
- List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+// List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+ List<Map<String, Object>> maps1 = HistorySecondCruiserMapper.getAllCruiserData(params);
if (ObjectUtils.isEmpty(maps1)){
return null;
}
@@ -239,7 +243,8 @@
map.put("time1",time5);
map.put("time2",time6);
map.put("mac",mac);
- List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+// List<Map<String, Object>> maps1 = specialDeviceService.carTrajectory(map,false);
+ List<Map<String, Object>> maps1 = HistorySecondCruiserMapper.getAllCruiserData(params);
if (ObjectUtils.isEmpty(maps1)){
return null;
}
@@ -459,20 +464,28 @@
for (Map<String, Object> map : maps) {
-// String flylon = map.get("flylon").toString();
-// String flylat = map.get("flylat").toString();
-// String s = flylon + "-" + flylat;
-// if (Double.parseDouble(map.get("a34004").toString())>200){
-//
-// }
- pm25List.add(Double.parseDouble(map.get("a34004").toString()));
- pm10List.add(Double.parseDouble(map.get("a34002").toString()));
- COList.add(Double.parseDouble(map.get("a21005").toString()));
- SO2List.add(Double.parseDouble(map.get("a21026").toString()));
- NO2List.add(Double.parseDouble(map.get("a21004").toString()));
- O3List.add(Double.parseDouble(map.get("a05024").toString()));
- VOCList.add(Double.parseDouble(map.get("a99054").toString()));
-
+ Map value = JSON.parseObject(map.get("value").toString(), Map.class);
+ if (!ObjectUtils.isEmpty(value.get("a34004"))){
+ pm25List.add(Double.parseDouble(value.get("a34004").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a34002"))){
+ pm10List.add(Double.parseDouble(value.get("a34002").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21005"))){
+ COList.add(Double.parseDouble(value.get("a21005").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21026"))){
+ SO2List.add(Double.parseDouble(value.get("a21026").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a21004"))){
+ NO2List.add(Double.parseDouble(value.get("a21004").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a05024"))){
+ O3List.add(Double.parseDouble(value.get("a05024").toString()));
+ }
+ if (!ObjectUtils.isEmpty(value.get("a99054"))){
+ VOCList.add(Double.parseDouble(value.get("a99054").toString()));
+ }
}
//���������������
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UAVServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UAVServiceImpl.java
new file mode 100644
index 0000000..97054b4
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UAVServiceImpl.java
@@ -0,0 +1,509 @@
+package com.moral.api.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.moral.api.entity.HistorySecondUav;
+import com.moral.api.mapper.HistorySecondUavMapper;
+import com.moral.api.pojo.dto.uav.UAVGetBD;
+import com.moral.api.pojo.dto.uav.UAVGteForDTO;
+import com.moral.api.pojo.dto.uav.UAVResultDTO;
+import com.moral.api.service.UAVService;
+import com.moral.util.DateUtils;
+
+
+@Service
+public class UAVServiceImpl implements UAVService {
+
+ @Autowired
+ private HistorySecondUavMapper historySecondUavMapper;
+
+ @Override
+ public List<UAVResultDTO> getUav(Map<String, Object> params) {
+
+ String uvasize = params.get("uvasize").toString();
+ int size = Integer.parseInt(uvasize);
+ //������
+ ArrayList<Double> flyLatList = new ArrayList<>();
+ //������
+ ArrayList<Double> flyLonList = new ArrayList<>();
+
+ List<HistorySecondUav> historySecondUavs = historySecondUavMapper.reList(params);
+ if (ObjectUtils.isEmpty(historySecondUavs)){
+ return null;
+ }
+ ArrayList<UAVGetBD> rsBDList = new ArrayList<>();
+ for (HistorySecondUav historySecondUav : historySecondUavs) {
+ UAVGetBD uavGetBD = new UAVGetBD();
+ String value = historySecondUav.getValue();
+ JSONObject jsonObject = JSONObject.parseObject(value);
+
+ String flylon = jsonObject.get("flylon").toString();
+ String flylat = jsonObject.get("flylat").toString();
+ //WGS84 ��� ������������
+ double[] doubles = transformWGS84ToBD09(Double.parseDouble(flylon), Double.parseDouble(flylat));
+ uavGetBD.setFlyLon(doubles[0]);
+ uavGetBD.setFlyLat(doubles[1]);
+ uavGetBD.setTime(DateUtils.dateToDateString(historySecondUav.getTime()));
+ uavGetBD.setValue(value);
+ rsBDList.add(uavGetBD);
+// flyLatList.add(Double.parseDouble(flylat));
+// flyLonList.add(Double.parseDouble(flylon));
+ flyLatList.add(doubles[1]);
+ flyLonList.add(doubles[0]);
+ }
+ //������������������������������
+ Double maxLat = Collections.max(flyLatList);
+ Double maxLon = Collections.max(flyLonList);
+ Double minLat = Collections.min(flyLatList);
+ Double minLon = Collections.min(flyLonList);
+ //������������������
+// String leftTop = minLat +";"+ maxLon;
+ //������
+// String rightTop = maxLat +";"+ maxLon;
+ //������
+// String leftBottom = minLat +";" + minLon;
+ //������
+// String rightBottom = maxLat +";" + minLon;
+ //���������������������
+ double distance1 = getDistance(maxLon, minLat, maxLon, maxLat);
+ //���������������������
+ double distance2 = getDistance(maxLon, minLat, minLon, minLat);
+ ArrayList<UAVGteForDTO> list = new ArrayList<>();
+ //������������
+
+// String [] lefts =new String[]{maxLon.toString(),minLat.toString()};
+ //������2
+ String[] youshang = calLocationByDistanceAndLocationAndDirection(90, minLon, maxLat, size);
+ //������2
+ String[] youxia = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(youshang[0]), Double.parseDouble(youshang[1]), size);
+ //������2
+ String[] zuoxia = calLocationByDistanceAndLocationAndDirection(180, minLon, maxLat, size);
+
+ for (int i = 0; i <distance2 ; i+=size) {
+ UAVGteForDTO dto1 = new UAVGteForDTO();
+ String[] strings2 = calLocationByDistanceAndLocationAndDirection(90, minLon, maxLat, i);
+ String[] strings3 = calLocationByDistanceAndLocationAndDirection(90, Double.parseDouble(youshang[0].toString()), Double.parseDouble(youshang[1].toString()), i);
+ String[] strings4 = calLocationByDistanceAndLocationAndDirection(90, Double.parseDouble(youxia[0].toString()), Double.parseDouble(youxia[1].toString()), i);
+ String[] strings5 = calLocationByDistanceAndLocationAndDirection(90, Double.parseDouble(zuoxia[0].toString()), Double.parseDouble(zuoxia[1].toString()), i);
+ dto1.setLeftTop(strings2);
+ dto1.setRightTop(strings3);
+ dto1.setRightBottom(strings4);
+ dto1.setLeftBottom(strings5);
+ list.add(dto1);
+ for (int j = 0; j < distance1; j+=size) {
+ UAVGteForDTO dto2 = new UAVGteForDTO();
+ String[] strings6 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings2[0].toString()), Double.parseDouble(strings2[1].toString()), j);
+ String[] strings7 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings3[0].toString()), Double.parseDouble(strings3[1].toString()), j);
+ String[] strings8 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings4[0].toString()), Double.parseDouble(strings4[1].toString()), j);
+ String[] strings9 = calLocationByDistanceAndLocationAndDirection(180, Double.parseDouble(strings5[0].toString()), Double.parseDouble(strings5[1].toString()), j);
+ dto2.setLeftTop(strings6);
+ dto2.setRightTop(strings7);
+ dto2.setRightBottom(strings8);
+ dto2.setLeftBottom(strings9);
+ if (j!=0){
+ list.add(dto2);
+ }
+ }
+ }
+ HashMap<String,List<String>> rsMap = new HashMap<>();
+ List<String> stringList = new ArrayList<>();
+ for (UAVGteForDTO uavGteForDTO : list) {
+ ArrayList<String> list1 = new ArrayList<>();
+ ArrayList<String[]> doubleArrayList = new ArrayList<>();
+ doubleArrayList.add(uavGteForDTO.getLeftTop());
+ doubleArrayList.add(uavGteForDTO.getLeftBottom());
+ doubleArrayList.add(uavGteForDTO.getRightTop());
+ doubleArrayList.add(uavGteForDTO.getRightBottom());
+ String[] leftTops = uavGteForDTO.getLeftTop();
+ String[] rightBottoms = uavGteForDTO.getRightBottom();
+ Double x1 = Double.parseDouble(leftTops[0]);
+ Double x2 = Double.parseDouble(rightBottoms[0]);
+ Double y1 = Double.parseDouble(leftTops[1]);
+ Double y2 = Double.parseDouble(rightBottoms[1]);
+ //������������������
+// for (int i = 0; i < historySecondUavs.size(); i++) {
+// HistorySecondUav historySecondUav = historySecondUavs.get(i);
+// String value = historySecondUav.getValue();
+// Map map1 = JSON.parseObject(value, Map.class);
+// String flylat = map1.get("flylat").toString();
+// String flylon = map1.get("flylon").toString();
+// //���������������������������
+// boolean flag = isInPolygon(flylon,flylat,x1,x2,y1,y2);
+// if (flag){
+// String time = DateUtils.dateToDateString(historySecondUav.getTime());
+// //historySecondUavs.remove(i);
+// if(!stringList.contains(time)){
+// list1.add(historySecondUav.getValue());
+// stringList.add(time);
+// }
+// }
+// }
+ for (UAVGetBD uavGetBD : rsBDList) {
+ boolean flag = isInPolygon(uavGetBD.getFlyLon().toString(),uavGetBD.getFlyLat().toString(),x1,x2,y1,y2);
+ if (flag){
+ String time = uavGetBD.getTime();
+ //historySecondUavs.remove(i);
+ if(!stringList.contains(time)){
+ list1.add(uavGetBD.getValue());
+ stringList.add(time);
+ }
+ }
+ }
+ //���������������������
+ String result = getResult(doubleArrayList);
+ rsMap.put(result,list1);
+ }
+
+ //���������������������������������������
+ ArrayList<UAVResultDTO> uavResultDTOS = new ArrayList<>();
+ Set<String> strings = rsMap.keySet();
+ for (String string : strings) {
+ UAVResultDTO dto = new UAVResultDTO();
+ List<String> list1 = rsMap.get(string);
+ if (ObjectUtils.isEmpty(list1)){
+ continue;
+ }
+ ArrayList<Double> TVOCArrayList = new ArrayList<>();
+ ArrayList<Double> PM10ArrayList = new ArrayList<>();
+ ArrayList<Double> PM25ArrayList = new ArrayList<>();
+ ArrayList<Double> SOArrayList = new ArrayList<>();
+ ArrayList<Double> NOArrayList = new ArrayList<>();
+ ArrayList<Double> QYArrayList = new ArrayList<>();
+ ArrayList<Double> COArrayList = new ArrayList<>();
+ ArrayList<Double> WDArrayList = new ArrayList<>();
+ ArrayList<Double> SHArrayList = new ArrayList<>();
+ ArrayList<Double> O3ArrayList = new ArrayList<>();
+ for (String s : list1) {
+ JSONObject jsonObject = JSON.parseObject(s);
+ //tvoc
+ Object a99054 = jsonObject.get("a99054");
+ if (!Objects.isNull(a99054)){
+ TVOCArrayList.add(Double.parseDouble(a99054.toString()));
+ }
+ //pm2.5
+ Object a34004 = jsonObject.get("a34004");
+ if (!Objects.isNull(a34004)){
+ PM25ArrayList.add(Double.parseDouble(a34004.toString()));
+ }
+ //������������
+ Object a21026 = jsonObject.get("a21026");
+ if (!Objects.isNull(a21026)){
+ SOArrayList.add(Double.parseDouble(a21026.toString()));
+ }
+
+ //������������
+ Object a21004 = jsonObject.get("a21004");
+ if (!Objects.isNull(a21004)){
+ NOArrayList.add(Double.parseDouble(a21004.toString()));
+ }
+
+ //������
+ Object a01006 = jsonObject.get("a01006");
+ if (!Objects.isNull(a01006)){
+ QYArrayList.add(Double.parseDouble(a01006.toString()));
+ }
+ //pm10
+ Object a34002 = jsonObject.get("a34002");
+ if (!Objects.isNull(a34002)){
+ PM10ArrayList.add(Double.parseDouble(a34002.toString()));
+ }
+ //co
+ Object a21005 = jsonObject.get("a21005");
+ if (!Objects.isNull(a21005)){
+ COArrayList.add(Double.parseDouble(a21005.toString()));
+ }
+ //������
+ Object a01002 = jsonObject.get("a01002");
+ if (!Objects.isNull(a01002)){
+ QYArrayList.add(Double.parseDouble(a01002.toString()));
+ }
+ //������
+ Object a01001 = jsonObject.get("a01001");
+ if (!Objects.isNull(a01001)){
+ QYArrayList.add(Double.parseDouble(a01001.toString()));
+ }
+ //������
+ Object a05024 = jsonObject.get("a05024");
+ if (!Objects.isNull(a05024)){
+ O3ArrayList.add(Double.parseDouble(a05024.toString()));
+ }
+
+ }
+ double WDDouble =0.0;
+ double SHDouble =0.0;
+ double QYDouble =0.0;
+ double CODouble =0.0;
+ double TVODouble =0.0;
+ double PM10Double =0.0;
+ double PM25Double =0.0;
+ double SODouble =0.0;
+ double NODouble =0.0;
+ double O3Double =0.0;
+ if (COArrayList.size()>0){
+ CODouble = COArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (TVOCArrayList.size()>0){
+ TVODouble = TVOCArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (PM10ArrayList.size()>0){
+ PM10Double = PM10ArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (PM25ArrayList.size()>0){
+ PM25Double = PM25ArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (SOArrayList.size()>0){
+ SODouble = SOArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (NOArrayList.size()>0){
+ NODouble = NOArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (WDArrayList.size()>0){
+ WDDouble = WDArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (SHArrayList.size()>0){
+ SHDouble = SHArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (QYArrayList.size()>0){
+ QYDouble = QYArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+ if (O3ArrayList.size()>0){
+ O3Double = O3ArrayList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
+ }
+
+ dto.setA21005(CODouble);
+ dto.setA21004(NODouble);
+ dto.setA05024(O3Double);
+ dto.setA99054(TVODouble);
+ dto.setA34002(PM10Double);
+ dto.setA34004(PM25Double);
+ dto.setA21026(SODouble);
+ dto.setA01001(WDDouble);
+ dto.setA01002(SHDouble);
+ dto.setA01006(QYDouble);
+ String[] s = string.split("_");
+ dto.setFlyLat(Double.parseDouble(s[1]));
+ dto.setFlyLon(Double.parseDouble(s[0]));
+ uavResultDTOS.add(dto);
+ }
+ return uavResultDTOS;
+ }
+
+
+ private static final double EARTH_RADIUS = 6378137;
+
+ private static final double R = 6371e3;
+ /** 180�� **/
+ private static final DecimalFormat df = new DecimalFormat("0.00000000");
+
+ /**
+ * ���������������������������������������������������������������������������
+ * @param angle ���������������������������������������������
+ * @param startLong ���������������
+ * @param startLat ���������������
+ * @param distance ���������������m
+ * @return
+ */
+ public static String[] calLocationByDistanceAndLocationAndDirection(double angle, double startLong,double startLat, double distance){
+ String[] result = new String[2];
+ //���������������������������������������
+ double �� = distance/R;
+ // ���������radian���������������������������
+ angle = Math.toRadians(angle);
+ startLong = Math.toRadians(startLong);
+ startLat = Math.toRadians(startLat);
+ double lat = Math.asin(Math.sin(startLat)*Math.cos(��)+Math.cos(startLat)*Math.sin(��)*Math.cos(angle));
+ double lon = startLong + Math.atan2(Math.sin(angle)*Math.sin(��)*Math.cos(startLat),Math.cos(��)-Math.sin(startLat)*Math.sin(lat));
+ // ���������������10���������������
+ lon = Math.toDegrees(lon);
+ lat = Math.toDegrees(lat);
+ result[0] = df.format(lon);
+ result[1] = df.format(lat);
+ return result;
+ }
+
+ /**
+ * ������������������������������������������
+ *
+ * @param longitude1 ���������������������
+ * @param latitude1 ���������������������
+ * @param longitude2 ���������������������
+ * @param latitude2 ���������������������
+ * @return ������������ ���������
+ */
+ public static double getDistance(double longitude1, double latitude1, double longitude2, double latitude2) {
+ // ������
+ double lat1 = Math.toRadians(latitude1);
+ double lat2 = Math.toRadians(latitude2);
+ // ������
+ double lng1 = Math.toRadians(longitude1);
+ double lng2 = Math.toRadians(longitude2);
+ // ������������
+ double a = lat1 - lat2;
+ // ������������
+ double b = lng1 - lng2;
+ // ���������������������������
+ double s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) +
+ Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(b / 2), 2)));
+ // ���������������������, ������������: ���
+ s = s * EARTH_RADIUS;
+ return s;
+ }
+
+
+ //���������������
+ public static String getResult(ArrayList<String[]> doubleArrayList){
+
+ int total = doubleArrayList.size();
+ double X = 0, Y = 0, Z = 0;
+ for (int i = 0; i < total; i++) {
+ double lat, lon, x, y, z;
+ String[] strings = doubleArrayList.get(i);
+ lon = Double.parseDouble(strings[0]) * Math.PI / 180;
+ lat = Double.parseDouble(strings[1]) * Math.PI / 180;
+ x = Math.cos(lat) * Math.cos(lon);
+ y = Math.cos(lat) * Math.sin(lon);
+ z = Math.sin(lat);
+ X += x;
+ Y += y;
+ Z += z;
+ }
+ X = X / total;
+ Y = Y / total;
+ Z = Z / total;
+ double Lon = Math.atan2(Y, X);
+ double Hyp = Math.sqrt(X * X + Y * Y);
+ double Lat = Math.atan2(Z, Hyp);
+ DecimalFormat decimalFormat = new DecimalFormat("#.00000000");
+ double rsLon = Lon * 180 / Math.PI;
+ double rsLat = Lat * 180 / Math.PI;
+
+// double[] doubles = transformWGS84ToGCJ02(rsLon, rsLat);
+// String s = transformGCJ02ToBD09(doubles[0], doubles[1]);
+
+
+ return decimalFormat.format(rsLon)+"_"+decimalFormat.format(rsLat);
+// return rsLon+"_"+rsLat;
+// return s;
+ }
+
+ /**
+ * ������������������������������
+ * @param X
+ * @param Y
+ * @param x1
+ * @param x2
+ * @param y1
+ * @param y2
+ * @return
+ */
+ public boolean isInPolygon(String X,String Y,double x1,double x2,double y1,double y2){
+ boolean result = false;
+ double x =Double.parseDouble(X);
+ double y =Double.parseDouble(Y);
+ if(x >= Math.min(x1, x2) && x <= Math.max(x1, x2) ){
+ if(y >= Math.min(y1, y2) && y <= Math.max(y1, y2)){
+ result = true;
+ }
+ }
+ return result;
+
+ }
+
+
+ private static final double x_PI = 3.14159265358979324 * 3000.0 / 180.0;
+ private static final double PI = 3.1415926535897932384626;
+ private static final double a = 6378245.0;
+ private static final double ee = 0.00669342162296594323;
+ /**
+ * WGS84 ������ ��� GCJ02
+ *
+ * @param lng ������
+ * @param lat ������
+ * @return GCJ02 ���������[���������������]
+ */
+ public static double[] transformWGS84ToGCJ02(double lng, double lat) {
+ if (outOfChina(lng, lat)) {
+ return new double[]{lng, lat};
+ } else {
+ double dLat = transformLat(lng - 105.0, lat - 35.0);
+ double dLng = transformLng(lng - 105.0, lat - 35.0);
+ double redLat = lat / 180.0 * PI;
+ double magic = Math.sin(redLat);
+ magic = 1 - ee * magic * magic;
+ double sqrtMagic = Math.sqrt(magic);
+ dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * PI);
+ dLng = (dLng * 180.0) / (a / sqrtMagic * Math.cos(redLat) * PI);
+ double mgLat = lat + dLat;
+ double mgLng = lng + dLng;
+ return new double[]{mgLng, mgLat};
+ }
+ }
+
+ private static double transformLat(double lng, double lat) {
+ double ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
+ ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+ ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+ ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+ return ret;
+ }
+
+ private static double transformLng(double lng, double lat) {
+ double ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+ ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+ ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
+ ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
+ return ret;
+ }
+ /**
+ * ������������������������������
+ *
+ * @param lng ������
+ * @param lat ������
+ * @return ���������������������
+ */
+ public static boolean outOfChina(double lng, double lat) {
+ return (lng < 72.004 || lng > 137.8347) || (lat < 0.8293 || lat > 55.8271);
+ }
+
+ /**
+ * GCJ02 ���������������
+ *
+ * @param lng GCJ02 ������
+ * @param lat GCJ02 ������
+ * @return ���������������[���������������]
+ */
+ public static double[] transformGCJ02ToBD09(double lng, double lat) {
+ double z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI);
+ double theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI);
+ double bd_lng = z * Math.cos(theta) + 0.0065;
+ double bd_lat = z * Math.sin(theta) + 0.006;
+ return new double[]{bd_lng, bd_lat};
+ }
+
+
+ /**
+ * WGS84 ��� ������������BD09
+ *
+ * @param lng ������
+ * @param lat ������
+ * @return BD09 ���������[���������������]
+ */
+ public static double[] transformWGS84ToBD09(double lng, double lat) {
+ double[] lngLat = transformWGS84ToGCJ02(lng, lat);
+
+ return transformGCJ02ToBD09(lngLat[0], lngLat[1]);
+ }
+}
diff --git a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
index 2f52e18..441d95e 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondCruiserMapper.xml
@@ -57,4 +57,14 @@
AND `time` <![CDATA[>=]]> #{start}
AND `time` <![CDATA[<=]]> #{end}
</select>
+
+
+ <select id="getAllCruiserData" resultType="java.util.Map">
+ SELECT
+ `value`
+ FROM `history_second_cruiser`
+ WHERE mac = #{mac}
+ AND `time` <![CDATA[>=]]> #{time1}
+ AND `time` <![CDATA[<=]]> #{time2}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
index c237c8e..ce67a21 100644
--- a/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml
@@ -11,4 +11,11 @@
<result column="batch" property="batch" />
</resultMap>
+ <select id="reList" resultType="com.moral.api.entity.HistorySecondUav">
+ SELECT history_second_uav.time,`value`
+ FROM history_second_uav WHERE mac = #{mac}
+ AND batch = #{batch}
+ HAVING abs(`value`->>'$.flyhig') <![CDATA[>=]]> #{height1}
+ and abs(`value`->>'$.flyhig') <![CDATA[<=]]> #{height2}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
index 2662973..3677746 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceAdjustValueController.java
@@ -1,16 +1,19 @@
package com.moral.api.controller;
-import com.alibaba.fastjson.JSON;
import com.moral.api.entity.DeviceAdjustValue;
+import com.moral.api.pojo.form.adjust.AdjustForm;
import com.moral.api.service.DeviceAdjustValueService;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -93,4 +96,45 @@
return ResultMessage.fail(Integer.parseInt(resultMap.get("code").toString()),resultMap.get("msg").toString());
}
+ /**
+ * ���������������������
+ * @param parameters
+ * @return
+ */
+ @PostMapping("getAllAdjust")
+ public ResultMessage getAllAdjust(@RequestBody Map<String, Object> parameters){
+ if (!parameters.containsKey("id")|| !parameters.containsKey("code")){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<Map<String, Object>> allAdjust = deviceAdjustValueService.getAllAdjust(parameters);
+ if (ObjectUtils.isEmpty(allAdjust)){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(),
+ ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return ResultMessage.ok(allAdjust);
+ }
+
+ /**
+ * ���������������������
+ * @return
+ */
+ @PostMapping("updateAllAdjust")
+ public ResultMessage updateAllAdjust( @RequestBody Map<String, List<AdjustForm>> parameters){
+ List<AdjustForm> o = parameters.get("AdjustForm");
+ if (ObjectUtils.isEmpty(o)){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(),
+ ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ Map<String, Object> map = deviceAdjustValueService.updateAllAdjust(o);
+ int code = Integer.parseInt(map.get("code").toString());
+ if (code != 0){
+ return ResultMessage.fail(ResponseCodeEnum.FAIL.getCode(),ResponseCodeEnum.FAIL.getMsg());
+ }
+ return ResultMessage.fail(ResponseCodeEnum.SUCCESS.getCode(),ResponseCodeEnum.SUCCESS.getMsg());
+
+// return ResultMessage.ok(map);
+ }
+
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index c992999..c21f1fb 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -1,4 +1,3 @@
-/*
package com.moral.api.kafka.consumer;
import com.moral.api.service.*;
@@ -123,7 +122,7 @@
//������������������������������������������������������
@KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
- public void listenSecond(ConsumerRecord<String, String> record) {
+ public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
Map<String, Object> data = JSON.parseObject(msg, Map.class);
@@ -145,6 +144,7 @@
//���������������������������
data.put("mac", mac);
deviceService.judgeDeviceState(data);
+ ack.acknowledge();
} catch (Exception e) {
log.error("param{}" + msg);
}
@@ -200,4 +200,3 @@
}
}
}
-*/
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java
index ed6f207..aea6061 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/DeviceAdjustValueMapper.java
@@ -2,7 +2,10 @@
import com.moral.api.entity.DeviceAdjustValue;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.moral.api.pojo.dto.adjust.AdjustDTO;
+
+import java.util.List;
import java.util.Map;
/**
@@ -17,4 +20,7 @@
void updateDeviceAdjustValue(Map map);
+
+ List<AdjustDTO> selectAllAdjust(Map map);
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/adjust/AdjustDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/adjust/AdjustDTO.java
new file mode 100644
index 0000000..6c5dcce
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/adjust/AdjustDTO.java
@@ -0,0 +1,13 @@
+package com.moral.api.pojo.dto.adjust;
+
+
+import lombok.Data;
+
+@Data
+public class AdjustDTO {
+
+ private Integer id;
+ private String mac;
+ private String name;
+ private String value;
+}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/adjust/AdjustForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/adjust/AdjustForm.java
new file mode 100644
index 0000000..8090a85
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/adjust/AdjustForm.java
@@ -0,0 +1,30 @@
+package com.moral.api.pojo.form.adjust;
+
+
+import lombok.Data;
+
+@Data
+public class AdjustForm {
+
+
+ private Integer id;
+
+ private String mac;
+
+ private String value;
+
+ private String name;
+
+ private String agehou;
+
+ private String aqi;
+
+ private String cel;
+
+ private String code;
+
+
+
+
+
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
index 81ac2c1..b527cf7 100644
--- a/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/DeviceAdjustValueService.java
@@ -2,8 +2,12 @@
import com.moral.api.entity.DeviceAdjustValue;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.moral.api.pojo.dto.adjust.AdjustDTO;
+import com.moral.api.pojo.form.adjust.AdjustForm;
+
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
import java.util.Map;
/**
@@ -74,4 +78,23 @@
*/
Map<String,Object> refreshRedis();
+
+ /**
+ * ���������������������
+ * @param parameters
+ * @return
+ */
+ List<Map<String, Object>> getAllAdjust(Map<String, Object> parameters);
+
+ /**
+ * ���������������������
+ * @param paras
+ * @return
+ */
+ Map<String, Object> updateAllAdjust(List<AdjustForm> paras);
+
+
+
+
+
}
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 e4350df..f287939 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Device;
@@ -12,6 +13,8 @@
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.SensorMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
+import com.moral.api.pojo.dto.adjust.AdjustDTO;
+import com.moral.api.pojo.form.adjust.AdjustForm;
import com.moral.api.service.DeviceAdjustValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
@@ -19,6 +22,7 @@
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.jdbc.object.UpdatableSqlQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder;
@@ -27,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import java.sql.Time;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -262,6 +267,94 @@
return resultMap;
}
+
+
+ /**
+ * ���������������������
+ *
+ * @param parameters
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> getAllAdjust(Map<String, Object> parameters) {
+ ArrayList<Map<String, Object>> rsList = new ArrayList<>();
+ String code = parameters.get("code").toString();
+ List<AdjustDTO> adjustDTOS = deviceAdjustValueMapper.selectAllAdjust(parameters);
+ for (AdjustDTO adjustDTO : adjustDTOS) {
+ HashMap<String, Object> map = new HashMap<>();
+ String value = adjustDTO.getValue();
+ if (ObjectUtils.isEmpty(value)){
+ if (code.equals("a99054")){
+ value ="cel*1";
+ map.put("cel",1);
+ }else {
+ value ="aqi*0+cel*1";
+ map.put("aqi",0);
+ map.put("cel",1);
+ }
+ }else {
+ if (code.equals("a99054")){
+ String[] split = value.split("\\*");
+ map.put("cel",Double.parseDouble(split[1]));
+ }else {
+ String[] split = value.split("\\+");
+ String[] split1 = split[0].toString().split("\\*");
+ map.put("aqi",Double.parseDouble(split1[1]));
+ String[] split2 = split[1].toString().split("\\*");
+ map.put("cel",Double.parseDouble(split2[1]));
+ }
+ }
+ map.put("value",value);
+ map.put("name",adjustDTO.getName());
+ map.put("id",adjustDTO.getId());
+ map.put("mac",adjustDTO.getMac());
+ map.put("code",code);
+ rsList.add(map);
+ }
+ return rsList;
+ }
+
+ /**
+ * ���������������������
+ *
+ * @param paras
+ * @return
+ */
+ @Override
+ @Transactional
+ public Map<String, Object> updateAllAdjust(List<AdjustForm> paras) {
+ Map<String,Object> resultMap = new HashMap<>();
+ for (AdjustForm adjustForm : paras) {
+ DeviceAdjustValue deviceAdjustValue = new DeviceAdjustValue();
+ QueryWrapper<DeviceAdjustValue> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("mac",adjustForm.getMac());
+ wrapper1.eq ("sensor_code",adjustForm.getCode());
+ Integer integer = deviceAdjustValueMapper.selectCount(wrapper1);
+ if (integer==0){
+ deviceAdjustValue.setValue(adjustForm.getAgehou());
+ deviceAdjustValue.setCreateTime(new Date());
+ deviceAdjustValue.setIsDelete("0");
+ deviceAdjustValue.setUpdateTime(new Date());
+ deviceAdjustValue.setSensorCode(adjustForm.getCode());
+ deviceAdjustValue.setMac(adjustForm.getMac());
+ deviceAdjustValue.setEndTime(Time.valueOf("23:59:00"));
+ deviceAdjustValue.setStartTime(Time.valueOf("00:00:00"));
+ deviceAdjustValueMapper.insert(deviceAdjustValue);
+ }else {
+ deviceAdjustValue.setValue(adjustForm.getAgehou());
+ deviceAdjustValue.setUpdateTime(new Date());
+ deviceAdjustValue.setId(adjustForm.getId());
+ deviceAdjustValueMapper.updateById(deviceAdjustValue);
+ }
+ //������������
+ refreshCache(adjustForm.getMac());
+ }
+
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
+
public void refreshRedisAll(){
refreshRedis();
}
diff --git a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
index 9db7b99..255ce4d 100644
--- a/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml
@@ -41,4 +41,17 @@
where id = #{id}
</update>
+ <select id="selectAllAdjust" resultType="com.moral.api.pojo.dto.adjust.AdjustDTO">
+ SELECT de.`name` ,
+ ds.id,
+ de.mac,
+ ds.`value`
+ FROM
+ device AS de
+ LEFT JOIN device_adjust_value AS ds ON ds.mac = de.mac AND ds.sensor_code = #{code} AND ds.is_delete =0
+ WHERE
+ de.monitor_point_id = #{id}
+ AND de.is_delete = 0
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0