Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!512

adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java

@@ -1333,7 +1333,19 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         QueryBuilder multiQueryBuilder1;
         QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery("");
         if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())){
-            queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(),
+            if(searchInfoEO.getSelectValue().length() > 1){
+                String str0 = searchInfoEO.getSelectValue().substring(0,1);
+                String Str1 = searchInfoEO.getSelectValue().substring(1,2);
+                String reg = ".*[0-9].*";
+                Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$");
+                if (pattern.matcher(str0).matches() && Str1.matches(reg)) {
+                    String value = searchInfoEO.getSelectValue().replace(str0,str0+" ");
+                    searchInfoEO.setSelectValue(value);
+                }
+            }
+
+
+            queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue().toUpperCase(),
                     "title"
             ).minimumShouldMatch("100%").field("title",1000f);
             boolQueryBuilder.must(queryBuilder1);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -1222,7 +1222,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 createStandAttrInfo(sarStandardsInfoEO);
             }
 
+            // 根据引用标准修改其他被引用标准
             updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
+            /**
+             * 新增代替标准号修改其他被代替标准号
+             */
+            updateCiteStand(sarStandardsInfoEO, null, "DTBZH", "BDTBZH");
             updateCiteStand(sarStandardsInfoEO, null, "BFDTBZ", "BBFDTBZ");
 //            updateRelateStand(sarStandardsInfoEO, "CBBH");
             // 根据代替标准号修改被代替的标准的状态  修改为已修订状态

doc/sql/news_feed_动态消息表更新表结构.sql

@@ -0,0 +1,33 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 123.56.177.15_new_测试
+Source Server Version : 50736
+Source Host           : 123.56.177.15:3306
+Source Database       : foton_slrs_test2
+
+Target Server Type    : MYSQL
+Target Server Version : 50736
+File Encoding         : 65001
+
+Date: 2022-06-02 12:17:37
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for news_feed
+-- ----------------------------
+DROP TABLE IF EXISTS `news_feed`;
+CREATE TABLE `news_feed` (
+  `ID` varchar(50) CHARACTER SET utf8mb4 NOT NULL COMMENT 'ID',
+  `RESOURCE_TYPE` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '资源类型',
+  `MESSAGE_TYPE` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '消息类型',
+  `STANDARD_ID` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '标准类型',
+  `STANDARD` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '标准号',
+  `STANDARD_NAME` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '标准名称',
+  `RELEASE_DATE` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '发布日期',
+  `TEXT_STATE` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '文本状态',
+  `RENEW_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='动态消息表';