From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 68 +++++----------------------------
1 files changed, 11 insertions(+), 57 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
index aadd097..4014d11 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -1,7 +1,6 @@
package org.sxkj.gd.workorder.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -13,11 +12,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.sxkj.common.constant.CommonConstant;
import org.sxkj.common.constant.WordOrderConstant;
-import org.sxkj.common.utils.AmapUtils;
import org.sxkj.common.utils.GeomUtils;
import org.sxkj.common.utils.OrderNumUtils;
+import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
@@ -35,7 +33,9 @@
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.system.cache.SysCache;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 工单任务表 服务实现类
@@ -61,7 +61,7 @@
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
if (gdWorkOrder.getIsQueryAll()) {
List<Long> deptList = new ArrayList<>();
- if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
+ if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
}
gdWorkOrder.setDeptList(deptList);
@@ -97,8 +97,8 @@
if (centerCoords == null || centerCoords.length < 2) {
return false;
}
- String areaCodePrefix = getDistrictCodeByLocation(centerCoords[0], centerCoords[1]);
- entity.setAreaCode(areaCodePrefix);
+ String countyCode = GdGeoAddressUtil.getTownCode(centerCoords[0], centerCoords[1]);
+ entity.setAreaCode(countyCode);
// 生成工单编号
if (StringUtils.isBlank(entity.getWorkOrderCode())) {
String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
@@ -243,13 +243,14 @@
boolean updateResult = updateById(workOrder);
// 5. 把待验收的都改为待签收状态
+ // 修复类型不匹配问题:将 String 转为 Integer,因为数据库字段是 smallint 类型
if (operationType == 10) {
return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
- .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
+ .set(GdPatrolTaskEntity::getTaskStatus, Integer.parseInt(PatrolTaskStatusEnum.PENDING_SIGNING.getValue()))
.eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
.in(GdPatrolTaskEntity::getTaskStatus,
- PatrolTaskStatusEnum.AUDIT_PASSED.getValue(),
- PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
+ Integer.parseInt(PatrolTaskStatusEnum.AUDIT_PASSED.getValue()),
+ Integer.parseInt(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue()))
);
}
// 6. 保存流转记录
@@ -269,52 +270,5 @@
}
return false;
- }
-
- /**
- * 根据经纬度获取行政区划编码
- *
- * @param longitude 经度
- * @param latitude 纬度
- * @return 行政区划编码
- */
- public String getDistrictCodeByLocation(double longitude, double latitude) {
- Map<String, String> districtInfo = getDistrictInfoByLocation(longitude, latitude);
- String adcode = districtInfo.get("adcode");
- log.info("行政区划信息：{}", adcode);
- // if (adcode != null && adcode.length() >= 3) {
- // return adcode.substring(0, 2);
- // }
- return adcode;
- }
-
- /**
- * 根据经纬度获取行政区划信息
- *
- * @param longitude 经度
- * @param latitude 纬度
- * @return 行政区划信息
- */
- public Map<String, String> getDistrictInfoByLocation(double longitude, double latitude) {
- // 使用高德地图工具类获取行政区划信息
- String location = longitude + "," + latitude;
- JSONObject result = AmapUtils.searchByLatLng(location);
-
- Map<String, String> districtInfo = new HashMap<>();
- if (result != null && "1".equals(result.getString("status"))) {
- JSONObject regeocode = result.getJSONObject("regeocode");
- if (regeocode != null) {
- JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
- if (addressComponent != null) {
- districtInfo.put("province", addressComponent.getString("province"));
- districtInfo.put("city", addressComponent.getString("city"));
- districtInfo.put("district", addressComponent.getString("district"));
- districtInfo.put("adcode", addressComponent.getString("adcode"));
- districtInfo.put("township", addressComponent.getString("township"));
- districtInfo.put("formatted_address", regeocode.getString("formatted_address"));
- }
- }
- }
- return districtInfo;
}
}
--
Gitblit v1.9.3