From 1510366fa12fafd5197ebcd8d7fbc45d2383218d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 15:49:27 +0800
Subject: [PATCH] 设备管理优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 199 +++++++++++++++++++++++++++++++------------------
1 files changed, 127 insertions(+), 72 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 a9f098b..85bb990 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,23 +1,8 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.sxkj.gd.workorder.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -29,8 +14,10 @@
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.GeomUtils;
import org.sxkj.common.utils.OrderNumUtils;
+import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
+import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -38,6 +25,7 @@
import org.sxkj.gd.workorder.param.WorkOrderAddParam;
import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
+import org.sxkj.gd.workorder.service.IGdPatrolTaskService;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
@@ -57,6 +45,13 @@
@Autowired
private IGdWorkOrderFlowService gdWorkOrderFlowService;
+ @Autowired
+ private IGdPatrolTaskService gdPatrolTaskService;
+
+ @Override
+ public GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
+ return baseMapper.getWorkOrderDetail(gdWorkOrder);
+ }
@Override
public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
@@ -67,7 +62,7 @@
@Override
public List<GdWorkOrderExcel> exportGdWorkOrder(Wrapper<GdWorkOrderEntity> queryWrapper) {
List<GdWorkOrderExcel> gdWorkOrderList = baseMapper.exportGdWorkOrder(queryWrapper);
- //gdWorkOrderList.forEach(gdWorkOrder -> {
+ // gdWorkOrderList.forEach(gdWorkOrder -> {
// gdWorkOrder.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdWorkOrder.getType()));
//});
return gdWorkOrderList;
@@ -75,111 +70,171 @@
/**
* 保存工单任务表
+ *
* @param workOrderParam
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean saveWorkOrder(WorkOrderAddParam workOrderParam) {
- GdWorkOrderEntity entity = Objects.requireNonNull(BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class));
+ public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
+ // 参数转换
+ GdWorkOrderEntity entity = BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class);
// 验证并格式化几何数据
- String geom = entity.getGeom();
- String validatedGeom = GeomUtils.validateAndFormatGeom(geom);
+ String validatedGeom = GeomUtils.validateAndFormatGeom(entity.getGeom());
if (validatedGeom == null) {
return false;
}
-
- // 设置验证后的几何数据
entity.setGeom(validatedGeom);
// 生成工单编号
if (StringUtils.isBlank(entity.getWorkOrderCode())) {
- // 使用时间戳生成唯一工单编号
String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);
entity.setWorkOrderCode(WordOrderConstant.ORDER_PREFIX + timestamp);
}
- entity.setCreateUser(AuthUtil.getUserId());
- entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
- boolean save = save(entity);
- // 保存成功
- if (save){
- // 保存流转记录
- GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
- gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
- gdWorkOrderFlowEntity.setWorkOrderId(entity.getId());
- gdWorkOrderFlowEntity.setFlowName(WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getStageDesc());
- gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
- gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
- gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
- gdWorkOrderFlowEntity.setAreaCode(entity.getAreaCode());
- gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
- boolean save1 = gdWorkOrderFlowService.save(gdWorkOrderFlowEntity);
- return save1;
+ // 保存操作
+ Integer saveResult;
+ Date now = new Date();
+ 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());
+ break;
+ case "20": // 响应中_待拆分 → 响应中_申请修改
+ case "25": // 响应中_拒绝修改 → 响应中_申请修改
+ entity.setWorkOrderStatus(WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getCode());
+ break;
+ }
+ saveResult = baseMapper.updateWorkOrderById(entity);
+ } else {
+ // 新增操作
+ entity.setCreateUser(AuthUtil.getUserId());
+ entity.setCreateTime(now);
+ entity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ entity.setStatus(1);
+ entity.setIsDeleted(0);
+ saveResult = baseMapper.saveWorkOrder(entity);
}
+
+ // 保存成功则保存流转记录
+ if (saveResult > 0) {
+ // 构建并保存流转记录
+ 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.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
+ flowEntity.setAreaCode(entity.getAreaCode());
+ flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ return gdWorkOrderFlowService.save(flowEntity);
+ }
+
return false;
}
/**
* 处理工单状态变更（接单或拒接接单）
+ *
* @param statusParam
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean handleWorkOrderStatus(WorkOrderStatusParam statusParam) {
- // 获取工单信息
+ // 1. 获取工单信息
GdWorkOrderEntity workOrder = getById(statusParam.getWorkOrderId());
if (workOrder == null) {
return false;
}
- // 检查工单当前状态是否为发布中_接单中（10）
- if (!workOrder.getWorkOrderStatus().equals(WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getCode())) {
- return false;
- }
-
- // 操作类型：1接单，2拒接接单
+ // 2. 状态权限校验
+ WorkOrderStatusEnum currentStatus = WorkOrderStatusEnum.getByCode(workOrder.getWorkOrderStatus());
Integer operationType = statusParam.getOperationType();
- Byte newStatus = null;
- String flowName = null;
- String flowDesc = null;
-
- if (operationType == 1) {
- // 接单操作：更新状态为响应中_待拆分（20）
- newStatus = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT.getCode();
- flowName = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT.getStageDesc();
- flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), CommonConstant.YYYY_MM_DD_HH_MM_SS);
- } else if (operationType == 2) {
- // 拒接接单操作：更新状态为发布中_拒绝接单（11）
- newStatus = WorkOrderStatusEnum.PUBLISHING_REJECTING.getCode();
- flowName = WorkOrderStatusEnum.PUBLISHING_REJECTING.getStageDesc();
- flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), CommonConstant.YYYY_MM_DD_HH_MM_SS) ;
- } else {
- // 无效的操作类型
+ if (currentStatus == null || !currentStatus.isAllowedOperation(operationType)) {
return false;
}
+ // 1接单，2拒接接单，3申请取消，4申请修改， 5同意取消 6不同意取消 7.同意修改 8.不同意修改 9.协商修改 10.同意修改
+ // 3. 确定新状态和流转名称
+ WorkOrderStatusEnum newStatusEnum;
+ switch (operationType) {
+ case 1: // 接单
+ case 7: // 同意修改
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
+ workOrder.setServiceParty(AuthUtil.getNickName());
+ break;
+ case 2: // 拒接接单
+ newStatusEnum = WorkOrderStatusEnum.PUBLISHING_REJECTING;
+ workOrder.setServiceParty(AuthUtil.getNickName());
+ break;
+ case 3: // 申请取消
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL;
+ break;
+ case 4: // 申请修改
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY;
+ break;
+ case 5: // 同意取消
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_CANCELED;
+ workOrder.setServiceParty(AuthUtil.getNickName());
+ break;
+ case 6: // 不同意取消
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_CANCEL;
+ break;
+ case 8: // 不同意修改
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_REJECT_MODIFY;
+ workOrder.setServiceParty(AuthUtil.getNickName());
+ break;
+ case 9: // 协商修改 --> 协商修改
+ newStatusEnum = WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY;
+ workOrder.setServiceParty(AuthUtil.getNickName());
+ break;
+ case 10: // 同意协商修改 --> 待拆分
+ newStatusEnum = WorkOrderStatusEnum.RESPONDING_TO_BE_SPLIT;
+ break;
+ default: // 无效操作类型
+ return false;
+ }
- // 更新工单状态
- workOrder.setWorkOrderStatus(newStatus);
+ // 4. 更新工单状态
+ Date now = new Date();
+ workOrder.setWorkOrderStatus(newStatusEnum.getCode());
workOrder.setUpdateUser(AuthUtil.getUserId());
- workOrder.setUpdateTime(new Date());
- boolean update = updateById(workOrder);
+ workOrder.setGeom(null);
+ workOrder.setUpdateTime(now);
+ workOrder.setRejectReason(statusParam.getRejectReason());
+ boolean updateResult = updateById(workOrder);
- // 更新成功，保存流转记录
- if (update) {
+ // 5. 保存流转记录
+ if (updateResult) {
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrder.getId());
- flowEntity.setFlowName(flowName);
- flowEntity.setFlowDesc(flowDesc);
+ 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.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
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;
}
--
Gitblit v1.9.3