From b98c8291bdf1a9edcc6f109904bd56ebdcdb5a0e Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 28 Jul 2021 09:07:48 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/att/controller/AttFileEOController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
index f49b116c..4e7d55e0 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
@@ -280,9 +280,9 @@ public class AttFileEOController {
                     userMsg += tsUser.getWorkNum() + ",";
                 }
             }
-//            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
-//            String date = df.format(new Date());
-            String waterContent = userMsg ;
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
+            String date = df.format(new Date());
+            String waterContent = userMsg+date ;
             //2020年9月5日  去掉水印处理
             //2021年7月25日要求下载生成水印
             WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);

From 6dc14af762c7056f2b7ef6077553cf747b31fada Mon Sep 17 00:00:00 2001
From: zzy <2041873787@qq.com>
Date: Wed, 28 Jul 2021 14:05:11 +0800
Subject: [PATCH 2/8] =?UTF-8?q?update=EF=BC=9A=E4=BF=AE=E6=94=B9sql?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListController.java    |  4 +--
 .../dao/SarLawsAttrDetailedListDao.java       |  2 ++
 .../SarLawsAttrDetailedListMapper.xml         | 26 +++++++++++++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
index 5d291bee..254106fd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
@@ -135,9 +135,9 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
             if (CollectionUtils.isEmpty(standExcelVo.getIds())){
                 List<String> list=  sarLawsAttrDetailedListDao.selectLawsId2(standExcelVo.getId());
                 if (CollectionUtils.isEmpty(list)) return;
-                data=sarLawsAttrDetailedListDao.selectLawsById(list,null);
+                data=sarLawsAttrDetailedListDao.selectLawsByIdE(list);
             }else {
-                data=sarLawsAttrDetailedListDao.selectLawsById(standExcelVo.getIds(),null);
+                data=sarLawsAttrDetailedListDao.selectLawsByIdE(standExcelVo.getIds());
             }
             //适用车型
             Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
index 361864bd..baffd3c1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java
@@ -25,6 +25,8 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetail
     List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size);
     //根据标准id查出数据
     List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("sarFindDto") SarFindDto sarFindDto);
+    //用于导出
+    List<LawsDto> selectLawsByIdE(@Param("param1") List<String> LawsIds);
     //根据标准id查出数据
     List<LawsDto> selectLawsByIdC(@Param("param1") List<String> LawsIds, @Param("standName") String standName,@Param("standType")String standType);
     //查询时间
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index cd8f823e..eedd123f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -3,13 +3,13 @@
 <mapper namespace="com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao">
 
     <select id="selectLawsById" parameterType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,
-               b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType
+        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+               b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
+               a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
         a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
         dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
         <where>
-        <if test="sarFindDto !=null">
             <if test="sarFindDto.standName != null">
                 (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')
                 or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')
@@ -38,7 +38,22 @@
                 b.SYCPX LIKE concat ('%',#{sarFindDto.SYCPX,jdbcType=VARCHAR},'%')
                 and
             </if>
-        </if>
+            a.ID IN
+            <foreach collection="param1" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+
+    </select>
+
+    <select id="selectLawsByIdE" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
+        SELECT a.ID,a.STAND_NUMBER as standNumber,a.STAND_NAME  as standName,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+        b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow,
+        a.STAND_YEAR as standYear,ISSUE_TIME as issueTime,a.STAND_TYPE as standType
+        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
+        a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
+        <where>
             a.ID IN
             <foreach collection="param1" item="item" open="(" separator="," close=")">
                 #{item}
@@ -69,7 +84,8 @@
         order by number
     </select>
     <select id="selectLawsByIdC" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
-        SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable
+        SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQ as XCXSSRQGJ,b.ZCCSSRQ as ZCCSSRQGJ,
+               b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable
         FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
         a.ID = b.STAND_ID
         <where>

From 3adc08d17897062aeb247aa93e2c8265b328df82 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 28 Jul 2021 15:30:48 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/att/controller/AttFileEOController.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
index 4e7d55e0..ef5fb044 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
@@ -276,9 +276,10 @@ public class AttFileEOController {
             TsUser tsUser = userDao.selectById(userId);
             if (tsUser != null) {
                 userMsg = tsUser.getUname() + ",";
-                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
-                    userMsg += tsUser.getWorkNum() + ",";
-                }
+                //2021/7/28水印内容取消工号
+//                if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
+//                    userMsg += tsUser.getWorkNum() + ",";
+//                }
             }
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
             String date = df.format(new Date());

From de8f5631c0c0a7efde2195ecc6dfcaa16b74f4d5 Mon Sep 17 00:00:00 2001
From: 2510220824 <2510220824@qq.com>
Date: Wed, 28 Jul 2021 15:35:45 +0800
Subject: [PATCH 4/8] =?UTF-8?q?add:=E5=8D=87=E7=BA=A7es=E5=88=B07.6.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-search/pom.xml                         |   8 +-
 .../controller/SearchCenterController.java    |  33 +-
 .../impl/ElasticsearchServiceImpl.java        |  26 +-
 .../service/impl/SearchCenterServiceImpl.java |   6 +-
 adc-da-slrs/pom.xml                           |   6 +
 .../entity/SarStandardsInfo.java              | 404 ++++++++++++++++++
 .../impl/SarStandardsInfoServiceImpl.java     | 130 +++++-
 .../adc/da/slrs/search/SearchController.java  |  27 ++
 8 files changed, 609 insertions(+), 31 deletions(-)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java

diff --git a/adc-da-search/pom.xml b/adc-da-search/pom.xml
index 4c067f98..74c6571f 100644
--- a/adc-da-search/pom.xml
+++ b/adc-da-search/pom.xml
@@ -60,11 +60,11 @@
             <artifactId>adc-da-base</artifactId>
             <version>3.0.0</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.adc</groupId>
             <artifactId>adc-da-slrs</artifactId>
             <version>3.0.0</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.adc</groupId>
@@ -91,12 +91,12 @@
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>transport</artifactId>
-            <version>6.3.2</version>
+            <version>7.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>6.3.2</version>
+            <version>7.6.2</version>
         </dependency>
         <!-- 6.0版本es需添加此依赖，解决依赖冲突 -->
         <dependency>
diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
index d60a2cee..fb4b5ca4 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
@@ -4,21 +4,21 @@ import com.adc.da.base.web.BaseController;
 import com.adc.da.excel.poi.excel.ExcelExportUtil;
 import com.adc.da.excel.poi.excel.entity.ExportParams;
 import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
+import com.adc.da.exception.AdcDaBaseException;
 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.search.dto.*;
+import com.adc.da.search.dto.SearchBussExportDto;
+import com.adc.da.search.dto.SearchLawsExportDto;
+import com.adc.da.search.dto.SearchMsgExportDto;
+import com.adc.da.search.dto.SearchStandExportDto;
 import com.adc.da.search.entity.CommonSearchInfoEO;
 import com.adc.da.search.entity.SarAdvanceSearchVO;
 import com.adc.da.search.entity.SeniorSearchInfoEO;
 import com.adc.da.search.service.ElasticsearchService;
 import com.adc.da.search.service.SearchCenterService;
-import com.adc.da.exception.AdcDaBaseException;
-import com.adc.da.http.ResponseMessage;
-import com.adc.da.http.Result;
-import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu;
-import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
 import com.adc.da.util.IOUtils;
-
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,14 +26,25 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.elasticsearch.client.transport.TransportClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
+
 import static com.adc.da.sys.common.ReadExcelName.encodeFileName;
 
 @RestController
@@ -52,14 +63,14 @@ public class SearchCenterController extends BaseController<Map<String, Object>>
     @Autowired
     private ElasticsearchService elasticsearchService;
 
-    @Autowired
+    /*@Autowired
     private ITsDicTypeService iTsDictypeService;
 
     @ApiOperation("获取筛选条件")
     @PostMapping("/getMenu")
     public ResponseMessage<List<TsSearchMenu>> getSearchMenu(){
         return Result.success(iTsDictypeService.getSearchMenu());
-    }
+    }*/
 
     /**
      *
diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java
index 251abac1..3af95a89 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java
@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
 import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -19,6 +18,7 @@ import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.transport.TransportClient;
@@ -26,15 +26,13 @@ import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.reindex.BulkByScrollResponse;
-import org.elasticsearch.index.reindex.DeleteByQueryAction;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.bucket.range.Range;
 import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
-import org.elasticsearch.search.aggregations.metrics.avg.Avg;
-import org.elasticsearch.search.aggregations.metrics.max.Max;
+import org.elasticsearch.search.aggregations.metrics.Avg;
+import org.elasticsearch.search.aggregations.metrics.Max;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.slf4j.Logger;
@@ -43,7 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 @Component
 public class ElasticsearchServiceImpl implements ElasticsearchService {
@@ -89,7 +91,8 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
         if (!isIndexExist(index)) {
             logger.info("Index is not exits!");
         }
-        DeleteIndexResponse dResponse = client.admin().indices().prepareDelete(index).get();
+        AcknowledgedResponse dResponse = client.admin().indices().prepareDelete(index).get();
+
         if (dResponse.isAcknowledged()) {
             logger.info("delete index " + index + "  successfully!");
         } else {
@@ -184,13 +187,14 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
      */
     @Override
     public long deleteAllDataOfIndex(String index) {
-        BulkByScrollResponse response = DeleteByQueryAction.INSTANCE.newRequestBuilder(client)
+        /*BulkByScrollResponse response = DeleteByQueryAction.INSTANCE.newRequestBuilder(client)
                 .filter(QueryBuilders.matchAllQuery())
                 .source(index)
                 .get();
         //一共删除掉多少条
         long deleted = response.getDeleted();
-        return deleted;
+        return deleted;*/
+        return 0;
     }
 
     /**
@@ -390,7 +394,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
 
         SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
 
-        long totalHits = searchResponse.getHits().totalHits;
+        long totalHits = searchResponse.getHits().getTotalHits().value;
         long length = searchResponse.getHits().getHits().length;
 
         logger.info("共查询到[{}]条数据,处理数据条数[{}]", totalHits, length);
@@ -488,7 +492,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
         // 执行搜索,返回搜索响应信息
         SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
 
-        long totalHits = searchResponse.getHits().totalHits;
+        long totalHits = searchResponse.getHits().getTotalHits().value;
         long length = searchResponse.getHits().getHits().length;
 
         logger.debug("共查询到[{}]条数据,处理数据条数[{}]", totalHits, length);
diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
index 6a2fd4a1..30b27b89 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
@@ -807,7 +807,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         // 获取查询到的结果
         SearchResponse response = searchRequestBuilder.get();
         result = SearchResponseToList(response);
-        searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits());
+        searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value);
         Map<String, Aggregation>  aggmap = response.getAggregations().asMap();
         if (!result.isEmpty()) {
             for (int i = 0; i < seniortype.length; i++) {
@@ -1158,7 +1158,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
 //            }
             result.add(sourceAsMap);
         }
-        searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits());
+        searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value);
         return result;
     }
 
@@ -1243,7 +1243,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
             }
             result.add(sourceAsMap);
         }
-        searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits());
+        searchInfoEO.getPager().setRowCount((int) response.getHits().getTotalHits().value);
         return result;
     }
 
diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml
index 62b2d5da..cb647b83 100644
--- a/adc-da-slrs/pom.xml
+++ b/adc-da-slrs/pom.xml
@@ -35,6 +35,12 @@
             <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.adc</groupId>
+            <artifactId>adc-da-search</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
 
 
         <!-- poi -->
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
index f61bd816..62c545e5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
@@ -191,5 +191,409 @@ public class SarStandardsInfo extends BaseEntity {
 
     @TableField(exist = false)
     private String standSystemName;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getStandType() {
+        return standType;
+    }
+
+    public void setStandType(String standType) {
+        this.standType = standType;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getStandSort() {
+        return standSort;
+    }
+
+    public void setStandSort(String standSort) {
+        this.standSort = standSort;
+    }
+
+    public String getStandNumber() {
+        return standNumber;
+    }
+
+    public void setStandNumber(String standNumber) {
+        this.standNumber = standNumber;
+    }
+
+    public String getStandYear() {
+        return standYear;
+    }
+
+    public void setStandYear(String standYear) {
+        this.standYear = standYear;
+    }
+
+    public String getStandName() {
+        return standName;
+    }
+
+    public void setStandName(String standName) {
+        this.standName = standName;
+    }
+
+    public String getStandEnName() {
+        return standEnName;
+    }
+
+    public void setStandEnName(String standEnName) {
+        this.standEnName = standEnName;
+    }
+
+    public String getStandState() {
+        return standState;
+    }
+
+    public void setStandState(String standState) {
+        this.standState = standState;
+    }
+
+    public String getStandNature() {
+        return standNature;
+    }
+
+    public void setStandNature(String standNature) {
+        this.standNature = standNature;
+    }
+
+    public String getIssueTime() {
+        return issueTime;
+    }
+
+    public void setIssueTime(String issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    public Date getPutTime() {
+        return putTime;
+    }
+
+    public void setPutTime(Date putTime) {
+        this.putTime = putTime;
+    }
+
+    public String getSynopsis() {
+        return synopsis;
+    }
+
+    public void setSynopsis(String synopsis) {
+        this.synopsis = synopsis;
+    }
+
+    public String getReplaceStandNum() {
+        return replaceStandNum;
+    }
+
+    public void setReplaceStandNum(String replaceStandNum) {
+        this.replaceStandNum = replaceStandNum;
+    }
+
+    public String getReplacedStandNum() {
+        return replacedStandNum;
+    }
+
+    public void setReplacedStandNum(String replacedStandNum) {
+        this.replacedStandNum = replacedStandNum;
+    }
+
+    public String getCreationUser() {
+        return creationUser;
+    }
+
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public Date getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getIsRelateAccess() {
+        return isRelateAccess;
+    }
+
+    public void setIsRelateAccess(String isRelateAccess) {
+        this.isRelateAccess = isRelateAccess;
+    }
+
+    public String getCiteStand() {
+        return citeStand;
+    }
+
+    public void setCiteStand(String citeStand) {
+        this.citeStand = citeStand;
+    }
+
+    public String getCitedStand() {
+        return citedStand;
+    }
+
+    public void setCitedStand(String citedStand) {
+        this.citedStand = citedStand;
+    }
+
+    public String getTextStatus() {
+        return textStatus;
+    }
+
+    public void setTextStatus(String textStatus) {
+        this.textStatus = textStatus;
+    }
+
+    public String getStandSystem() {
+        return standSystem;
+    }
+
+    public void setStandSystem(String standSystem) {
+        this.standSystem = standSystem;
+    }
+
+    public String getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(String collectId) {
+        this.collectId = collectId;
+    }
+
+    public String getCountryShow() {
+        return countryShow;
+    }
+
+    public void setCountryShow(String countryShow) {
+        this.countryShow = countryShow;
+    }
+
+    public String getStandSortShow() {
+        return standSortShow;
+    }
+
+    public void setStandSortShow(String standSortShow) {
+        this.standSortShow = standSortShow;
+    }
+
+    public String getStandStateShow() {
+        return standStateShow;
+    }
+
+    public void setStandStateShow(String standStateShow) {
+        this.standStateShow = standStateShow;
+    }
+
+    public String getStandNatureShow() {
+        return standNatureShow;
+    }
+
+    public void setStandNatureShow(String standNatureShow) {
+        this.standNatureShow = standNatureShow;
+    }
+
+    public String getSychronId() {
+        return sychronId;
+    }
+
+    public void setSychronId(String sychronId) {
+        this.sychronId = sychronId;
+    }
+
+    public List<DicTypeEO> getDicTypeList() {
+        return dicTypeList;
+    }
+
+    public void setDicTypeList(List<DicTypeEO> dicTypeList) {
+        this.dicTypeList = dicTypeList;
+    }
+
+    public List<SarStandAttrDetails> getAttrInfoList() {
+        return attrInfoList;
+    }
+
+    public void setAttrInfoList(List<SarStandAttrDetails> attrInfoList) {
+        this.attrInfoList = attrInfoList;
+    }
+
+    public Map<String, Object> getAttrInfoMap() {
+        return attrInfoMap;
+    }
+
+    public void setAttrInfoMap(Map<String, Object> attrInfoMap) {
+        this.attrInfoMap = attrInfoMap;
+    }
+
+    public Map<String, Object> getAttrInfoCaseMap() {
+        return attrInfoCaseMap;
+    }
+
+    public void setAttrInfoCaseMap(Map<String, Object> attrInfoCaseMap) {
+        this.attrInfoCaseMap = attrInfoCaseMap;
+    }
+
+    public String getSarStandAttrEOStr() {
+        return sarStandAttrEOStr;
+    }
+
+    public void setSarStandAttrEOStr(String sarStandAttrEOStr) {
+        this.sarStandAttrEOStr = sarStandAttrEOStr;
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public int getUpReplaceNumFlag() {
+        return upReplaceNumFlag;
+    }
+
+    public void setUpReplaceNumFlag(int upReplaceNumFlag) {
+        this.upReplaceNumFlag = upReplaceNumFlag;
+    }
+
+    public int getUpNumFlag() {
+        return upNumFlag;
+    }
+
+    public void setUpNumFlag(int upNumFlag) {
+        this.upNumFlag = upNumFlag;
+    }
+
+    public String getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(String fileIds) {
+        this.fileIds = fileIds;
+    }
+
+    public Date getNewCarPutTime() {
+        return newCarPutTime;
+    }
+
+    public void setNewCarPutTime(Date newCarPutTime) {
+        this.newCarPutTime = newCarPutTime;
+    }
+
+    public List<SarStandItems> getItemsList() {
+        return itemsList;
+    }
+
+    public void setItemsList(List<SarStandItems> itemsList) {
+        this.itemsList = itemsList;
+    }
+
+    public String getRelateStand() {
+        return relateStand;
+    }
+
+    public void setRelateStand(String relateStand) {
+        this.relateStand = relateStand;
+    }
+
+    public String getAccessCountry() {
+        return accessCountry;
+    }
+
+    public void setAccessCountry(String accessCountry) {
+        this.accessCountry = accessCountry;
+    }
+
+    public String getProcessNum() {
+        return processNum;
+    }
+
+    public void setProcessNum(String processNum) {
+        this.processNum = processNum;
+    }
+
+    public String getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType) {
+        this.menuType = menuType;
+    }
+
+    public String getAllPutTime() {
+        return allPutTime;
+    }
+
+    public void setAllPutTime(String allPutTime) {
+        this.allPutTime = allPutTime;
+    }
+
+    public String getJspg() {
+        return jspg;
+    }
+
+    public void setJspg(String jspg) {
+        this.jspg = jspg;
+    }
+
+    public String getCHJL() {
+        return CHJL;
+    }
+
+    public void setCHJL(String CHJL) {
+        this.CHJL = CHJL;
+    }
+
+    public String getPutTime2() {
+        return putTime2;
+    }
+
+    public void setPutTime2(String putTime2) {
+        this.putTime2 = putTime2;
+    }
+
+    public String getStandSystemName() {
+        return standSystemName;
+    }
+
+    public void setStandSystemName(String standSystemName) {
+        this.standSystemName = standSystemName;
+    }
 }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 0af77f7f..e567da74 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -11,6 +11,7 @@ import com.adc.da.person.dao.PersonCollectEODao;
 import com.adc.da.person.dao.PersonShareEODao;
 import com.adc.da.person.entity.PersonMsgEO;
 import com.adc.da.person.service.IPersonCollectEOService;
+import com.adc.da.search.service.StandLawsSearchService;
 import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage;
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage;
@@ -60,6 +61,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.util.PDFTextStripperByArea;
+import org.apache.poi.hwpf.extractor.WordExtractor;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -70,6 +78,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.sql.Clob;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -175,6 +184,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private CreateStandMQService createStandMQService;
 
+    @Autowired
+    private StandLawsSearchService standLawsSearchService;
+
 
     /***
      * @Description: 分页查询
@@ -1957,12 +1969,126 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
     @Override
     public void insertIntoIndexForMap(Map<String, Object> attrInfoMap) {
-
+        Set<String> keys = attrInfoMap.keySet();
+        for (String key:keys) {
+            String value = String.valueOf(attrInfoMap.get(key));
+            if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)){
+                value = value.replace(" , ",",");
+                value = value.replace(","," , ");
+                attrInfoMap.put(key,value);
+            }
+        }
+        // 根据文件attid 读取文件内容
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
+            String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
+            StringBuilder content = new StringBuilder("");
+            for (int i = 0; i < attidlist.length; i++) {
+                if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) ){
+                    AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
+                    //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+                    String readFilePath = "E:\\上汽企标流程总览.pdf";
+                    try {
+                        // 判断文件是docx还是PDF
+                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
+                            if(attFileEO.getFileSuffix().equals("doc")){
+                                FileInputStream fis = new FileInputStream(readFilePath);
+                                WordExtractor wordExtractor = new WordExtractor(fis);
+                                String txt = wordExtractor.getText();
+                                content.append(txt);
+                            }else {
+                                OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+                                XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
+                                String txt = extractor.getText();
+                                content.append(txt);
+                            }
+                       } else {
+                            PDDocument document = PDDocument.load(new File(readFilePath));
+                            document.getClass();
+                            if (!document.isEncrypted()) {
+                                PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+                                stripper.setSortByPosition(true);
+                                PDFTextStripper tStripper = new PDFTextStripper();
+                                String pdfFileInText = tStripper.getText(document);
+                                // String[] lines = pdfFileInText.split("\\r?\\n");
+                                content.append(pdfFileInText);
+                            }
+                        }
+                    } catch (Exception e) {
+                        logger.error("搜索中心新增数据读取文档内容时失败");
+                        logger.error(e.getMessage(),e);
+                    }
+                    attrInfoMap.put("content",content.toString());
+                }
+            }
+        }
+        else{
+            attrInfoMap.put("content","");
+        }
+        standLawsSearchService.addStandLawsSearchForMap(attrInfoMap);
     }
 
     @Override
     public void updateIntoIndexForMap(Map<String, Object> attrInfoMap) {
-
+        Set<String> keys = attrInfoMap.keySet();
+        for (String key:keys) {
+            String value = String.valueOf(attrInfoMap.get(key));
+            if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key) && !"content".equals(key)){
+                value = value.replace(" , ",",");
+                value = value.replace(","," , ");
+                attrInfoMap.put(key,value);
+            }
+        }
+        // 根据文件attid 读取文件内容
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
+            String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
+            StringBuilder content = new StringBuilder("");
+            for (int i = 0; i < attidlist.length; i++) {
+                if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){
+                    AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
+                    //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+                    try {
+                        // 判断文件是docx还是PDF
+                        /*if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) {
+                            if(attFileEO.getFileSuffix().equals("doc")){
+                                FileInputStream fis = new FileInputStream(readFilePath);
+                                WordExtractor wordExtractor = new WordExtractor(fis);
+                                String txt = wordExtractor.getText();
+                                content.append(txt);
+                            }else {
+                                OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+                                XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
+                                String txt = extractor.getText();
+                                content.append(txt);
+                            }
+                        } else if (attFileEO.getFileSuffix().equals("pdf")){
+                            PDDocument document = PDDocument.load(new File(readFilePath));
+                            document.getClass();
+                            if (!document.isEncrypted()) {
+                                PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+                                stripper.setSortByPosition(true);
+                                PDFTextStripper tStripper = new PDFTextStripper();
+                                String pdfFileInText = tStripper.getText(document);
+                                // String[] lines = pdfFileInText.split("\\r?\\n");
+                                content.append(pdfFileInText);
+                            }
+                        }*/
+                        String readFilePath = "E:\\上汽企标流程总览.pdf";
+                        FileInputStream fis = new FileInputStream(readFilePath);
+                        WordExtractor wordExtractor = new WordExtractor(fis);
+                        String txt = wordExtractor.getText();
+                        content.append(txt);
+                    } catch (Exception e) {
+                        logger.error("搜索中心修改数据读取文档内容时失败");
+                        logger.error(e.getMessage(),e);
+                    }
+                    attrInfoMap.put("content",content.toString());
+                }
+            }
+        }
+        else{
+            attrInfoMap.put("content","");
+        }
+        standLawsSearchService.updateStandLawsSearchForMap(attrInfoMap);
     }
 //
 //    @Override
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java
new file mode 100644
index 00000000..1377523d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.search;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu;
+import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/${restPath}/search")
+public class SearchController {
+
+    @Autowired
+    private ITsDicTypeService iTsDictypeService;
+
+    @ApiOperation("获取筛选条件")
+    @PostMapping("/getMenu")
+    public ResponseMessage<List<TsSearchMenu>> getSearchMenu(){
+        return Result.success(iTsDictypeService.getSearchMenu());
+    }
+}

From 0b069efd95e2dbe6b08203c2daf10094fe262e3b Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 28 Jul 2021 16:14:52 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=20=E5=A4=9A=E6=96=87=E6=A1=A3=20=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=20=E5=8F=8A=20=E5=88=A0=E9=99=A4=20=E5=9B=BD=E5=AE=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandAttrInfo/entity/SarStandAttrInfo.java    | 12 ------------
 .../service/impl/SarStandardsInfoServiceImpl.java    |  9 +++++++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
index 55893831..ab0dacf0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
@@ -158,18 +158,6 @@ public class SarStandAttrInfo extends BaseEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String ssrq;
 
-    @ApiModelProperty(value = "实施日期(国际）")
-    @TableField("SSRQGJ")
-    private String ssrqgj;
-
-    @ApiModelProperty(value = "新车型实施日期(国家）")
-    @TableField("XCXSSRQGJ")
-    private String xcxssrqgj;
-
-    @ApiModelProperty(value = "在产车实施日期(国家）")
-    @TableField("ZCCSSRQGJ")
-    private String zccssrqgj;
-
     @ApiModelProperty(value = "修改单")
     @TableField("XGD")
     private String xgd;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 29b00573..247f3cc1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -608,8 +608,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             sarStandFileEO.setFileSuffix(fileInfo.getFileSuffix());
             sarStandFileEO.setOriAttId(fileInfo.getId());
             standFileList.add(sarStandFileEO);
-            //文档转换
-            if ("pdf".equals(fileInfo.getFileSuffix()) || "PDF".equals(fileInfo.getFileSuffix())) {
+            //多文档转换 PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx
+            if (verifyFileType(fileInfo.getFileSuffix())) {
                 SarStandFile newFileEO = new SarStandFile();
                 newFileEO.setCreationUser(LoginUserUtil.getUserId());
                 newFileEO.setCreationTime(new Date());
@@ -640,6 +640,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
+    private Boolean verifyFileType(String str){
+        String verifyType = "^PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx*$";
+        return Pattern.matches(verifyType,str);
+    }
+
     public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (multiTimeMap != null && multiTimeMap.size() > 0) {

From 474fe6fd4591cb12f8e357a3ccc24bf6e6a54f37 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 28 Jul 2021 16:18:17 +0800
Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=20=20=20=20exist=3Dfalse=20?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandAttrInfo/entity/SarStandAttrInfo.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
index ab0dacf0..4458e331 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
@@ -158,6 +158,18 @@ public class SarStandAttrInfo extends BaseEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String ssrq;
 
+    @ApiModelProperty(value = "实施日期(国际）")
+    @TableField(exist=false)
+    private String ssrqgj;
+
+    @ApiModelProperty(value = "新车型实施日期(国家）")
+    @TableField(exist=false)
+    private String xcxssrqgj;
+
+    @ApiModelProperty(value = "在产车实施日期(国家）")
+    @TableField(exist=false)
+    private String zccssrqgj;
+
     @ApiModelProperty(value = "修改单")
     @TableField("XGD")
     private String xgd;

From a5d0229b5bd6cc3261ea28f7491247c6312b8e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= <wangxiahui@91isoft.com>
Date: Wed, 28 Jul 2021 09:17:14 +0000
Subject: [PATCH 7/8] Update application-dev.properties

---
 adc-da-main/src/main/resources/application-dev.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index e3445661..eab65a1e 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -17,7 +17,7 @@ application.center=1
 #Eruept
 eureka.client.allow-redirects=true
 eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/
+eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
 
 #==============================================
 # 邮箱配置1

From de1fe704a85d3078a9b2e437f452824f80107c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A4=8F=E6=99=96?= <wangxiahui@91isoft.com>
Date: Wed, 28 Jul 2021 14:25:50 +0000
Subject: [PATCH 8/8] Update application-dev.properties

---
 adc-da-main/src/main/resources/application-dev.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index eab65a1e..e3445661 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -17,7 +17,7 @@ application.center=1
 #Eruept
 eureka.client.allow-redirects=true
 eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
+eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/
 
 #==============================================
 # 邮箱配置1