From 071937277bb10601358f45c65ac18ce3474ba565 Mon Sep 17 00:00:00 2001
From: 2510220824 <2510220824@qq.com>
Date: Thu, 28 Apr 2022 15:45:41 +0800
Subject: [PATCH] =?UTF-8?q?update:awc=E5=AF=B9=E6=8E=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulations/controller/StandDataController.java | 13 +++++++------
 .../regulations/entity/SearchStandByVppsReqDTO.java | 13 +++++++++++++
 .../slrs/regulations/entity/SearchStandContext.java |  2 +-
 .../service/impl/StandDataServiceImpl.java          |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandByVppsReqDTO.java

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/controller/StandDataController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/controller/StandDataController.java
index f8a64cb0..d660ee8d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/controller/StandDataController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/controller/StandDataController.java
@@ -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){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandByVppsReqDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandByVppsReqDTO.java
new file mode 100644
index 00000000..00712a12
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandByVppsReqDTO.java
@@ -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;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
index 32df4b99..d0d0d0cd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/entity/SearchStandContext.java
@@ -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;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
index aa7e520a..a07b2742 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
@@ -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());
            }