Commit 15f03222 authored by LiuLin's avatar LiuLin

fix(ymt):顺序码service实现类删除,改用Feign调用

parent 6e004f22
...@@ -13,12 +13,12 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper; ...@@ -13,12 +13,12 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper; import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService; import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
import com.yeejoin.amos.boot.module.ymt.api.common.BaseException; import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.workflow.Workflow; import com.yeejoin.amos.feign.workflow.Workflow;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO; import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
...@@ -36,6 +36,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext; ...@@ -36,6 +36,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -54,9 +55,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J ...@@ -54,9 +55,6 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
private static final String SUBMIT_TYPE_FLOW = "1"; private static final String SUBMIT_TYPE_FLOW = "1";
@Autowired @Autowired
private ICreateCodeService iCreateCodeService;
@Autowired
JgEquipTransferEqMapper jgEquipTransferEqMapper; JgEquipTransferEqMapper jgEquipTransferEqMapper;
@Autowired @Autowired
...@@ -68,6 +66,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J ...@@ -68,6 +66,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
@Autowired @Autowired
RedisUtils redisUtils; RedisUtils redisUtils;
@Autowired
TzsServiceFeignClient tzsServiceFeignClient;
@Transactional(rollbackFor = {Exception.class, BaseException.class}) @Transactional(rollbackFor = {Exception.class, BaseException.class})
public void saveOrUpdateModel(String submitType, JgEquipTransferDto model, ReginParams reginParams) { public void saveOrUpdateModel(String submitType, JgEquipTransferDto model, ReginParams reginParams) {
String[] taskName = new String[]{"流程结束"}; String[] taskName = new String[]{"流程结束"};
...@@ -80,8 +81,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J ...@@ -80,8 +81,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
} }
// 获取设备移交顺序号 // 获取设备移交顺序号
List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SBYJ.getCode(), deviceList.size()); ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBYJ.getCode(), deviceList.size());
if (CollectionUtils.isEmpty(applyNoList)) { if (CollectionUtils.isEmpty(responseModel.getResult())) {
return; return;
} }
ArrayList<String> roleListFirst = new ArrayList<>(); ArrayList<String> roleListFirst = new ArrayList<>();
...@@ -150,7 +151,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J ...@@ -150,7 +151,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,J
JgEquipTransfer dto = new JgEquipTransfer(); JgEquipTransfer dto = new JgEquipTransfer();
BeanUtils.copyProperties(model, dto); BeanUtils.copyProperties(model, dto);
int i = deviceList.indexOf(obj); int i = deviceList.indexOf(obj);
String applyNo = applyNoList.get(i); String applyNo = responseModel.getResult().get(i);
dto.setApplyNo(applyNo); dto.setApplyNo(applyNo);
dto.setApplyDate(new Date()); dto.setApplyDate(new Date());
......
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