update:awc对接修改
This commit is contained in:
+7
-6
@@ -9,6 +9,7 @@ import com.adc.da.http.PageInfo;
|
|||||||
import com.adc.da.http.ResponseMessage;
|
import com.adc.da.http.ResponseMessage;
|
||||||
import com.adc.da.http.Result;
|
import com.adc.da.http.Result;
|
||||||
import com.adc.da.person.service.IPersonCollectEOService;
|
import com.adc.da.person.service.IPersonCollectEOService;
|
||||||
|
import com.adc.da.slrs.regulations.entity.SearchStandByVppsReqDTO;
|
||||||
import com.adc.da.slrs.regulations.entity.SearchStandContext;
|
import com.adc.da.slrs.regulations.entity.SearchStandContext;
|
||||||
import com.adc.da.slrs.regulations.entity.SearchStandResult;
|
import com.adc.da.slrs.regulations.entity.SearchStandResult;
|
||||||
import com.adc.da.slrs.regulations.entity.StandMessageCodeEnum;
|
import com.adc.da.slrs.regulations.entity.StandMessageCodeEnum;
|
||||||
@@ -71,16 +72,16 @@ public class StandDataController {
|
|||||||
*/
|
*/
|
||||||
@ApiOperation(value = "|regulations|标准查询列表接口")
|
@ApiOperation(value = "|regulations|标准查询列表接口")
|
||||||
@PostMapping("/searchStandData")
|
@PostMapping("/searchStandData")
|
||||||
public String searchStandData(@RequestBody SearchStandContext searchStandContext){
|
public String searchStandData(@RequestBody SearchStandByVppsReqDTO searchStandContext){
|
||||||
String resultJson = "";
|
String resultJson = "";
|
||||||
if(StringUtils.isEmpty(searchStandContext.getUid())
|
if(StringUtils.isEmpty(searchStandContext.getData().getUid())
|
||||||
|| StringUtils.isEmpty(searchStandContext.getUsername())
|
|| StringUtils.isEmpty(searchStandContext.getData().getUserName())
|
||||||
|| StringUtils.isEmpty(searchStandContext.getVppsCode())){
|
|| StringUtils.isEmpty(searchStandContext.getData().getVppsCode())){
|
||||||
return StandResult.toJson(StandResult.error(verifyObj(searchStandContext.getUid()),
|
return StandResult.toJson(StandResult.error(verifyObj(searchStandContext.getData().getUid()),
|
||||||
StandMessageCodeEnum.SOURCE.getCode(), StandMessageCodeEnum.ERROR_PARAM.getCode(),
|
StandMessageCodeEnum.SOURCE.getCode(), StandMessageCodeEnum.ERROR_PARAM.getCode(),
|
||||||
"uid/username/vppsCode 为必填项"));
|
"uid/username/vppsCode 为必填项"));
|
||||||
}
|
}
|
||||||
return iStandDataService.searchStandData(searchStandContext);
|
return iStandDataService.searchStandData(searchStandContext.getData());
|
||||||
}
|
}
|
||||||
|
|
||||||
private String verifyObj(String str){
|
private String verifyObj(String str){
|
||||||
|
|||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
package com.adc.da.slrs.regulations.entity;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class SearchStandByVppsReqDTO implements Serializable {
|
||||||
|
|
||||||
|
public SearchStandContext Data;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
+1
-1
@@ -20,7 +20,7 @@ public class SearchStandContext implements Serializable {
|
|||||||
private String uid;
|
private String uid;
|
||||||
|
|
||||||
@ApiModelProperty(value = "用户ID")
|
@ApiModelProperty(value = "用户ID")
|
||||||
private String username;
|
private String userName;
|
||||||
|
|
||||||
@ApiModelProperty(value = "VPPS码")
|
@ApiModelProperty(value = "VPPS码")
|
||||||
private String vppsCode;
|
private String vppsCode;
|
||||||
|
|||||||
+1
-1
@@ -42,7 +42,7 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> i
|
|||||||
standDataQuery.stream().peek(standData -> {
|
standDataQuery.stream().peek(standData -> {
|
||||||
FileResult fileResult = new FileResult();
|
FileResult fileResult = new FileResult();
|
||||||
fileResult.setDocumentName(verifyObj(standData.getStandSort(),standData.getStandNumber(),standData.getStandName()));
|
fileResult.setDocumentName(verifyObj(standData.getStandSort(),standData.getStandNumber(),standData.getStandName()));
|
||||||
fileResult.setDocumentUrl(webUrl+"?userName="+encode(searchStandContext.getUsername())+"&dataId="+standData.getStandId()+"&datatype="+standData.getStandType());
|
fileResult.setDocumentUrl(webUrl+"?userName="+encode(searchStandContext.getUserName())+"&dataId="+standData.getStandId()+"&datatype="+standData.getStandType());
|
||||||
fileResultList.add(fileResult);
|
fileResultList.add(fileResult);
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user