Commit a84acbda authored by 赵啸非's avatar 赵啸非

修改配置文件

parent 6c1b42db
......@@ -61,7 +61,7 @@ public class WXHXPJYXKFRBG extends ComplexWindowAbstract {
List<FileDataItem> fileCollect = commonData.getFileData().stream().map(item -> {
FileDataItem fileDataItem = new FileDataItem();
BeanUtils.copyProperties(item, fileDataItem);
String downloadPath = commonData.getRobertServerUrl() + item.getFileUrl();
String downloadPath = commonData.getRobertServerUrl()+"aiCase/download?fileUrl=" + item.getFileUrl();
byte[] bytes = HttpUtil.downloadBytes(downloadPath);
fileDataItem.setBytes(bytes);
......@@ -100,6 +100,9 @@ public class WXHXPJYXKFRBG extends ComplexWindowAbstract {
ChildrenItem childrenItem = matterWorkInfo.getChildren().stream().filter(f -> "变更法人".equals(f.getLabel())).findFirst().orElseGet(() -> null);
if (!ObjectUtils.isEmpty(childrenItem)) {
String situationItemId = childrenItem.getSituationItemId();
acceptReq.getItemsIds().add(situationItemId);
//构建受理材料附件
List<MaterialsItem> materialsItemList = childrenItem.getMaterials().stream().map(item -> {
MaterialsItem materialsItem = new MaterialsItem();
......@@ -149,11 +152,11 @@ public class WXHXPJYXKFRBG extends ComplexWindowAbstract {
acceptReq.setLegalProxy(legalProxy);
Rest<AcceptRspInfo> acceptRest = complexMatterService.accept(commonData.getDeviceLogo(), acceptReq);
Rest<List<AcceptRspInfo>> acceptRest = complexMatterService.accept(commonData.getDeviceLogo(), acceptReq);
log.info("受理返回==>{}", JSON.toJSONString(acceptRest));
if (acceptRest.getCode() == YesNoEnum.YES.getValue()) {
log.info("操作成功==>{}", JSON.toJSONString(acceptRest));
}
}
......
package com.lilosoft.complex.matter.model.req;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -10,7 +11,7 @@ import lombok.Data;
public class AcceptReq{
private ApplicantLeagal applicantLegal;
private Object agency;
private List<String> itemsIds;
private List<String> itemsIds=new ArrayList<>();
private List<MaterialsItem> materials;
private String isStaging;
private ApplicantPersonal applicantPersonal;
......
......@@ -47,7 +47,7 @@ public interface IComplexMatterService extends IComplexService {
* @param acceptReq
* @return
*/
Rest<AcceptRspInfo> accept(String deviceLogo,AcceptReq acceptReq);
Rest<List<AcceptRspInfo>> accept(String deviceLogo,AcceptReq acceptReq);
/**
* 查询可受理事项
......
......@@ -74,7 +74,7 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
}
@Override
public Rest<AcceptRspInfo> accept(String deviceLogo, AcceptReq acceptReq) {
public Rest<List<AcceptRspInfo>> accept(String deviceLogo, AcceptReq acceptReq) {
String deviceLoginApi = host + "self-device-info/acceptHandling";
log.info("accept req==>{}",JSON.toJSONString(acceptReq));
......@@ -84,7 +84,9 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
.header("X-Access-Token", deviceToken)
.body(JSON.toJSONString(acceptReq))
.execute().body();
ComplexApiRest<AcceptRspInfo> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<AcceptRspInfo>>() {
log.info("accept resp==>{}",rest);
ComplexApiRest<List<AcceptRspInfo>> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<List<AcceptRspInfo>>>() {
});
if (complexApiRest.getCode() == 200) {
return Rest.ok(complexApiRest.getMessage(), complexApiRest.getResult());
......
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