Commit 1593b666 authored by chenzhao's avatar chenzhao

代码提交

parent 7c35b6ba
...@@ -8,7 +8,8 @@ import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails; ...@@ -8,7 +8,8 @@ import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper; import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService; import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService;
import com.yeejoin.amos.maintenance.common.remote.RemoteWorkFlowService;
import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -36,6 +37,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -36,6 +37,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
@Autowired @Autowired
private RemoteWorkFlowService remoteWorkFlowService; private RemoteWorkFlowService remoteWorkFlowService;
// @Autowired
// private RemoteSecurityService remoteSecurityService;
@Value("${params.work.flow.processDefinitionKey}") @Value("${params.work.flow.processDefinitionKey}")
private String processDefinitionKey; private String processDefinitionKey;
*/ */
...@@ -70,23 +74,23 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -70,23 +74,23 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
/** /**
* 发起故障保修单 * 发起故障保修单
*/ */
/* public CommonResponse savemodel(FailureDetailsDto failureDetailsDto) { // public CommonResponse savemodel(FailureDetailsDto failureDetailsDto) {
String businessKey = RandomUtil.buildOrderNo(); // String businessKey = RandomUtil.buildOrderNo();
JSONObject jsonObject = remoteWorkFlow.start( businessKey, processDefinitionKey); // JSONObject jsonObject = remoteWorkFlow.start( businessKey, processDefinitionKey);
if (jsonObject == null) { // if (jsonObject == null) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); // TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return CommonResponseUtil.failure("启动流程失败"); // return CommonResponseUtil.failure("启动流程失败");
} // }
JSONObject instance = jsonObject.getJSONObject("data"); // JSONObject instance = jsonObject.getJSONObject("data");
if(instance==null){ // if(instance==null){
return CommonResponseUtil.failure("无提交隐患权限"); // return CommonResponseUtil.failure("无提交隐患权限");
} // }
failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode()); // failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode());
FailureDetailsDto model = this.createWithModel(failureDetailsDto); // FailureDetailsDto model = this.createWithModel(failureDetailsDto);
//
sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment()); // sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
return CommonResponseUtil.success(model); // return CommonResponseUtil.success(model);
}*/ // }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment