From f3104f14213028277c883e19301b820ae724bd70 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 05 Jun 2026 10:18:08 +0800
Subject: [PATCH] feat(utils): 添加几何数据处理和区域编码转换功能
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 161 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 120 insertions(+), 41 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 85bb990..aadd097 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,8 +1,11 @@
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;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -12,6 +15,7 @@
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.workorder.entity.GdPatrolTaskEntity;
@@ -29,10 +33,9 @@
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
+import org.sxkj.system.cache.SysCache;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 工单任务表 服务实现类
@@ -40,6 +43,7 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@Service
public class GdWorkOrderServiceImpl extends BaseServiceImpl<GdWorkOrderMapper, GdWorkOrderEntity> implements IGdWorkOrderService {
@@ -49,12 +53,19 @@
private IGdPatrolTaskService gdPatrolTaskService;
@Override
- public GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
+ public GdWorkOrderVO getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
return baseMapper.getWorkOrderDetail(gdWorkOrder);
}
@Override
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
+ if (gdWorkOrder.getIsQueryAll()) {
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
+ gdWorkOrder.setDeptList(deptList);
+ }
return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
}
@@ -68,12 +79,6 @@
return gdWorkOrderList;
}
- /**
- * 保存工单任务表
- *
- * @param workOrderParam
- * @return
- */
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
@@ -87,6 +92,13 @@
}
entity.setGeom(validatedGeom);
+ // 从几何数据中提取中心点坐标，用于获取行政区划编码
+ double[] centerCoords = GeomUtils.extractCenterPoint(validatedGeom);
+ if (centerCoords == null || centerCoords.length < 2) {
+ return false;
+ }
+ String areaCodePrefix = getDistrictCodeByLocation(centerCoords[0], centerCoords[1]);
+ entity.setAreaCode(areaCodePrefix);
// 生成工单编号
if (StringUtils.isBlank(entity.getWorkOrderCode())) {
String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
@@ -94,27 +106,29 @@
}
// 保存操作
- Integer saveResult;
+ Boolean saveResult;
Date now = new Date();
+ WorkOrderStatusEnum newStatusEnum = WorkOrderStatusEnum.PUBLISHING_ACCEPTING;
if (entity.getId() != null) {
// 更新操作
entity.setUpdateUser(AuthUtil.getUserId());
entity.setUpdateTime(now);
-
// 状态转换：拒绝状态修改后自动转换为待处理状态
switch (entity.getWorkOrderStatus()) {
case "11": // 发布中_拒绝接单 → 发布中_接单中
entity.setWorkOrderStatus(WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getCode());
- break;
- case "24": // 响应中_拒绝取消 → 响应中_申请取消
- entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getCode());
+ newStatusEnum = WorkOrderStatusEnum.PUBLISHING_ACCEPTING;
break;
case "20": // 响应中_待拆分 → 响应中_申请修改
- case "25": // 响应中_拒绝修改 → 响应中_申请修改
entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
+ // 生成快照
+ GdWorkOrderEntity orderEntity = baseMapper.getWorkOrderByIdWithoutGeom(entity.getId());
+ // 直接生成快照，无需处理geom字段
+ entity.setFullSnapshot(JSON.toJSONString(orderEntity));
break;
}
- saveResult = baseMapper.updateWorkOrderById(entity);
+ saveResult = updateById(entity);
} else {
// 新增操作
entity.setCreateUser(AuthUtil.getUserId());
@@ -122,19 +136,21 @@
entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
entity.setStatus(1);
entity.setIsDeleted(0);
- saveResult = baseMapper.saveWorkOrder(entity);
+ saveResult = save(entity);
}
// 保存成功则保存流转记录
- if (saveResult > 0) {
+ if (saveResult) {
// 构建并保存流转记录
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(entity.getId());
- flowEntity.setFlowName(WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getStageDesc());
- flowEntity.setFlowDesc(String.format("%s %s", AuthUtil.getUserName(), org.springblade.core.tool.utils.DateUtil.format(now, "yyyy-MM-dd HH:mm:ss")));
- flowEntity.setOperator(AuthUtil.getUserName());
+ flowEntity.setFlowName(newStatusEnum.getStageDesc());
+ flowEntity.setFlowDesc(newStatusEnum.getDesc());
+ flowEntity.setOperator(AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
+ flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
+ flowEntity.setWorkStatus(newStatusEnum.getCode());
flowEntity.setAreaCode(entity.getAreaCode());
flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
@@ -164,7 +180,7 @@
if (currentStatus == null || !currentStatus.isAllowedOperation(operationType)) {
return false;
}
- // 1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改
+ // 1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改 11.结算
// 3. 确定新状态和流转名称
WorkOrderStatusEnum newStatusEnum;
switch (operationType) {
@@ -188,10 +204,10 @@
workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 6: // 不同意取消
- newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
break;
case 8: // 不同意修改
- newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
workOrder.setServiceParty(AuthUtil.getNickName());
break;
case 9: // 协商修改 --> 协商修改
@@ -201,41 +217,104 @@
case 10: // 同意协商修改 --> 待拆分
newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
break;
+ case 11: // 结算 --> 结算完成
+ newStatusEnum = WorkOrderStatusEnum.SETTLEMENT_COMPLETED;
+ break;
default: // 无效操作类型
return false;
}
// 4. 更新工单状态
Date now = new Date();
- workOrder.setWorkOrderStatus(newStatusEnum.getCode());
- workOrder.setUpdateUser(AuthUtil.getUserId());
- workOrder.setGeom(null);
- workOrder.setUpdateTime(now);
- workOrder.setRejectReason(statusParam.getRejectReason());
+ if (operationType == 8) {
+ // 不同意修改，需要把快照回滚
+ GdWorkOrderEntity snapshotEntity = (GdWorkOrderEntity) JSON.parseObject(workOrder.getFullSnapshot(), GdWorkOrderEntity.class);
+ snapshotEntity.setId(workOrder.getId()); // 保持原ID
+ snapshotEntity.setUpdateUser(AuthUtil.getUserId());
+ snapshotEntity.setUpdateTime(now);
+ workOrder = snapshotEntity;
+ } else {
+ workOrder.setWorkOrderStatus(newStatusEnum.getCode());
+ workOrder.setUpdateUser(AuthUtil.getUserId());
+ workOrder.setUpdateTime(now);
+ workOrder.setGeom(null);
+ workOrder.setRejectReason(statusParam.getRejectReason());
+ }
boolean updateResult = updateById(workOrder);
- // 5. 保存流转记录
+ // 5. 把待验收的都改为待签收状态
+ if (operationType == 10) {
+ return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
+ .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
+ .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
+ .in(GdPatrolTaskEntity::getTaskStatus,
+ PatrolTaskStatusEnum.AUDIT_PASSED.getValue(),
+ PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
+ );
+ }
+ // 6. 保存流转记录
if (updateResult) {
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrder.getId());
flowEntity.setFlowName(newStatusEnum.getStageDesc());
- flowEntity.setFlowDesc(String.format("%s %s", AuthUtil.getUserName(), org.springblade.core.tool.utils.DateUtil.format(now, CommonConstant.YYYY_MM_DD_HH_MM_SS)));
- flowEntity.setOperator(AuthUtil.getUserName());
+ flowEntity.setFlowDesc(newStatusEnum.getDesc());
+ flowEntity.setOperator(AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
+ flowEntity.setFlowStatus(newStatusEnum.getMaxCode());
+ flowEntity.setWorkStatus(newStatusEnum.getCode());
flowEntity.setAreaCode(workOrder.getAreaCode());
flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
}
- // 6. 把待验收的都改为待签收状态
- if (operationType == 10) {
- boolean update = gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
- .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
- .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
- .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
- );
- }
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