BJ_FS / urbanops

Commit ec3fa013adf0db9659c5801926d2b152a80e6a04

Authored by 颜惠青
1 parent b99e1d46

创建工单事务问题，工单表部门信息改为二级部门

Inline Side-by-side
Showing 9 changed files with 16 additions and 9 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java
  View file @ec3fa01
@@ -132,7 +132,7 @@ public class AIBuzStatusUpdateAspect { @@ -132,7 +132,7 @@ public class AIBuzStatusUpdateAspect {
132 if(null == roadStreetRespDTO){ 132 if(null == roadStreetRespDTO){
133 throw exception(APP_WORK_ROAD_NOT_EXISTS); 133 throw exception(APP_WORK_ROAD_NOT_EXISTS);
134 } 134 }
135 - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 135 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
136 targeVO.setStreetId(roadStreetRespDTO.getStreetId()); 136 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
137 targeVO.setStreetName(roadStreetRespDTO.getStreetName()); 137 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
138 targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 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 @ec3fa01
@@ -135,7 +135,7 @@ public class BuzStatusUpdateAspect { @@ -135,7 +135,7 @@ public class BuzStatusUpdateAspect {
135 targeVO.setOrderNo(dbData.getOrderNo()); 135 targeVO.setOrderNo(dbData.getOrderNo());
136 targeVO.setStreetId(roadStreetRespDTO.getStreetId()); 136 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
137 targeVO.setStreetName(roadStreetRespDTO.getStreetName()); 137 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
138 - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 138 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
139 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); 139 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
140 if(null == dictData){ 140 if(null == dictData){
141 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); 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 @ec3fa01
@@ -104,7 +104,7 @@ public class InspectorBuzStatusUpdateAspect { @@ -104,7 +104,7 @@ public class InspectorBuzStatusUpdateAspect {
104 } 104 }
105 targeVO.setStreetId(roadStreetRespDTO.getStreetId()); 105 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
106 targeVO.setStreetName(roadStreetRespDTO.getStreetName()); 106 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
107 - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 107 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
108 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); 108 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
109 if(null == dictData){ 109 if(null == dictData){
110 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); 110 throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS);
@@ -140,7 +140,7 @@ public class InspectorBuzStatusUpdateAspect { @@ -140,7 +140,7 @@ public class InspectorBuzStatusUpdateAspect {
140 if(null == roadStreetRespDTO){ 140 if(null == roadStreetRespDTO){
141 throw exception(APP_WORK_ROAD_NOT_EXISTS); 141 throw exception(APP_WORK_ROAD_NOT_EXISTS);
142 } 142 }
143 - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 143 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
144 targeVO.setStreetId(roadStreetRespDTO.getStreetId()); 144 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
145 targeVO.setStreetName(roadStreetRespDTO.getStreetName()); 145 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
146 targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 146 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 @ec3fa01
@@ -98,7 +98,7 @@ public class UniversalBuzStatusUpdateAspect { @@ -98,7 +98,7 @@ public class UniversalBuzStatusUpdateAspect {
98 if(null == roadStreetRespDTO){ 98 if(null == roadStreetRespDTO){
99 throw exception(APP_WORK_ROAD_NOT_EXISTS); 99 throw exception(APP_WORK_ROAD_NOT_EXISTS);
100 } 100 }
101 - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 101 + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
102 targeVO.setStreetId(roadStreetRespDTO.getStreetId()); 102 targeVO.setStreetId(roadStreetRespDTO.getStreetId());
103 targeVO.setStreetName(roadStreetRespDTO.getStreetName()); 103 targeVO.setStreetName(roadStreetRespDTO.getStreetName());
104 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); 104 DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString());
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
  View file @ec3fa01
@@ -37,6 +37,7 @@ import jodd.util.StringUtil; @@ -37,6 +37,7 @@ import jodd.util.StringUtil;
37 import org.flowable.engine.RuntimeService; 37 import org.flowable.engine.RuntimeService;
38 import org.flowable.engine.runtime.ProcessInstance; 38 import org.flowable.engine.runtime.ProcessInstance;
39 import org.springframework.stereotype.Service; 39 import org.springframework.stereotype.Service;
  40 +import org.springframework.transaction.annotation.Transactional;
40 import org.springframework.validation.annotation.Validated; 41 import org.springframework.validation.annotation.Validated;
41 42
42 import java.time.LocalDateTime; 43 import java.time.LocalDateTime;
@@ -103,6 +104,7 @@ public class BpmAIServiceImpl implements BpmAIService{ @@ -103,6 +104,7 @@ public class BpmAIServiceImpl implements BpmAIService{
103 104
104 @Resource 105 @Resource
105 private DictDataCommonApi dictDataCommonApi; 106 private DictDataCommonApi dictDataCommonApi;
  107 + @Transactional(rollbackFor = Exception.class)
106 @Override 108 @Override
107 public Long createWorkOrder(AppGardenWorkOrderAIReqVO createRequestVo) { 109 public Long createWorkOrder(AppGardenWorkOrderAIReqVO createRequestVo) {
108 List<RoleRespVO> roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId()); 110 List<RoleRespVO> roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId());
@@ -125,7 +127,7 @@ public class BpmAIServiceImpl implements BpmAIService{ @@ -125,7 +127,7 @@ public class BpmAIServiceImpl implements BpmAIService{
125 if(null == roadStreetRespDTO){ 127 if(null == roadStreetRespDTO){
126 throw exception(APP_WORK_ROAD_NOT_EXISTS); 128 throw exception(APP_WORK_ROAD_NOT_EXISTS);
127 } 129 }
128 - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 130 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
129 workOrder.setStreetId(roadStreetRespDTO.getStreetId()); 131 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
130 workOrder.setStreetName(roadStreetRespDTO.getStreetName()); 132 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
131 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 133 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
  View file @ec3fa01
@@ -142,6 +142,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ @@ -142,6 +142,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
142 if(null == roadStreetRespDTO){ 142 if(null == roadStreetRespDTO){
143 throw exception(APP_WORK_ROAD_NOT_EXISTS); 143 throw exception(APP_WORK_ROAD_NOT_EXISTS);
144 } 144 }
  145 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
145 workOrder.setStreetId(roadStreetRespDTO.getStreetId()); 146 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
146 workOrder.setStreetName(roadStreetRespDTO.getStreetName()); 147 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
147 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 148 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
@@ -571,7 +572,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ @@ -571,7 +572,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
571 MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class) 572 MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
572 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); 573 .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
573 RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId()); 574 RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId());
574 - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 575 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
575 workOrder.setStreetId(roadStreetRespDTO.getStreetId()); 576 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
576 workOrder.setStreetName(roadStreetRespDTO.getStreetName()); 577 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
577 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 578 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
  View file @ec3fa01
@@ -38,6 +38,7 @@ import jodd.util.StringUtil; @@ -38,6 +38,7 @@ import jodd.util.StringUtil;
38 import org.flowable.engine.RuntimeService; 38 import org.flowable.engine.RuntimeService;
39 import org.flowable.engine.runtime.ProcessInstance; 39 import org.flowable.engine.runtime.ProcessInstance;
40 import org.springframework.stereotype.Service; 40 import org.springframework.stereotype.Service;
  41 +import org.springframework.transaction.annotation.Transactional;
41 import org.springframework.validation.annotation.Validated; 42 import org.springframework.validation.annotation.Validated;
42 43
43 import java.time.LocalDateTime; 44 import java.time.LocalDateTime;
@@ -105,6 +106,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ @@ -105,6 +106,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
105 @Resource 106 @Resource
106 private DictDataCommonApi dictDataCommonApi; 107 private DictDataCommonApi dictDataCommonApi;
107 @Override 108 @Override
  109 + @Transactional(rollbackFor = Exception.class)
108 public Long createWorkOrder(AppGardenWorkOrderInspectorReqVO createRequestVo) { 110 public Long createWorkOrder(AppGardenWorkOrderInspectorReqVO createRequestVo) {
109 List<RoleRespVO> roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId()); 111 List<RoleRespVO> roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId());
110 if(null == roleList || roleList.size()==0){ 112 if(null == roleList || roleList.size()==0){
@@ -126,7 +128,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ @@ -126,7 +128,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
126 if(null == roadStreetRespDTO){ 128 if(null == roadStreetRespDTO){
127 throw exception(APP_WORK_ROAD_NOT_EXISTS); 129 throw exception(APP_WORK_ROAD_NOT_EXISTS);
128 } 130 }
129 - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 131 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
130 workOrder.setStreetId(roadStreetRespDTO.getStreetId()); 132 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
131 workOrder.setStreetName(roadStreetRespDTO.getStreetName()); 133 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
132 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 134 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java
  View file @ec3fa01
@@ -109,7 +109,7 @@ public class BpmRegionMgrServiceImpl implements BpmRegionMgrService{ @@ -109,7 +109,7 @@ public class BpmRegionMgrServiceImpl implements BpmRegionMgrService{
109 if(null == roadStreetRespDTO){ 109 if(null == roadStreetRespDTO){
110 throw exception(APP_WORK_ROAD_NOT_EXISTS); 110 throw exception(APP_WORK_ROAD_NOT_EXISTS);
111 } 111 }
112 - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id 112 + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id
113 workOrder.setStreetId(roadStreetRespDTO.getStreetId()); 113 workOrder.setStreetId(roadStreetRespDTO.getStreetId());
114 workOrder.setStreetName(roadStreetRespDTO.getStreetName()); 114 workOrder.setStreetName(roadStreetRespDTO.getStreetName());
115 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 115 workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java
  View file @ec3fa01
@@ -38,6 +38,7 @@ import jodd.util.StringUtil; @@ -38,6 +38,7 @@ import jodd.util.StringUtil;
38 import org.flowable.engine.RuntimeService; 38 import org.flowable.engine.RuntimeService;
39 import org.flowable.engine.runtime.ProcessInstance; 39 import org.flowable.engine.runtime.ProcessInstance;
40 import org.springframework.stereotype.Service; 40 import org.springframework.stereotype.Service;
  41 +import org.springframework.transaction.annotation.Transactional;
41 import org.springframework.validation.annotation.Validated; 42 import org.springframework.validation.annotation.Validated;
42 43
43 import java.time.LocalDateTime; 44 import java.time.LocalDateTime;
@@ -106,6 +107,7 @@ public class BpmUniversalServiceImpl implements BpmUniversalService{ @@ -106,6 +107,7 @@ public class BpmUniversalServiceImpl implements BpmUniversalService{
106 @Resource 107 @Resource
107 private DictDataCommonApi dictDataCommonApi; 108 private DictDataCommonApi dictDataCommonApi;
108 @Override 109 @Override
  110 + @Transactional(rollbackFor = Exception.class)
109 public Long createWorkOrder(AppGardenWorkOrderUniversalReqVO createRequestVo) { 111 public Long createWorkOrder(AppGardenWorkOrderUniversalReqVO createRequestVo) {
110 List<String> problemsImgsList = createRequestVo.getProblemsImgs(); 112 List<String> problemsImgsList = createRequestVo.getProblemsImgs();
111 113