From a7181383bbd5475e7dcbd1fcd29020521c85d58d Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Thu, 12 Sep 2024 15:58:25 +0800
Subject: [PATCH] fix:交办单时间修改提交
---
screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 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 36574a2..a6a1a4a 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
@@ -2,34 +2,29 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.HistorySecondCruiser;
+import com.moral.api.entity.ManageCoordinateDetail;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.HistorySecondCruiserMapper;
+import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.mapper.SpecialDeviceMapper;
import com.moral.api.pojo.dto.cruiser.CruiserDTO;
-import com.moral.api.service.DeviceService;
+import com.moral.api.pojo.dto.cruiser.CruiserListDTO;
import com.moral.api.service.HistorySecondCruiserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.SpecialDeviceService;
import com.moral.api.util.RoadUtils;
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.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -54,6 +49,8 @@
private SpecialDeviceService specialDeviceService;
@Autowired
private SpecialDeviceMapper specialDeviceMapper;
+ @Autowired
+ private ManageCoordinateDetailMapper manageCoordinateDetailMapper;
@Autowired
private RedisTemplate redisTemplate;
@@ -165,7 +162,44 @@
return map;
}
-
-
+ @Override
+ public Map<String, Object> getCruiserCompare(Map<String, Object> params) {
+ HashMap<String,Object> rsMap = new HashMap<>();
+ List<CruiserListDTO> list = historySecondCruiserMapper.cruiserList(params);
+ List<CruiserDTO> cruiserInfo = new ArrayList<>();
+ ArrayList<ManageCoordinateDetail> rsList1 = new ArrayList<>();
+ for(CruiserListDTO c : list){
+ if (ObjectUtils.isEmpty(c.getFlyLon()) || ObjectUtils.isEmpty(c.getFlyLat())) {
+ continue;
+ }
+ double[] doubles = RoadUtils.transformWGS84ToBD09(c.getFlyLon(), c.getFlyLat());
+ if(doubles.length !=2){
+ continue;
+ }
+ String date = new StringBuilder().append(c.getFlyLon()).append("_").append(c.getFlyLat()).toString();
+ if(c.getState().equals(0)){
+ CruiserDTO cruiserDTO = new CruiserDTO();
+ cruiserDTO.setTime(c.getTime());
+ cruiserDTO.setFlyLat(doubles[1]);
+ cruiserDTO.setFlyLon(doubles[0]);
+ cruiserDTO.setData(date);
+ cruiserDTO.setState("1");
+ cruiserInfo.add(cruiserDTO);
+ }else {
+ ManageCoordinateDetail detail = new ManageCoordinateDetail();
+ detail.setId(c.getId());
+ detail.setCoordinateId(c.getCoordinateId());
+ detail.setLongitude(doubles[0]);
+ detail.setLatitude(doubles[1]);
+ detail.setState(c.getState().toString());
+ detail.setCode(date);
+ rsList1.add(detail);
+ }
+ }
+ rsMap.put("rsData",cruiserInfo);
+ rsMap.put("data",rsList1);
+ rsMap.put("message","���"+cruiserInfo.size()+"������������������"+"���������"+(cruiserInfo.size()+rsList1.size())+"���");
+ return rsMap;
+ }
}
--
Gitblit v1.8.0