Skip to content

A
amos-boot-biz
Commit a9dfd92c authored by LiuLin's avatar LiuLin
Browse files
Options

fix(jg):设备移交代码提交，代码bug修改

parent 8a41dc76
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 54 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgEquipTransferService.java
View file @ a9dfd92c
......@@ -34,12 +34,4 @@ public interface IJgEquipTransferService extends IService<JgEquipTransfer> {
* @return 设备移交详情
*/
Map<String, Object> queryBySequenceNbr(Long sequenceNbr);
/**
* 保存设备移交接口
* @param submitType 按钮类型
* @param dto dto
* @param selectedOrgInfo reginParams
*/
void saveEquipTransfer(String submitType, Map<String, JgEquipTransferDto> dto, ReginParams selectedOrgInfo);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEquipTransferController.java
View file @ a9dfd92c
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.yeejoin.amos.boot.module.jg.api.common.BaseException;
import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
import com.yeejoin.amos.component.feign.utils.FeignUtil;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
......@@ -132,7 +131,7 @@ public class JgEquipTransferController extends BaseController {
String companyCode = companyModels.get(0).getCompanyCode();
String companyName = companyModels.get(0).getCompanyName();
Map<String, Object> map = new HashMap<>();
if("个人主体".equals(companyType)){
if ("个人主体".equals(companyType)) {
map.put("useUnitName", companyName.split("_")[1]);
map.put("useUnitCreditCode", companyCode.split("_")[1]);
map.put("companyType", "person");
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEquipTransferServiceImpl.java
View file @ a9dfd92c
......@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
......@@ -30,14 +29,15 @@ import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.text.ParseException;
import java.util.*;
import java.util.stream.Collectors;
......@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
*/
@Slf4j
@Service
public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
private static final String EQUIP_TRANSFER_PROCESS_KEY = "equipmentHandover";
private static final String SUBMIT_TYPE_FLOW = "1";
......@@ -80,20 +80,26 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
return;
}
// 获取设备移交顺序号
ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBYJ.getCode(), deviceList.size());
if (CollectionUtils.isEmpty(responseModel.getResult())) {
return;
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBYJ.getCode(), deviceList.size());
if (!org.springframework.util.ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
log.error("告知单获取失败: {}", listResponseModel.getMessage());
throw new BadRequest("告知单生成失败！");
}
List<String> applyNoList = listResponseModel.getResult();
if (CollectionUtils.isEmpty(applyNoList)) {
log.error("告知单返回为空");
throw new BadRequest("告知单生成失败！");
}
ArrayList<String> roleListFirst = new ArrayList<>();
ArrayList<String> roleListSecond = new ArrayList<>();
// 判断当前是否为提交
List<String> instanceIdList = new ArrayList<>();
ArrayList<String> instanceIdList = new ArrayList<>();
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
// 发起流程
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
List<ActWorkflowStartDTO> list = new ArrayList<>();
for (int i = 0; i<deviceList.size() ; i++
for (int i = 0; i < deviceList.size(); i++
) {
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
......@@ -105,14 +111,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
try {
FeignClientResult result = Workflow.taskV2Client.startByVariableBatch(actWorkflowBatchDTO);
List<Object> returnList = (List<Object>) result.getResult();
for (Object obj :returnList
for (Object obj : returnList
) {
JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(obj));
JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(obj));
String instanceId = jsonObject.getString("id");
instanceIdList.add(instanceId);
// 查询下节点任务
if(returnList.get(0).equals(obj)) {
getNext(roleListFirst, instanceId,taskName);
if (returnList.get(0).equals(obj)) {
getNext(roleListFirst, instanceId, taskName);
}
// 推动下一个节点
AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
......@@ -131,7 +137,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
try {
ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
if (ajaxResult1.get("code").equals(200)) {
getNext(roleListSecond, instanceId,taskName);
getNext(roleListSecond, instanceId, taskName);
} else {
log.error("提交失败");
}
......@@ -151,11 +157,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
JgEquipTransfer dto = new JgEquipTransfer();
BeanUtils.copyProperties(model, dto);
int i = deviceList.indexOf(obj);
String applyNo = responseModel.getResult().get(i);
String applyNo = applyNoList.get(i);
dto.setApplyNo(applyNo);
dto.setApplyDate(new Date());
if(SUBMIT_TYPE_FLOW.equals(submitType)) {
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
dto.setNextExecuteIds(String.join(",", roleListSecond));
dto.setInstanceStatus(String.join(",", roleListFirst));
dto.setPromoter(reginParams.getUserModel().getUserId());
......@@ -216,6 +222,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
/**
* 启动工作流
*
* @param businessKey businessKey
* @return s
* @throws Exception e
......@@ -248,7 +255,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
equipTransferDto.setApplyStatusDesc(FlowStatusEnum.getNameByType(Long.valueOf(transfer.getApplyStatus())));
}
return equipTransferDto;
}).collect(java.util.stream.Collectors.toList());
}).collect(Collectors.toList());
equipTransferDtoPage.setRecords(records);
return equipTransferDtoPage;
......@@ -277,13 +284,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
resultMap.putAll(equipTransferInfo);
resultMap.putAll(equipmentInfos.get(0));
resultMap.putAll(createEquipTransferInfo(equipTransfer));
return resultMap;
}
@Override
@Transactional(rollbackFor = {Exception.class, BaseException.class})
public void saveEquipTransfer(String submitType, Map<String, JgEquipTransferDto> dto, ReginParams selectedOrgInfo) {
String[] taskName = new String[]{"流程结束"};
return resultMap;
}
private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
......@@ -303,23 +304,15 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
String userId = RequestContext.getExeUserId();
JgEquipTransfer jgEquipTransfer = this.baseMapper.selectById(jgEquipTransferDto.getSequenceNbr());
jgEquipTransfer.setProcessAdvice(jgEquipTransferDto.getProcessAdvice());
// 组装设备注册代码
StringBuffer stringBuffer = new StringBuffer();
String ym = null;
try {
ym = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN_MM);
} catch (ParseException e) {
log.error("日期转换失败：{}", e.getMessage());
}
ArrayList<String> roleList = new ArrayList<>();
boolean submit = submit(jgEquipTransfer, op);
if(submit) {
getNext(roleList, jgEquipTransferDto.getInstanceId(),taskName);
if (submit) {
getNext(roleList, jgEquipTransferDto.getInstanceId(), taskName);
jgEquipTransfer.setApplyStatus(taskName[0]);
if("0".equals(op)) {
if(roleList.isEmpty()) {
if ("0".equals(op)) {
if (roleList.isEmpty()) {
jgEquipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
jgEquipTransfer.setPromoter("");
} else {
......@@ -341,7 +334,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
}
}
public boolean submit(JgEquipTransfer transfer,String op) {
public boolean submit(JgEquipTransfer transfer, String op) {
AjaxResult ajaxResult = Workflow.taskClient.getTask(transfer.getInstanceId());
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
String taskId = dataObject.getString("id");
......@@ -354,7 +347,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
map.put("approvalStatus", op);
dto.setVariable(map);
//执行流程
AjaxResult ajaxResult1 = null;
AjaxResult ajaxResult1;
try {
ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
return ajaxResult1.get("code").equals(200);
......@@ -396,7 +389,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
equipTransferDto.setInstanceId(instanceId);
// 查询下节点任务
getNext(roleListFirst, instanceId,taskName);
getNext(roleListFirst, instanceId, taskName);
equipTransferDto.setInstanceStatus(String.join(",", roleListFirst));
} catch (Exception e) {
log.error("提交失败：{}", e.getMessage());
......@@ -404,13 +397,13 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
}
}
JgEquipTransfer transfer = new JgEquipTransfer();
BeanUtils.copyProperties(equipTransferDto,transfer);
BeanUtils.copyProperties(equipTransferDto, transfer);
boolean submit = submit(transfer, op);
if(submit) {
if (submit) {
// 查询下节点任务
getNext(roleListSecond, transfer.getInstanceId(),taskName);
getNext(roleListSecond, transfer.getInstanceId(), taskName);
transfer.setApplyStatus(taskName[0]);
if (!org.springframework.util.ObjectUtils.isEmpty(transfer.getInstanceStatus())) {
transfer.setInstanceStatus(transfer.getInstanceStatus() + "," + roleListSecond);
......
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