diff --git a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java index e38e901..925b1cc 100644 --- a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java @@ -28,4 +28,8 @@ public class RoadStreetRespDTO { private Integer levelId; private Long companyId; + /** + * 道路负责部门 + */ + private Long deptId; } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java index 505fbb3..5233dca 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java @@ -132,6 +132,7 @@ public class AIBuzStatusUpdateAspect { if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java index 02e9f5d..ca772cf 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java @@ -33,6 +33,7 @@ import static com.zteits.urbanops.framework.common.exception.util.ServiceExcepti import static com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant.CONSERVE_LEVEL; import static com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant.ORDER_STATUS_INIT; import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.APP_WORKER_LEVEL_ID_NOT_EXISTS; +import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.APP_WORK_ROAD_NOT_EXISTS; /** * 类描述：切面更新工单表业务状态 @@ -122,6 +123,9 @@ public class BuzStatusUpdateAspect { //重新发起需更新表单数据 if(OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getCode().equals(operateType.getCode())){ RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(reqVO.getRoadId()); + if(null == roadStreetRespDTO){ + throw exception(APP_WORK_ROAD_NOT_EXISTS); + } targeVO = BeanUtils.toBean(reqVO,MainInfoDO.class); targeVO.setId(reqVO.getWorkerDataId()); @@ -131,6 +135,7 @@ public class BuzStatusUpdateAspect { targeVO.setOrderNo(dbData.getOrderNo()); targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); if(null == dictData){ throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java index 3693745..7300dc3 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java @@ -104,6 +104,7 @@ public class InspectorBuzStatusUpdateAspect { } targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); if(null == dictData){ throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); @@ -131,6 +132,7 @@ public class InspectorBuzStatusUpdateAspect { if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java index 6e14cef..377e37d 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java @@ -98,6 +98,7 @@ public class UniversalBuzStatusUpdateAspect { if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java index cf5d1c1..2e00a94 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java @@ -20,7 +20,7 @@ import jakarta.validation.Valid; public interface BpmAIService { /** - * 全域督察员工单申请 app service 接口 + * AI工单申请 app service 接口 * @param createRequestVo * @return */ diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java index 7192945..ad28d83 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java @@ -125,6 +125,7 @@ public class BpmAIServiceImpl implements BpmAIService{ if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java index 5f54d1e..fc1cb30 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java @@ -279,7 +279,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{ workerOrder.setCoHandlers(reqVO.getCoHandlers()); workerOrder.setWorkerId(SecurityFrameworkUtils.getLoginUserId()); workerOrder.setWorkerName(SecurityFrameworkUtils.getLoginUserNickname()); - workerOrder.setWorkerCompanyId(SecurityFrameworkUtils.getCompanyId()); + //取消登录人 改为创建或分配时的道路负责人部门 + //workerOrder.setWorkerCompanyId(SecurityFrameworkUtils.getCompanyId()); workOrderMapper.updateById(workerOrder); if(ObjectUtils.isNotAllEmpty(id) && ObjectUtils.isNotAllEmpty(problemsImgs) && problemsImgs.size()>0){ @@ -569,7 +570,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class) .setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId()); - + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java index 1c87bc5..095a477 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java @@ -125,6 +125,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java index 04d2af8..239ac71 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java @@ -108,6 +108,7 @@ public class BpmRegionMgrServiceImpl implements BpmRegionMgrService{ if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmProcessTaskAutoCompleteAIListener.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmProcessTaskAutoCompleteAIListener.java index 65aa787..d390b38 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmProcessTaskAutoCompleteAIListener.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmProcessTaskAutoCompleteAIListener.java @@ -29,6 +29,7 @@ public class BpmProcessTaskAutoCompleteAIListener extends BpmProcessInstanceStat @Override protected void onEvent(BpmProcessInstanceStatusEvent event) { log.info("业务ID:"+event.getBusinessKey()+",业务状态"+event.getStatus()); + // TODO 调用阿虎接口 传 event.getBusinessKey() gardenService.updateWorkOrderStatus(Long.parseLong(event.getBusinessKey()), event.getStatus()); }