From 6d7aa8ca17daf000b2d1626bc7766bfe5ee7ab69 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Thu, 18 Sep 2025 02:18:26 +0800
Subject: [PATCH] bug

---
 .../java/org/dromara/common/utils/JSTUtil.java     | 14 ++++++++++++++
 .../service/impl/BusAttendanceServiceImpl.java     |  4 ++--
 .../impl/QltQualityInspectionServiceImpl.java      |  1 +
 .../impl/HseSafetyInspectionServiceImpl.java       |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/JSTUtil.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/JSTUtil.java
index d4db07b5..1dd23886 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/JSTUtil.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/JSTUtil.java
@@ -1,6 +1,8 @@
 package org.dromara.common.utils;
 
+import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import org.dromara.common.constant.GeoJsonConstant;
 import org.dromara.common.core.constant.HttpStatus;
@@ -355,4 +357,16 @@ public class JSTUtil {
         return geometryFactory.createPolygon(ring, null);
     }
 
+
+    public static String  getLocationName(String lat, String lng){
+        String a = lng+","+lat;
+        String s = HttpUtil.get("https://restapi.amap.com/v3/geocode/regeo?location=" + a + "&Key=2a769e5362ac9a7d7db12e85b640124c");
+         JSONObject jsonObject = JSONUtil.parseObj(s);
+        String address = null;
+         if(jsonObject.getInt("status") == 1){
+             address  = jsonObject.getJSONObject("regeocode").getStr("formatted_address");
+         }
+        return address;
+    }
+
 }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
index ea38acc5..2dd402f5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
@@ -317,7 +317,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     // 记录打卡坐标
                     attendance.setLat(req.getLat());
                     attendance.setLng(req.getLng());
-                    attendance.setClockLocation(req.getLocationName());
+                    attendance.setClockLocation(JSTUtil.getLocationName(req.getLat(), req.getLng()));
                     // 上传人脸照
                     SysOssVo upload = ossService.upload(file);
                     attendance.setFacePic(upload.getOssId().toString());
@@ -370,7 +370,7 @@ public class BusAttendanceServiceImpl extends ServiceImpl<BusAttendanceMapper, B
                     // 记录打卡坐标
                     attendance.setLat(req.getLat());
                     attendance.setLng(req.getLng());
-                    attendance.setClockLocation(req.getLocationName());
+                    attendance.setClockLocation(JSTUtil.getLocationName(req.getLat(), req.getLng()));
                     // 上传人脸照
                     SysOssVo upload = ossService.upload(file);
                     attendance.setFacePic(upload.getOssId().toString());
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
index c6771763..3d8dab63 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
@@ -351,6 +351,7 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl<QltQualityInspe
         Long rectificationId = req.getRectificationId();
         // 精确查询
         lqw.orderByDesc(QltQualityInspection::getCreateTime);
+        lqw.orderByDesc(QltQualityInspection::getVersion);
         lqw.eq(StringUtils.isNotBlank(inspectionType), QltQualityInspection::getInspectionType, inspectionType);
         lqw.eq(StringUtils.isNotBlank(rectificationUnit), QltQualityInspection::getRectificationUnit, rectificationUnit);
         lqw.eq(ObjectUtils.isNotEmpty(projectId), QltQualityInspection::getProjectId, projectId);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
index ff0671ba..32e10288 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
@@ -355,6 +355,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
             }
         }
         lqw.orderByDesc(HseSafetyInspection::getCreateTime);
+        lqw.orderByDesc(HseSafetyInspection::getVersion);
         return lqw;
     }