lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
zt
2025-09-18 02:18:26 +08:00
parent caa134dfc4
commit 6d7aa8ca17
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/common/utils/JSTUtil.java
View File

@ -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;
}
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
View File

@ -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());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
View File

@ -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);

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
View File

@ -355,6 +355,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
}
}
lqw.orderByDesc(HseSafetyInspection::getCreateTime);
lqw.orderByDesc(HseSafetyInspection::getVersion);
return lqw;
}