BJ_FS / urbanops

Commit d586265e55690a7ae19874eec99957b8cf8df56e

Authored by 颜惠青
1 parent a3fb4fa3

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

Inline Side-by-side
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
  View file @d586265
... ... @@ -28,4 +28,8 @@ public class RoadStreetRespDTO {
28 28 private Integer levelId;
29 29  
30 30 private Long companyId;
  31 + /**
  32 + * 道路负责部门
  33 + */
  34 + private Long deptId;
31 35 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java
  View file @d586265
... ... @@ -132,6 +132,7 @@ public class AIBuzStatusUpdateAspect {
132 132 if(null == roadStreetRespDTO){
133 133 throw exception(APP_WORK_ROAD_NOT_EXISTS);
134 134 }
  135 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
135 136 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
136 137 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
137 138 targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java
  View file @d586265
... ... @@ -33,6 +33,7 @@ import static com.zteits.urbanops.framework.common.exception.util.ServiceExcepti
33 33 import static com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant.CONSERVE_LEVEL;
34 34 import static com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant.ORDER_STATUS_INIT;
35 35 import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.APP_WORKER_LEVEL_ID_NOT_EXISTS;
  36 +import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.APP_WORK_ROAD_NOT_EXISTS;
36 37  
37 38 /**
38 39 * 类描述：切面更新工单表业务状态
... ... @@ -122,6 +123,9 @@ public class BuzStatusUpdateAspect {
122 123 //重新发起需更新表单数据
123 124 if(OperateTypeEnum.YL_INSPECTOR_START_RELAUNCH.getCode().equals(operateType.getCode())){
124 125 RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(reqVO.getRoadId());
  126 + if(null == roadStreetRespDTO){
  127 + throw exception(APP_WORK_ROAD_NOT_EXISTS);
  128 + }
125 129 targeVO = BeanUtils.toBean(reqVO,MainInfoDO.class);
126 130 targeVO.setId(reqVO.getWorkerDataId());
127 131  
... ... @@ -131,6 +135,7 @@ public class BuzStatusUpdateAspect {
131 135 targeVO.setOrderNo(dbData.getOrderNo());
132 136 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
133 137 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
  138 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
134 139 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
135 140 if(null == dictData){
136 141 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS);
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java
  View file @d586265
... ... @@ -104,6 +104,7 @@ public class InspectorBuzStatusUpdateAspect {
104 104 }
105 105 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
106 106 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
  107 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
107 108 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
108 109 if(null == dictData){
109 110 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS);
... ... @@ -131,6 +132,7 @@ public class InspectorBuzStatusUpdateAspect {
131 132 if(null == roadStreetRespDTO){
132 133 throw exception(APP_WORK_ROAD_NOT_EXISTS);
133 134 }
  135 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
134 136 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
135 137 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
136 138 targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java
  View file @d586265
... ... @@ -98,6 +98,7 @@ public class UniversalBuzStatusUpdateAspect {
98 98 if(null == roadStreetRespDTO){
99 99 throw exception(APP_WORK_ROAD_NOT_EXISTS);
100 100 }
  101 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
101 102 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
102 103 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
103 104 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java
  View file @d586265
... ... @@ -20,7 +20,7 @@ import jakarta.validation.Valid;
20 20 public interface BpmAIService {
21 21  
22 22 /**
23   - * 全域督察员工单申请 app service 接口
  23 + * AI工单申请 app service 接口
24 24 * @param createRequestVo
25 25 * @return
26 26 */
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
  View file @d586265
... ... @@ -125,6 +125,7 @@ public class BpmAIServiceImpl implements BpmAIService{
125 125 if(null == roadStreetRespDTO){
126 126 throw exception(APP_WORK_ROAD_NOT_EXISTS);
127 127 }
  128 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
128 129 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
129 130 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
130 131 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @d586265
... ... @@ -279,7 +279,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
279 279 workerOrder.setCoHandlers(reqVO.getCoHandlers());
280 280 workerOrder.setWorkerId(SecurityFrameworkUtils.getLoginUserId());
281 281 workerOrder.setWorkerName(SecurityFrameworkUtils.getLoginUserNickname());
282   - workerOrder.setWorkerCompanyId(SecurityFrameworkUtils.getCompanyId());
  282 + //取消登录人 改为创建或分配时的道路负责人部门
  283 + //workerOrder.setWorkerCompanyId(SecurityFrameworkUtils.getCompanyId());
283 284 workOrderMapper.updateById(workerOrder);
284 285  
285 286 if(ObjectUtils.isNotAllEmpty(id) && ObjectUtils.isNotAllEmpty(problemsImgs) && problemsImgs.size()>0){
... ... @@ -569,7 +570,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
569 570 MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
570 571 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
571 572 RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId());
572   -
  573 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
573 574 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
574 575 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
575 576 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
  View file @d586265
... ... @@ -125,6 +125,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
125 125 if(null == roadStreetRespDTO){
126 126 throw exception(APP_WORK_ROAD_NOT_EXISTS);
127 127 }
  128 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
128 129 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
129 130 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
130 131 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java
  View file @d586265
... ... @@ -108,6 +108,7 @@ public class BpmRegionMgrServiceImpl implements BpmRegionMgrService{
108 108 if(null == roadStreetRespDTO){
109 109 throw exception(APP_WORK_ROAD_NOT_EXISTS);
110 110 }
  111 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id
111 112 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
112 113 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
113 114 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmProcessTaskAutoCompleteAIListener.java
  View file @d586265
... ... @@ -29,6 +29,7 @@ public class BpmProcessTaskAutoCompleteAIListener extends BpmProcessInstanceStat
29 29 @Override
30 30 protected void onEvent(BpmProcessInstanceStatusEvent event) {
31 31 log.info("业务ID:"+event.getBusinessKey()+",业务状态"+event.getStatus());
  32 + // TODO 调用阿虎接口 传 event.getBusinessKey()
32 33 gardenService.updateWorkOrderStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());
33 34  
34 35 }
... ...