Merge branch 'GJYZJ_V1.0' of http://gitlab.archser.com/common/aserver

src/main/resources/DBUpdate/DM_UpdateSQL.xml

@@ -764,17 +764,175 @@
 		alter table AS_CHECK_RECORD_RESULT add(DATASIGN1 VARCHAR2(200));
 	</sql>
 	</version>
-	<version edition="43" description="序列">
-        <sql creator="yangrifei" createDate="20200715" note="序列">
-            CREATE SEQUENCE "SEQ_AS_VIDEO_TRANSITION" INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 MINVALUE 1;
-        </sql>
-    </version>
-    	<version edition="44" description="档案分类排序">
+
+	<version edition="43" description="档案分类排序">
 	 <sql creator="xiaoying" createDate="20200703" note="档案分类排序">
 		alter table AS_TREECLASSFIC add(SERIALINDEX VARCHAR2(500));
 	</sql>
 	</version>
-	<version edition="45" description="添加全宗信息表">
+	<version edition="44" description="ES搜索模板升级">
+	 <sql creator="zhanglongfa" createDate="20200707" note="ES搜索模板升级">
+		delete from AS_SEARCH_TEMPLATE where key='catalog_home_result' or key = 'catalog_file_home_result';
+		insert into "AS_SEARCH_TEMPLATE" ("ID","KEY","TEMPLATE","DESCRIPTION","PARAS","INDICES") values (818, 'catalog_home_result', '{
+			"_source" : {
+				"excludes" : ["files.*"]
+			},
+		    "query" : {
+		    	"bool" : {
+		    		"must" : {{#toJson}}searchStatement{{/toJson}},
+		            "filter": [
+		                {"term" : { "business_id" : "{{businessId}}" }},
+		                {"terms" :  {{#toJson}}libId{{/toJson}}},
+		                {
+			        		"bool":{
+			        			"should":[
+			        				{"prefix":{"idseq":"{{idSeq}}"}},
+			        				{"term" : {"idseq.keyword": "{{idSeq}}"}}
+			        			]
+			        			
+			        		}
+			        	}
+		            ]
+		    	}
+		    },
+		    "from" : "{{from}}",
+		    "size" : "{{size}}",
+		    "highlight" : {
+		        "fields" : {
+		            "*" : {}
+		        }
+		    }
+		}', '仅搜索指定目录，高亮所有字段，搜素档案类型与档案分类', '{
+		  "from":"0",
+		  "size":"10",
+		  "businessId":"1",
+		  "libId":"1",
+		  "idSeq":"109.",
+		  "searchStatement":[{
+		            "multi_match" : {
+		                "query": "档案",
+		                "fields": "*_retrieval",
+		                "type": "most_fields",
+		                "lenient": true
+		            }
+		        },{
+		            "multi_match" : {
+		                "query": "济宁",
+		                "fields": "*_retrieval",
+		                "type": "most_fields",
+		                "lenient": true
+		            }
+		        }]
+		}
+		', 'archser');
+		insert into "AS_SEARCH_TEMPLATE" ("ID","KEY","TEMPLATE","DESCRIPTION","PARAS","INDICES") values (822, 'catalog_file_home_result', '{
+			"_source" : {
+				"excludes" : ["files.*"]
+			},
+		    "query": {
+		    	"bool" : {
+		    		"must" : {
+				    	"bool" : {
+				    		"should" : [
+					    		{
+					    			"bool":{
+										"must": {{#toJson}}searchStatement{{/toJson}}
+		                            }
+					    		},
+					    		{
+					    			"bool":{
+										"must": {{#toJson}}searchFileStatement{{/toJson}}
+							        }
+					    		}
+				    		]
+				    	}
+		    		},
+		    		"filter": [ 
+			        	{"term" : {"business_id": "{{businessId}}"}},
+			        	{"terms" :  {{#toJson}}libId{{/toJson}}},
+		                {
+			        		"bool":{
+			        			"should":[
+			        				{"prefix":{"idseq":"{{idSeq}}"}},
+			        				{"term" : {"idseq.keyword": "{{idSeq}}"}}
+			        			]
+			        			
+			        		}
+			        	}
+			        ]
+		    	}
+		    },
+		    "from" : "{{from}}",
+			"size" : "{{size}}",
+		    "highlight" : {
+		        "fields" : {
+		            "*" : {}
+		        }
+		    }
+		}', '搜索档案类型与档案分类，所有目录和文件，高亮所有字段', '{
+		  "from":"0",
+		  "size":"500",
+		  "businessId":"2",
+		  "libId":"1745",
+		  "idSeq":"109.",
+		  "searchStatement":[{
+		            "multi_match" : {
+		                "query": "档案",
+		                "fields": "*_retrieval",
+		                "type": "most_fields",
+		                "lenient": true
+		            }
+		        },{
+		            "multi_match" : {
+		                "query": "济宁",
+		                "fields": "*_retrieval",
+		                "type": "most_fields",
+		                "lenient": true
+		            }
+		        }],
+		    "searchFileStatement":[
+		        {
+		            "nested" : {
+		                "path" : "files",
+		                "query" : {
+		                    "multi_match" : {
+		                        "query": "档案",
+		                        "type": "best_fields"
+		                    }
+		                }
+		            }
+		        },
+		        {
+		            "nested" : {
+		                "path" : "files",
+		                "query" : {
+		                    "multi_match" : {
+		                        "query": "城乡",
+		                        "type": "best_fields"
+		                    }
+		                }
+		            }
+		        }
+		    ]
+		}
+		', 'archser');
+
+	</sql>
+	</version>
+    <version edition="45" description="ES搜索模板升级">
+        <sql creator="zhanglongfa" createDate="20200708" note="盘点记录详细表添加字段">
+            alter table AS_CHECK_RECORD_RESULT add(STATE VARCHAR2(50));
+            alter table AS_CHECK_RECORD_RESULT add(LIBNAME VARCHAR2(200));
+            alter table AS_CHECK_RECORD_RESULT add(LEVEL VARCHAR2(200));
+            alter table AS_CHECK_RECORD_RESULT add(DATASIGN VARCHAR2(200));
+        </sql>
+    </version>
+    <version edition="46" description="序列">
+        <sql creator="yangrifei" createDate="20200715" note="序列">
+            CREATE SEQUENCE "SEQ_AS_VIDEO_TRANSITION" INCREMENT BY 1 START WITH 1 MAXVALUE 9223372036854775807 MINVALUE 1;
+        </sql>
+    </version>
+    <version edition="47" description="添加全宗信息表">
 	 <sql creator="yangchengwu" createDate="20200715" note="全宗信息表">
 		CREATE TABLE "ARCHSER_YZ"."AS_FOND"
 			(