update controller

src/main/java/com/zhiyun/project/item/controller/DeviceController.java

@@ -43,6 +43,13 @@ public class DeviceController  {
         return ApiResult.success(deviceService.getCoordinateData());
     }
 
+    @GetMapping("/te")
+    @Anonymous
+    public ApiResult te(double lat, double lon) {
+        return ApiResult.success(deviceService.convertCoordinates( lat,  lon));
+    }
+
+
 
 
 }

src/main/java/com/zhiyun/project/item/service/DeviceService.java

@@ -3,14 +3,12 @@ package com.zhiyun.project.item.service;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import com.zhiyun.common.utils.http.HttpUtils;
 import com.zhiyun.project.item.domain.entity.Device;
 import com.zhiyun.project.item.domain.vo.CoordinateVo;
 import com.zhiyun.project.item.domain.vo.DeviceVo;
 import com.zhiyun.project.item.domain.vo.OptionsVo;
 import com.zhiyun.project.item.mapper.DeviceMapper;
 import org.springframework.beans.BeanUtils;
-
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
@@ -18,17 +16,11 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import java.net.*;
-import java.io.*;
 @Service
 public class DeviceService extends ServiceImpl<DeviceMapper, Device> {
 
     public DeviceVo getDeviceData(Integer id){
-
-
-
         Device device = baseMapper.selectById(id);
-
         if(device == null)
             return null;
 
@@ -38,7 +30,7 @@ public class DeviceService extends ServiceImpl<DeviceMapper, Device> {
         LocalDateTime now = LocalDateTime.now();
         if(Duration.between(device.getLatestTime(), now).toMinutes() < 1){
             deviceVo.setStatue(1);
-        }else {
+        } else {
             deviceVo.setStatue(0);
         }
 
@@ -55,39 +47,25 @@ public class DeviceService extends ServiceImpl<DeviceMapper, Device> {
         }
 
         // 使用流式 API 转换 Device 列表为 CoordinateVo 列表
-        List<CoordinateVo> coordinateVoList = deviceList.stream().map(device -> {
-            // 创建 CoordinateVo 对象
+        return deviceList.stream().map(device -> {
             CoordinateVo coordinateVo = new CoordinateVo();
-
-            // 设置 deviceid
             coordinateVo.setDeviceid(device.getDeviceid());
-
-            // 设置 coordinate 数组，包含 x 和 y 坐标
             coordinateVo.setCoordinate(new Double[]{device.getX(), device.getY()});
 
-            // 获取当前时间
             LocalDateTime now = LocalDateTime.now();
-
-            // 判断 latestTime 和当前时间的差值
             if (Duration.between(device.getLatestTime(), now).toMinutes() < 1) {
                 coordinateVo.setStatue(1);
             } else {
                 coordinateVo.setStatue(0);
             }
 
-            // 返回处理后的 CoordinateVo 对象
             return coordinateVo;
-        }).collect(Collectors.toList());  // 收集成一个列表
-
-        // 返回 CoordinateVo 列表
-        return coordinateVoList;
+        }).collect(Collectors.toList());
     }
 
     public int insetDeviceData(JSONObject jsonObject) {
         // 创建 Device 实体对象
         Device device = new Device();
-
-        // 从jsonObject中获取值并设置到 Device 对象中
         device.setDeviceid(jsonObject.getString("deviceid"));
         device.setLat(jsonObject.getDouble("lat"));
         device.setLon(jsonObject.getDouble("lon"));
@@ -110,60 +88,68 @@ public class DeviceService extends ServiceImpl<DeviceMapper, Device> {
             return -1; // 如果转换失败，返回失败标志
         }
 
-        // 如果需要处理 latestTime 字段，可以设置为当前时间，或者从 JSON 中获取时间字段
-        // 这里暂时设置为当前时间
-        LocalDateTime now = LocalDateTime.now();  // 获取当前的 LocalDateTime
-        device.setLatestTime(now);  // 设置到 Device 对象中
+        // 设置当前时间
+        device.setLatestTime(LocalDateTime.now());
 
-        // 数据库操作判断
+        // 判断是否已有该设备记录，若无则插入新记录
         Device judgeObject = baseMapper.getDeviceById(device.getDeviceid());
         if (judgeObject == null) {
-            // 如果设备不存在，插入新设备
             return baseMapper.insert(device);
         } else {
-            // 如果设备已存在，更新设备信息
             device.setId(judgeObject.getId());
-            System.out.println("更新设备: " + device);
             return baseMapper.updateById(device);
         }
     }
 
-
     public List<OptionsVo> getDeviceOptions() {
-        return  baseMapper.getDeviceOptions();
+        return baseMapper.getDeviceOptions();
     }
 
-    private String[] convertCoordinates(double lat, double lon) {
-        // 高德API的Key
-        String apiKey = "3b37a2c8ae14c7d0382183bf94ddf654";
-        // 构造请求参数
-        String url = "https://restapi.amap.com/v3/assistant/coordinate/convert";
-        String param = "key=" + apiKey + "&locations=" + lon + "," + lat + "&coordsys=gps&output=JSON";
-
-        // 发送GET请求获取转换后的坐标
-        String response = HttpUtils.sendGet(url, param);
-        System.out.println("坐标转换响应: " + response);
-
-        try {
-            // 解析API返回的JSON响应
-            JSONObject jsonResponse = JSONObject.parseObject(response);
-            if ("1".equals(jsonResponse.getString("status"))) {
-                // 请求成功，获取转换后的坐标
-                String convertedLocations = jsonResponse.getString("locations"); // 转换后的坐标
-                return convertedLocations.split(",");
-            } else {
-                // 请求失败，打印错误信息
-                String errorMessage = jsonResponse.getString("info");
-                String errorCode = jsonResponse.getString("infocode");
-                System.out.println("坐标转换失败: " + errorMessage + " (错误码: " + errorCode + ")");
-                return null; // 转换失败
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null; // 出现异常时返回 null
+    // 坐标转换：WGS-84 到 GCJ-02
+    public String[] convertCoordinates(double lat, double lon) {
+        // 判断是否在中国境外
+        if (outOfChina(lat, lon)) {
+            return new String[]{String.valueOf(lon), String.valueOf(lat)}; // 如果在中国境外，直接返回原坐标
         }
+
+        // 计算坐标偏移量
+        double dLat = transformLat(lon - 105.0, lat - 35.0);
+        double dLon = transformLon(lon - 105.0, lat - 35.0);
+
+        // 根据偏移量调整经纬度
+        double radLat = lat / 180.0 * Math.PI;
+        double magic = Math.sin(radLat);
+        magic = 1 - 0.00669342162296594323 * magic * magic;
+        double sqrtMagic = Math.sqrt(magic);
+
+        dLat = (dLat * 180.0) / (6378245.0 * (1 - 0.00669342162296594323) / (magic * sqrtMagic) * Math.PI);
+        dLon = (dLon * 180.0) / (6378245.0 / sqrtMagic * Math.cos(radLat) * Math.PI);
+
+        double mgLat = lat + dLat;
+        double mgLon = lon + dLon;
+
+        return new String[]{String.valueOf(mgLon), String.valueOf(mgLat)};
     }
 
+    // 判断是否在中国境外
+    private boolean outOfChina(double lat, double lon) {
+        return lon < 72.004 || lon > 137.8347 || lat < 0.8293 || lat > 55.8271;
+    }
 
+    // 坐标转换公式
+    private double transformLat(double x, double y) {
+        double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+        ret += (20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0 / 3.0;
+        ret += (20.0 * Math.sin(y * Math.PI) + 40.0 * Math.sin(y / 3.0 * Math.PI)) * 2.0 / 3.0;
+        ret += (160.0 * Math.sin(y / 12.0 * Math.PI) + 320.0 * Math.sin(y * Math.PI / 30.0)) * 2.0 / 3.0;
+        return ret;
+    }
 
+    private double transformLon(double x, double y) {
+        double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+        ret += (20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0 / 3.0;
+        ret += (20.0 * Math.sin(x * Math.PI) + 40.0 * Math.sin(x / 3.0 * Math.PI)) * 2.0 / 3.0;
+        ret += (150.0 * Math.sin(x / 12.0 * Math.PI) + 300.0 * Math.sin(x / 30.0 * Math.PI)) * 2.0 / 3.0;
+        return ret;
+    }
 }