Merge remote-tracking branch 'origin/develop_master' into develop_master

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){

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;
+
+
+}

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;

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());
            }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java

@@ -279,4 +279,7 @@ public class SarLawsStandInfoPage extends BasePage {
     @TableField(exist = false)
     private String exportAllResult;
 
+    @TableField(exist = false)
+    private String syncParam;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandardsInfo.entity;
 
 import com.adc.da.sys.common.BasePage;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;
@@ -173,6 +174,16 @@ public class SarBussionessStandEOPage extends BasePage {
     private String exportAllAttrInfo;
     private String exportAllResult;
 
+    private String syncParam;
+
+    public String getSyncParam() {
+        return syncParam;
+    }
+
+    public void setSyncParam(String syncParam) {
+        this.syncParam = syncParam;
+    }
+
     public String getExportAllResult() {
         return exportAllResult;
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -91,6 +91,9 @@ public class SarStandardsInfoEOPage extends BasePage {
     private String orderBy1 = "SAR_STANDARDS_INFO.issue_time";
     private String order1 = "";
 
+    // syncParam == sync
+    private String syncParam;
+
     /**
      *     zhaokaiyao
      *     文本状态