From ea75e686ed771fa377f688d9eaf8027740265aa1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:58:18 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 245 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 177 insertions(+), 68 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
index 190ab38..5b9b086 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
@@ -2,21 +2,45 @@
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.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+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.ManageAccount;
import com.moral.api.entity.ManageCoordinateDetail;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.pojo.dto.cruiser.CruiserDTO;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.service.ManageCoordinateDetailService;
import com.moral.api.util.RoadUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
+import com.moral.util.DateUtils;
+import com.moral.util.TokenUtils;
+import com.sun.org.apache.regexp.internal.RE;
@Service
@@ -29,38 +53,60 @@
@Autowired
private HistorySecondCruiserMapper historySecondCruiserMapper;
+
+ @Autowired
+ private RedisTemplate redisTemplate;
/**
* ���������������
- * @param manageCoordinateDetails
+ * @param params
* @return
*/
@Override
@Transactional
- public Integer insertCoordinate(List<ManageCoordinateDetail> manageCoordinateDetails) {
- for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
- if (manageCoordinateDetail.getState().equals("1")){
+ public Integer insertCoordinate(Map<String,Object> params) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+ AccountInfoDTO accountInfoDTO = (AccountInfoDTO) TokenUtils.getUserInfoByToken(token);
+ ManageAccount manageAccount = accountInfoDTO.getAccount();
+ Integer id = manageAccount.getId();
+ String userName = manageAccount.getUserName();
+
+ int coordinateId = Integer.parseInt(params.get("coordinateId").toString());
+ List<Map<String, Object>> data = (List<Map<String, Object>>) params.get("data");
+
+ for (Map<String, Object> datum : data) {
+
+ String code = datum.get("code").toString();
+ String state = datum.get("state").toString();
+
+ if (state.equals("2")){
+ ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
+ String[] rs = code.split("_");
+ manageCoordinateDetail.setCoordinateId(coordinateId);
+ manageCoordinateDetail.setLongitude(Double.parseDouble(rs[0]));
+ manageCoordinateDetail.setLatitude(Double.parseDouble(rs[1]));
manageCoordinateDetail.setState("2");
- int insert = manageCoordinateDetailMapper.insert(manageCoordinateDetail);
- if (insert!=1){
- return null;
+ manageCoordinateDetail.setUpdateUserId(id);
+ manageCoordinateDetail.setUpdayeUserName(userName);
+ QueryWrapper<ManageCoordinateDetail> wrapper = new QueryWrapper<>();
+ wrapper.eq("coordinate_id",coordinateId);
+ wrapper.eq("longitude",manageCoordinateDetail.getLongitude());
+ wrapper.eq("latitude",manageCoordinateDetail.getLatitude());
+ Integer integer = manageCoordinateDetailMapper.selectCount(wrapper);
+ if (integer>=1){
+ return 1;
}
+ manageCoordinateDetailMapper.insert(manageCoordinateDetail);
}else {
- int i = manageCoordinateDetailMapper.deleteById(manageCoordinateDetail.getId());
- if (i!=1){
- return null;
+ Object id1 = datum.get("id");
+ if (ObjectUtils.isEmpty(id1)){
+ return 2;
}
+ manageCoordinateDetailMapper.deleteById(Integer.parseInt(id1.toString()));
+
}
}
return 200;
- }
-
- /**
- * ������������������
- * @param id
- */
- @Override
- public void deleteCoordinate(Integer id) {
- manageCoordinateDetailMapper.deleteById(id);
}
@@ -70,49 +116,78 @@
* @return
*/
@Override
- public Map<String, Object> selectCoordinate(Map<String, Object> params) {
+ public Map<String,Object> selectCoordinate(Map<String, Object> params) {
+ HashMap<String,Object> rsMap = new HashMap<>();
+ String mac = params.get("mac").toString();
+ String time1 = params.get("time1").toString();
+ ArrayList<ManageCoordinateDetail> rsList1 = new ArrayList<>();
params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
String coordinateId = params.get("coordinateId").toString();
QueryWrapper<ManageCoordinateDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("coordinate_id",coordinateId);
List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);
+ List<CruiserDTO> cruiserInfo = (List<CruiserDTO>) redisTemplate.opsForHash().get(RedisConstants.DATE_COORDINATE, mac + time1);
+ if (ObjectUtils.isEmpty(cruiserInfo)){
+ cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
+ cruiserInfo = cruiserInfo.stream().distinct().collect(Collectors.toList());
+ cruiserInfo.removeIf(o->{
+ if (ObjectUtils.isEmpty(o.getFlyLon()) || ObjectUtils.isEmpty(o.getFlyLat())) {
+ return true;
+ }
+ double lon = o.getFlyLon();
+ double lat = o.getFlyLat();
+ double[] doubles = RoadUtils.transformWGS84ToBD09(lon, lat);
+ Matcher matcher = Pattern.compile("\\d*\\.\\d{8}").matcher(""+doubles[0]);
+ matcher.find();
+ String s = matcher.group();
+ Matcher matcher1 = Pattern.compile("\\d*\\.\\d{8}").matcher(""+doubles[1]);
+ matcher1.find();
+ String s1 = matcher1.group();
+ o.setFlyLon(Double.parseDouble(s));
+ o.setFlyLat(Double.parseDouble(s1));
+ o.setData(lon+"_"+lat);
+// o.setFlyLon(doubles[0]);
+// o.setFlyLat(doubles[1]);
+ if (lon < 70 || lon > 150 || lat < 20 || lat > 60) {
+ return true;
+ }
+ return false;
+ });
-// ArrayList<String> list1 = new ArrayList<>();
-// ArrayList<String> list2 = new ArrayList<>();
-// for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
-// Double latitude = manageCoordinateDetail.getLatitude();
-// Double longitude = manageCoordinateDetail.getLongitude();
-// String s = longitude + "_" + latitude;
-// list1.add(s);
-// }
+ redisTemplate.opsForHash().put(RedisConstants.DATE_COORDINATE,mac+time1,cruiserInfo);
+ //������������������
+ redisTemplate.opsForHash().getOperations().expire(RedisConstants.DATE_COORDINATE,6000, TimeUnit.SECONDS);
+
+ }
// List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
-// for (CruiserDTO cruiserDTO : cruiserInfo) {
-// String s = cruiserDTO.getFlyLat().toString();
-// String s1 = cruiserDTO.getFlyLon().toString();
-// String rs = s1 + "_" + s;
-// list2.add(rs);
-// }
-// //���������
-// list1.retainAll(list2);
-// //���������
-// list2.removeAll(list1);
-// //������������������������
-// CruiserDTO rsDTO = new CruiserDTO();
-// for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
-// String latitude = manageCoordinateDetail.getLatitude().toString();
-// String longitude = manageCoordinateDetail.getLongitude().toString();
-// for (CruiserDTO cruiserDTO : cruiserInfo) {
-// Double flyLat = cruiserDTO.getFlyLat();
-// Double flyLon = cruiserDTO.getFlyLon();
-// if (latitude.equals(flyLat+"") && longitude.equals(flyLon+"")){
-// rsDTO.setFlyLat(flyLat);
-// rsDTO.setFlyLon(flyLon);
-// }
-// }
-// }
+ if (ObjectUtils.isEmpty(manageCoordinateDetails)){
+ rsMap.put("rsData",cruiserInfo);
+ rsMap.put("data",rsList1);
+ return rsMap;
+ }
+ for (int i=cruiserInfo.size()-1;i>0;i--) {
+ CruiserDTO cruiserDTO = cruiserInfo.get(i);
+ String data = cruiserDTO.getData();
+ String[] rs = data.split("_");
+ String flyLon = rs[0];
+ String flyLat = rs[1];
+ for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
+ String latitude = manageCoordinateDetail.getLatitude().toString();
+ String longitude = manageCoordinateDetail.getLongitude().toString();
+ if (latitude.equals(flyLat) && longitude.equals(flyLon)){
+ manageCoordinateDetail.setCode(data);
+ manageCoordinateDetail.setLongitude(cruiserDTO.getFlyLon());
+ manageCoordinateDetail.setLatitude(cruiserDTO.getFlyLat());
+ rsList1.add(manageCoordinateDetail);
+ cruiserInfo.remove(i);
+ break;
+ }
+ }
-
- return null;
+ }
+ rsMap.put("rsData",cruiserInfo);
+ rsMap.put("data",rsList1);
+ return rsMap;
}
@@ -128,28 +203,62 @@
int coordinateId = Integer.parseInt(params.get("coordinateId").toString());
QueryWrapper<ManageCoordinateDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("coordinate_id",coordinateId);
+ String time1 = params.remove("time1").toString();
+ String time2 = params.remove("time2").toString();
+ long l = DateUtils.compareDateStr(time1, time2);
+ if (l>0){
+ params.put("time1",time1);
+ params.put("time2",time2);
+ }else {
+ params.put("time1",time2);
+ params.put("time2",time1);
+ }
+ int j =0;
List<ManageCoordinateDetail> manageCoordinateDetails = manageCoordinateDetailMapper.selectList(queryWrapper);
List<CruiserDTO> cruiserInfo = historySecondCruiserMapper.getCruiserInfo(params);
- for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
- String latitude = manageCoordinateDetail.getLatitude().toString();
- String longitude = manageCoordinateDetail.getLongitude().toString();
+ if (ObjectUtils.isEmpty(manageCoordinateDetails)){
for (CruiserDTO cruiserDTO : cruiserInfo) {
Double flyLat = cruiserDTO.getFlyLat();
Double flyLon = cruiserDTO.getFlyLon();
- if (!latitude.equals(flyLat+"") || !longitude.equals(flyLon+"")){
- ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
- rsDTO.setLatitude(flyLat);
- rsDTO.setLongitude(flyLon);
- rsDTO.setState("2");
- rsDTO.setCreateTime(new Date());
- rsDTO.setUpdateTime(new Date());
- rsDTO.setCoordinateId(coordinateId);
- int insert = manageCoordinateDetailMapper.insert(rsDTO);
- if (insert!=1){
- return null;
+ ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
+ rsDTO.setLatitude(flyLat);
+ rsDTO.setLongitude(flyLon);
+ rsDTO.setState("2");
+ rsDTO.setCreateTime(new Date());
+ rsDTO.setUpdateTime(new Date());
+ rsDTO.setCoordinateId(coordinateId);
+ manageCoordinateDetailMapper.insert(rsDTO);
+ j++;
+ log.info(j+"");
+ }
+ }else {
+ for (int i=cruiserInfo.size()-1;i>0;i--) {
+ CruiserDTO cruiserDTO = cruiserInfo.get(i);
+ Double flyLat = cruiserDTO.getFlyLat();
+ Double flyLon = cruiserDTO.getFlyLon();
+ for (ManageCoordinateDetail manageCoordinateDetail : manageCoordinateDetails) {
+ String latitude = manageCoordinateDetail.getLatitude().toString();
+ String longitude = manageCoordinateDetail.getLongitude().toString();
+ if (latitude.equals(flyLat+"") && longitude.equals(flyLon+"")){
+ cruiserInfo.remove(i);
+ break;
}
}
}
+ for (CruiserDTO cruiserDTO : cruiserInfo) {
+ Double flyLat = cruiserDTO.getFlyLat();
+ Double flyLon = cruiserDTO.getFlyLon();
+ ManageCoordinateDetail rsDTO = new ManageCoordinateDetail();
+ rsDTO.setLatitude(flyLat);
+ rsDTO.setLongitude(flyLon);
+ rsDTO.setState("2");
+ rsDTO.setCreateTime(new Date());
+ rsDTO.setUpdateTime(new Date());
+ rsDTO.setCoordinateId(coordinateId);
+ manageCoordinateDetailMapper.insert(rsDTO);
+ j++;
+ log.info(j+"");
+ }
}
return 200;
}
--
Gitblit v1.8.0