FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:awc对接修改

Browse Source
This commit is contained in:
2510220824
2022-04-28 15:45:41 +08:00
parent 540d1ba218
commit 071937277b
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/controller/StandDataController.java
+7 -6
View File
@@ -9,6 +9,7 @@ import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
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.SearchStandResult;
import com.adc.da.slrs.regulations.entity.StandMessageCodeEnum;
@@ -71,16 +72,16 @@ public class StandDataController {
*/
@ApiOperation(value = "|regulations|标准查询列表接口")
@PostMapping("/searchStandData")
public String searchStandData(@RequestBody SearchStandContext searchStandContext){
public String searchStandData(@RequestBody SearchStandByVppsReqDTO searchStandContext){
String resultJson = "";
if(StringUtils.isEmpty(searchStandContext.getUid())
|| StringUtils.isEmpty(searchStandContext.getUsername())
|| StringUtils.isEmpty(searchStandContext.getVppsCode())){
return StandResult.toJson(StandResult.error(verifyObj(searchStandContext.getUid()),
if(StringUtils.isEmpty(searchStandContext.getData().getUid())
|| StringUtils.isEmpty(searchStandContext.getData().getUserName())
|| StringUtils.isEmpty(searchStandContext.getData().getVppsCode())){
return StandResult.toJson(StandResult.error(verifyObj(searchStandContext.getData().getUid()),
StandMessageCodeEnum.SOURCE.getCode(), StandMessageCodeEnum.ERROR_PARAM.getCode(),
"uid/username/vppsCode 为必填项"));
}
return iStandDataService.searchStandData(searchStandContext);
return iStandDataService.searchStandData(searchStandContext.getData());
}
private String verifyObj(String str){
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandByVppsReqDTO.java
+13
View File
@@ -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;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class SearchStandContext implements Serializable {
private String uid;
@ApiModelProperty(value = "用户ID")
private String username;
private String userName;
@ApiModelProperty(value = "VPPS码")
private String vppsCode;
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> i
standDataQuery.stream().peek(standData -> {
FileResult fileResult = new FileResult();
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);
}).collect(Collectors.toList());
}