From 0bdd4bcee9d66e5372df5351ec0008b23302ffff Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Aug 2023 16:36:06 +0800
Subject: [PATCH] feat:走航车路段重写
---
screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
index e9d6ac2..0b2e9af 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java
@@ -1,10 +1,13 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondCruiser;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.HistorySecondCruiserMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
+import com.moral.api.pojo.dto.cruiser.CruiserDTO;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistorySecondCruiserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,10 +15,15 @@
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
+
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import java.sql.Wrapper;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -29,6 +37,7 @@
* @author moral
* @since 2021-09-02
*/
+@Slf4j
@Service
public class HistorySecondCruiserServiceImpl extends ServiceImpl<HistorySecondCruiserMapper, HistorySecondCruiser> implements HistorySecondCruiserService {
@@ -37,6 +46,8 @@
@Autowired
private SpecialDeviceService specialDeviceService;
+ @Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
@Autowired
private RedisTemplate redisTemplate;
@@ -78,4 +89,45 @@
historySecondCruiser.setBatch(batchTime);
historySecondCruiserMapper.insert(historySecondCruiser);
}
+
+ /**
+ * ���������������������������
+ * @return
+ */
+ @Override
+ public List<SpecialDevice> selectCruisers() {
+ QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<SpecialDevice> specialDevices = specialDeviceMapper.selectList(wrapper);
+ return specialDevices;
+ }
+
+ /**
+ * ���������������������
+ * @param params
+ * @return
+ */
+ @Override
+ public List<CruiserDTO> getCruiserInFo(Map<String, Object> params) {
+ params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
+ List<CruiserDTO> data = historySecondCruiserMapper.getCruiserInfo(params);
+ List<CruiserDTO> rsCruiser = data.stream().distinct().collect(Collectors.toList());
+ rsCruiser.removeIf(o->{
+ if (ObjectUtils.isEmpty(o.getFlyLon()) || ObjectUtils.isEmpty(o.getFlyLat())) {
+ return true;
+ }
+ double lon = o.getFlyLon();
+ double lat = o.getFlyLat();
+ if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
+ return true;
+ }
+ return false;
+ });
+ if(CollectionUtils.isEmpty(data)){
+ return null;
+ }
+ log.info(data.size()+"");
+ log.info(rsCruiser.size()+"");
+ return rsCruiser;
+ }
}
--
Gitblit v1.8.0