AI工单代码优化问题单处理

颜惠青
1 parent a3fb4fa3
Showing 11 changed files with 21 additions and 3 deletions
urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmProcessTaskAutoCompleteAIListener.java
@@ -28,4 +28,8 @@ public class RoadStreetRespDTO {
     private Integer levelId;
     private Long companyId;
+    /**
+     * 道路负责部门
+     */
+    private Long deptId;
 }
@@ -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
@@ -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);
@@ -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
@@ -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());
@@ -20,7 +20,7 @@ import jakarta.validation.Valid;
 public interface BpmAIService {
     /**
-     * 全域督察员工单申请 app service 接口
+     * AI工单申请 app service 接口
      * @param createRequestVo
      * @return
      */
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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());
     }