文件库查询

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/ElkDao.java

@@ -46,4 +46,12 @@ public interface ElkDao {
 	List<Map<String, Object>> getPageSub(Map<String, Object> map);
 	
 	List<String> getSubDeptAll();
+
+	/**
+	 * 获取所有的发文机关
+	 * @return
+	 */
+	List<Map<String, Object>> getPubs();
+
+	List<Map<String, Object>> getPub();
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/elk/ElkController.java

@@ -63,6 +63,7 @@ public class ElkController {
 	 * 部门字段
 	 */
 	private String deptName = "departmentname.keyword";
+	private String pubOrg = "puborg.keyword";
 
 	/**
 	 * 热门字段
@@ -373,7 +374,7 @@ public class ElkController {
 	 * @throws IOException
 	 */
 	@GetMapping("retrieval")
-	public Map<String, Object> retrieval(Integer page, Integer limit, String content) throws IOException {
+	public Map<String, Object> retrieval(Integer page, Integer limit, String content, String orgName) throws IOException {
 		if (!Blank.notBlank(page) || !Blank.notBlank(limit)) {
 			return SendUtil.send(false, ConstStr.REQUEST_WRONGPARAMS);
 		}
@@ -385,11 +386,21 @@ public class ElkController {
 		List<QueryBuilder> list = boolQueryBuilder.must();
 		// 搜索标题和内容
 		if (Blank.notBlank(content)) {
-			Map<String, Float> fields = new HashMap<>(2);
+			Map<String,Float> fields = new HashMap<>(2);
 			fields.put(query[0], 5.0f);
 			fields.put(query[1], 1.0f);
 			list.add(QueryBuilders.multiMatchQuery(content, query).fields(fields));
+		}
+		if (Blank.notBlank(orgName)) {
+			BoolQueryBuilder boolQueryBuilder2 = new BoolQueryBuilder();
+			List<QueryBuilder> should = boolQueryBuilder2.should();
+			should.add(QueryBuilders.matchQuery(pubOrg, orgName));
+			list.add(boolQueryBuilder2);
+		}
+		if (Blank.notBlank(content) || Blank.notBlank(orgName)) {
 			searchSourceBuilder.query(boolQueryBuilder);
+		}
+		if (Blank.notBlank(content)) {
 			// 添加高亮显示
 			HighlightBuilder hb = new HighlightBuilder();
 			hb.preTags("<span style=\"color:red !important;\">");
@@ -428,4 +439,14 @@ public class ElkController {
 		map.put("highlightArr", highlightArr);
 		return SendUtil.send(true, null, map);
 	}
+
+	/**
+	 * 获取所有的发文机关
+	 * @return
+	 */
+	@GetMapping("getPubs")
+	public Map<String, Object> getPubs(){
+		return SendUtil.send(true, null, elkService.getPubs());
+	}
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/ElkService.java

@@ -47,4 +47,10 @@ public interface ElkService {
 	Map<String, Object> getPageSub(Map<String, Object> map);
 	
 	List<String> getSubDeptAll();
+
+	/**
+	 * 获取所有的发文机关
+	 * @return
+	 */
+	List<Map<String, Object>> getPubs();
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/ElkServiceImpl.java

@@ -2,10 +2,8 @@ package com.example.nngkxxdp.service.impl;
 
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.example.nngkxxdp.dao.ElkDao;
 import com.example.nngkxxdp.service.ElkService;
 import com.example.nngkxxdp.util.SendUtil;
@@ -51,6 +49,32 @@ public class ElkServiceImpl implements ElkService {
 		return SendUtil.layuiTable(count, elkDao.getPageSub(map));
 	}
 
+//	@Override
+//	public List<Map<String, Object>> getPub() {
+//		List<Map<String, Object>> pubs = elkDao.getPub();
+//		List<Map<String, Object>> list = new ArrayList<>();
+//		if (Blank.isNotEmpty(pubs)) {
+//			for (int i = 0; i < pubs.size(); i++) {
+//				Map<String, Object> orgMap = new HashMap<>();
+//				Map<String, Object> map = pubs.get(i);
+//				String puborg = (String) map.get("puborg");
+//				String[] s = puborg.split(" ");
+////				String[] s = puborg.split(" ");
+//				for (String s1 : s) {
+//					orgMap.put("puborg", s1);
+//					list.add(orgMap);
+//					System.out.println(s1);
+//				}
+//			}
+//		}
+//		return list;
+//	}
+
+	@Override
+	public List<Map<String, Object>> getPubs() {
+		return elkDao.getPubs();
+	}
+
 	@Override
 	public List<String> getSubDeptAll() {
 		return elkDao.getSubDeptAll();

nngkxxdp/src/main/resources/mapper/ElkDao.xml

@@ -50,7 +50,20 @@
 	<select id="getSubDeptAll" resultType="java.lang.String">
 		SELECT new_dept_name FROM question_article_dept WHERE new_dept_name IS NOT NULL
 	</select>
-	
+	<!--获取所有的发文机关-->
+	<select id="getPubs" resultType="java.util.Map">
+		SELECT DISTINCT
+		( substring_index( substring_index( pa.puborg, ' ', b.help_topic_id + 1 ), ' ',- 1 ) ) AS puborg
+		FROM
+		policy_article pa
+		JOIN mysql.help_topic b ON b.help_topic_id &lt; ( length( pa.puborg ) - length( REPLACE ( pa.puborg, ' ', '' ) ) + 1 )
+		WHERE
+		pa.puborg != ' ';
+	</select>
+	<select id="getPub" resultType="java.util.Map">
+		SELECT DISTINCT(puborg) FROM `policy_article` WHERE puborg != ''
+	</select>
+
 	<insert id="saveSub">
 		insert into question_article_remark(phone, dept_name, remark) values(#{phone}, #{dept}, #{remark})
 	</insert>

nngkxxdp/src/main/resources/static/zdjc/sywj11.html

@@ -0,0 +1,486 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<link href="img/favicon.ico" rel="shortcut icon">
+		<title>南岸区政策文件库</title>
+		<link rel="stylesheet" type="text/css" href="./css/sywj.css" />
+		<link rel="stylesheet" type="text/css" href="./layui/css/layui.css" />
+
+		<script src="./layui/layui.js" type="text/javascript" charset="utf-8"></script>
+		<script src="./js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
+	</head>
+	<body>
+	<div class="hed">
+		<div class="head">
+			<img src="img/logo-big.png" class="logo-big" onclick="window.location.href='http://www.cqna.gov.cn'" style="cursor: pointer;">
+			<div class="head_text" onclick="window.location.href='http://www.cqna.gov.cn'" style="cursor: pointer;">
+				<h6>重庆市南岸区人民政府</h6>
+				<p>www.cqna.gov.cn</p>
+			</div>
+		</div>
+	</div>
+
+		<div class="content">
+			<div class="ques" id="ques">没有找到合适答案，我要提问</div>
+			<div class="wrap_content">
+				<div class="wrapDiv">
+					<ul class="layui-timeline">
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">国务院组织机构</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">综合政务</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">国有资产监管</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">财政、金融、审计</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">国土资源、能源</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">农业、林业、水利</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">工业、交通</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">商贸、海关、旅游</h3>
+							</div>
+						</li>
+						<li class="layui-timeline-item">
+							<i class="layui-icon layui-timeline-axis"></i>
+							<div class="layui-timeline-content layui-text">
+								<h3 class="layui-timeline-title">安全生产监管</h3>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<div class="text_content">
+					<div class="header-contanier">
+						<img alt="国徽" src="img/logo-big.png">
+						<h3>南岸区政策文件库</h3>
+					</div>
+
+					<span class="totall">共计问答数：1234</span>
+
+					<div class="sq">
+							<div style="position:relative">
+								<div class="search-area">
+								<div class="all">全部</div>
+								<div class="searchinput">
+									<div class="layui-form">
+										<div class="layui-input-block">
+										     <input type="text" id="search-input" name="title" lay-verify="title" autocomplete="off" placeholder="请输入检索内容" class="layui-input" style="border:none;">
+										</div>
+									</div>
+								</div>
+	
+								<div class="ss-icon">
+									<img alt="搜索" src="./img/sear2.png">
+								</div>
+								</div>
+	
+								<div class="tangchu" style="position: absolute">
+								</div>
+						</div>
+						
+						
+					</div>
+
+					<div class="text_three">
+						<div class="title">
+							最新政策:
+						</div>
+						<div class="th_con">
+
+
+
+						
+						</div>
+						<div class="more">
+							<i class="layui-icon layui-icon-down"></i>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	<div class="foot_content">
+		<div class="three_pic">
+			<a href="http://bszs.conac.cn/sitename?method=show&id=169360097F9303C8E053022819AC5CD0" target="_blank">
+				<img src="img/dzjg.png" >
+			</a>
+			<a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=50010802001142" target="_blank">
+				<img src="img/jc.png" >
+			</a>
+			<span>
+
+				<img src="img/zfwz.png" >
+			</span>
+		</div>
+		<div class="f_text">
+			<p>重庆市南岸区人民政府 版权所有 主办：重庆市南岸区人民政府办公室</p>
+			<p>ICP备案：渝ICP备2021011583号 政府网站标识码：5001080014<span><img src="img/jh.png" ></span>渝公网安备 50010802001142号</p>
+		</div>
+		<div class="f_list">
+			<a href="http://www.cqna.gov.cn/ggbf_search/lxwm/202109/t20210910_9683034.html">联系我们</a>
+			<span>|</span>
+			<a href="http://www.cqna.gov.cn/ggbf_search/wzdt/">网站地图</a>
+			<span>|</span>
+			<a href="http://www.cqna.gov.cn/ggbf_search/bqsm/202109/t20210910_9683174.html">版权说明</a>
+		</div>
+	</div>
+		
+		<div class="quesTanchu" id="quesTanchu">
+			<div class="layui-form">
+				<div class="layui-form-item">
+				    <label class="layui-form-label">手机号：</label>
+				    <div class="layui-input-block">
+				      <input id="lyPhone" type="text" name="username" lay-verify="required" lay-reqtext="请输入手机号" placeholder="请输入手机号" autocomplete="off" class="layui-input">
+				    </div>
+			  	</div>
+			  	
+			  	<div class="layui-form-item">
+				    <label class="layui-form-label">部门</label>
+				    <div class="layui-input-block">
+				      <select id="lyDept" name="dept" lay-verify="required" lay-reqtext="请选择部门">
+				        <option value=""></option>
+				      </select>
+				    </div>
+				 </div>
+				 
+				 <div class="layui-form-item layui-form-text">
+				    <label class="layui-form-label">问题</label>
+				    <div class="layui-input-block">
+				      <textarea id="lyRemark" placeholder="请输入内容" class="layui-textarea"></textarea>
+				    </div>
+			  	</div>
+			  	
+			  	<div class="layui-form-item" style="text-align: center">
+				    <div class="layui-input-block">
+				      <button type="button" id="quesub" class="layui-btn layui-btn-normal" onclick="saveSub()">立即提交</button>
+				      <button type="button" class="layui-btn layui-btn-primary" onclick="cancel()">取消</button>
+				    </div>
+			  	</div> 
+			  	
+			</div>
+		</div>
+
+
+		<script type="text/javascript">
+			layui.use(['form', 'jquery'], function() {
+				$ = layui.jquery,
+					form = layui.form,
+					layer = layui.layer;
+
+				$('.img_position').click(function() {
+					window.location.href = "wj2.html";
+				});
+
+
+
+				$(".all").mouseenter(function(){
+					$(".tangchu").css("display","block");
+				});
+				$(".tangchu").mouseenter(function(){
+					$(".tangchu").css("display","block");
+				});
+				$(".all").mouseleave(function(){
+					$(".tangchu").css("display","none");
+				});
+				$(".tangchu").mouseleave(function(){
+					$(".tangchu").css("display","none");
+				});
+
+				$(".tangchu-item").click(function(){
+					$("#search-input").val($(this).text());
+				}) ;
+
+				$('.ss-icon').on('click', function() {
+ 					if (!$('#search-input').val()) {
+						layer.msg('请输入检索信息');
+						return;
+					}
+ 					page = 1;
+					sessionStorage.ES_SEARCH = $('#search-input').val();
+					window.location = 'wj2.html'
+					/* initPage(); */
+				});
+				
+				$('#search-input').bind('keyup', function(event) {
+			        if (event.keyCode == "13") {
+			            //回车执行查询
+			            $('.ss-icon').click();
+			        }
+			    });
+
+				/* $('.more').on('click', function() {
+					initPage();
+				}); */
+				
+				$.ajax({
+					type:'get',
+					url: '/elk/getSubDeptAll',
+					success:function(obj) {
+			          if (obj.data && obj.data.length > 0) {
+			        	  var data = obj.data;
+			        	  var html = '';
+			        	  for (var i = 0; i < data.length; i++) {
+			        		  html += '<option value="'+ data[i] +'">'+ data[i] +'</option>';
+			        	  }
+			        	  $('select[name="dept"]').empty().append(html);
+			        	  form.render('select');
+			          }
+					},
+					error: function(msg) {
+						
+					}
+				})
+				
+
+				sessionStorage.ES_SEARCH = '';
+				sessionStorage.ES_ORGNAME = '';
+				initPage();
+				initDetail();
+				
+				
+				(function(){
+					 var timer = setInterval(hotWords, 3000)
+					 function hotWords(){
+					  var ul = $('.wrap_content ul');
+					  var firstLi = $('li:first', ul);
+					  firstLi.clone().appendTo(ul);
+					  ul.animate({top: "-40px"}, 1000, function(){
+					 	ul.css('top', '5px');
+					    firstLi.remove();
+					  })
+					 }
+					})();
+
+				
+				
+				
+				
+				/* (function(){
+					 var timer = setInterval(hotQues, 3000)
+					 function hotQues(){
+					  var th = $('.th_con');
+					  var firstArt = $('.art:first',th);
+					  firstArt.clone().appendTo(th);
+					  	th.animate({top: "-52px"}, 1000, function(){
+					  		th.css('top', '5px');
+						  firstArt.remove();
+					  })
+					 }
+					})(); */
+				
+				$("#ques").click(function(){
+					layer.open({
+						  type: 1,
+						  area: ['620px', '350px'],
+						  title: '提问',
+						  content: $('#quesTanchu'),
+						  success: function() {
+						  }
+					});
+				});
+
+			});
+			
+			
+			
+
+			/* 请求热门文件 */
+			var page = 1;
+			var dataMap = {};
+			function initPage() {
+				/* var index = layer.load(2); */
+				$.ajax({
+					type:'get',
+					url: '/elk/searchHotArticle',
+					data: {
+						'page': page,
+						'limit': 8,
+					},
+					dataType: 'json',
+					success:function(obj) {
+						if (page == 1) {
+			        		 $('.th_con').empty();
+			        		 $('.more').removeClass('layui-hide');
+			        	 };
+			        	 var datas = obj.data.array;
+			        	 if (datas && datas.length > 0) {
+			        		 if (datas.length < 5) {
+				        		  $('.more').addClass('layui-hide');
+				        	  }
+			        		 page++;
+			        		 var data = datas;
+								var html = '';
+								for(var i = 0; i < data.length; i++){
+									var content = (data[i]).sourceAsMap.content;
+					        		  var title = (data[i]).sourceAsMap.title;
+					        		  var colname = (data[i].sourceAsMap.colname)
+					        		  var url = (data[i]).sourceAsMap.url;
+
+					        		  html += '<div class="art" style="cursor: pointer;" onclick="openWindow(\''+ data[i].id +'\')">'
+					        		  		+ '<div class="t1">'
+					        		  		+'<span class="sp1" title="'+colname+'">'+ colname +'</span><span title="'+title+'">'+ title +'</span>'
+					        		  		+'</div>'
+					        		  		+'<div class="tx">'
+					        		  		+'<span>'+ matchReg(repalceHtml(content)) +'</span>'
+					        		  		+'<p>详情>></p>'
+					        		  		+'</div>'
+					        		  		+'</div>'
+					        		  		dataMap[data[i].id] = data[i];
+
+								};
+								$('.th_con').append(html);
+								/* layer.close(index); */
+			        	 }else {
+				        	  $('.more').addClass('layui-hide');
+				        	  layer.msg('没有更多了');
+				         }
+
+					},
+					error: function(msg) {
+						/* layer.close(index); */
+					}
+				})
+			};
+
+		// 去除所有html标签
+		function matchReg(str){
+			let reg=/<\/?.+?\/?>/g;
+			return str.replace(reg,'');
+		}
+
+		// 替换富文本标签内容
+		function repalceHtml(str){
+			var arrEntities={'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'};
+			return str.replace(/&(lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];});
+		}
+			// 初始化详情页面
+		function initDetail() {
+
+				$.ajax({
+					type:'get',
+
+					url: '/elk/getPubs',
+					success:function(obj) {
+						console.log(obj)
+			          if (obj.data && obj.data.length > 0) {
+			        	  var data = obj.data;
+			        	  var html = '<div class="tangchu-item" title="全部" onclick="openSearch(\'全部\')">全部</div>';
+			        	  for (var i = 0; i < data.length; i++) {
+			        		  html += '<div class="tangchu-item" title="'+data[i].puborg+'" onclick="openSearch(\''+ data[i].puborg +'\')">'+ data[i].puborg +'</div>';
+			        	  }
+			        	  $('.tangchu').empty().append(html);
+			          }
+					},
+					error: function(msg) {
+
+					}
+				})
+			};
+
+			function openSearch(org) {
+				if (org == '全部'){
+					sessionStorage.ES_ORGNAME = '';
+				} else {
+					sessionStorage.ES_ORGNAME = org;
+				}
+				if (!$('#search-input').val()) {
+					sessionStorage.ES_SEARCH = '';
+				}
+				$('.all').val(org);
+				page = 1;
+				window.location = 'wj2.html';
+			}
+
+			function openWindow(data) {
+				//console.log(dataMap[data])
+				sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data].sourceAsMap);
+				window.location = 'xqwj-copy.html';
+			}
+			
+			
+
+
+			function saveSub() {
+				if (!$('#lyPhone').val()) {
+					layer.msg('请输入手机号', {icon: 5});
+					return false;
+				}
+				var myreg=/^[1][3,4,5,7,8,9][0-9]{9}$/;
+				if (!myreg.test($('#lyPhone').val())) {
+				    layer.msg('手机号格式错误', {icon: 5});
+				    return false;
+				}
+				if (!$('#lyRemark').val()) {
+					layer.msg('请输入问题内容', {icon: 5});
+					return false;
+				}
+				$.ajax({
+					type:'post',
+					data: {
+						'phone': $('#lyPhone').val(),
+						'remark': $('#lyRemark').val(),
+						'dept': $('#lyDept').val()
+					},
+					url: '/elk/saveSub',
+					success:function(obj) {
+						if (obj.result) {
+							layer.closeAll();
+							setTimeout(function() {
+								layer.msg('提交成功，我们会尽快反馈您的问题', {icon: 6,time: 2000}); 
+							},100)
+							$('#lyPhone').val('');
+							$('#lyRemark').val('');
+						} else {
+							layer.msg('提交失败', {icon: 5,time: 2000}); 
+						}
+						
+					},
+					error: function(msg) {
+						console.log(msg)
+					}
+					
+				});
+			}
+			
+			function cancel(){
+				$('#lyPhone').val('');
+				$('#lyRemark').val('');
+				layer.closeAll();
+			}
+
+
+		</script>
+	</body>
+</html>

nngkxxdp/src/main/resources/static/zdjc/wj2.html

@@ -150,11 +150,9 @@
 					,data: [{
 						title: '国务院组织机构(365)' //一级菜单
 						,children: [{
-							title: '' //二级菜单
-							,children: [{
-								title: '' //三级菜单
-								//…… //以此类推，可无限层级
-							}]
+							title: '测试1' //二级菜单//二级菜单
+						},{
+							title: '测试2' //二级菜单//二级菜单
 						}]
 					},{
 						title: '综合政务(546)' //一级菜单
@@ -255,7 +253,7 @@
 						return;
 					} 
 					page = 1;
-					sessionStorage.ELK_SEARCH = $('#search-input').val();
+					sessionStorage.ES_SEARCH = $('#search-input').val();
 					initPage();
 				});
 				$('#search-input').bind('keyup', function(event) {
@@ -267,11 +265,11 @@
 				$('.more').on('click', function() {
 					initPage();
 				})
-				if (sessionStorage.ELK_DEPTNAME) {
-					$('.all').text(sessionStorage.ELK_DEPTNAME);
+				if (sessionStorage.ES_ORGNAME) {
+					$('.all').text(sessionStorage.ES_ORGNAME);
 				}
-				if (sessionStorage.ELK_SEARCH) {
-					$('#search-input').val(sessionStorage.ELK_SEARCH);
+				if (sessionStorage.ES_SEARCH) {
+					$('#search-input').val(sessionStorage.ES_SEARCH);
 				}
 				$("#ques").click(function(){
 					layer.open({
@@ -312,22 +310,20 @@
 				var index = layer.load(2);
 				$.ajax({
 					type:'get',
-					url: '/elk/search',
+					url: '/elk/retrieval',
 					data: {
 						'page': page,
 						'limit': 5,
-						'content': sessionStorage.ELK_SEARCH,
-						'dept': sessionStorage.ELK_DEPTNAME
+						'content': sessionStorage.ES_SEARCH,
+						'orgName': sessionStorage.ES_ORGNAME
 					},
 					dataType: 'json',
 					success:function(obj) {
-			        	 // sessionStorage.ELK_SEARCH = '';
-			        	 // sessionStorage.ELK_DEPTNAME = '';
-			        	 if (page == 1) {
-			        		 $('.more').removeClass('layui-hide');
-			        		 $('.wrap_text').empty();
-			        	 }
-			        	  var datas = obj.data;
+					  if (page == 1) {
+						 $('.more').removeClass('layui-hide');
+						 $('.wrap_text').empty();
+					  }
+					  var datas = obj.data;
 			          if (datas.data && datas.data.length > 0) {
 			        	  if (datas.data.length < 5) {
 			        		  $('.more').addClass('layui-hide');
@@ -335,34 +331,22 @@
 			        	  page++;
 			        	  var data = datas.data;
 			        	  var html = '';
+			        	  console.log(data)
 			        	  for (var i = 0; i < data.length; i++) {
-			        		  // var content = (data[i]).sourceAsMap.content;
-			        		  // var title = (data[i]).sourceAsMap.title;
-			        		  // var deptName = (data[i]).sourceAsMap.departmentname;
-			        		  // var time = (data[i]).sourceAsMap.publishtime;
-
 							  var content = data[i]['_source']['content'];
 							  var title = data[i]['_source']['title'];
 							  if (data[i]['_source']['title.keyword']) {
 								  title = data[i]['_source']['title.keyword'];
 							  }
-							  var deptName = data[i]['_source']['departmentname'];
-							  var time = data[i]['_source']['publishtime'];
-			        		  /* if (data[i].highlightFields) {
-			        			  if (data[i].highlightFields.content) {
-			        				  content = data[i].highlightFields.content;
-			        			  }
-			        			  if (data[i].highlightFields.title) {
-			        				  title = data[i].highlightFields.title;
-			        			  }
-			        		  } */
+							  var colname = data[i]['_source']['colname'];
+							  var time = data[i]['_source']['pubtimestr'];
 			        		  html += '<div class="text_one" onclick="openWindow(\''+ data[i]['_source'].id +'\')">'
 									+ '<p>'+ title +'</p>'
 									+ '<p>'
 									+ escape2Html(content)
 									+ '</p>'
 									+ '<div class="data-contanier">'
-									+ '<a href="javascript:void(0);" title="'+deptName+'">'+ deptName +'</a>'
+									+ '<a href="javascript:void(0);" title="'+colname+'">'+ colname +'</a>'
 									+ '<span>'+ time +'</span>'
 									+ '</div>'
 									+ '</div>';
@@ -387,13 +371,13 @@
 				$.ajax({
 					type:'get',
 
-					url: '/elk/deptAll',
+					url: '/elk/getPubs',
 					success:function(obj) {
 			          if (obj.data && obj.data.length > 0) {
 			        	  var data = obj.data;
 			        	  var html = '<div class="tangchu-item" title="全部" onclick="openSearch(\'全部\')">全部</div>';
 			        	  for (var i = 0; i < data.length; i++) {
-			        		  html += '<div class="tangchu-item" title="'+data[i]+'" onclick="openSearch(\''+ data[i] +'\')">'+ data[i] +'</div>';
+			        		  html += '<div class="tangchu-item" title="'+data[i].puborg+'" onclick="openSearch(\''+ data[i].puborg +'\')">'+ data[i].puborg +'</div>';
 			        	  }
 			        	  $('.tangchu').empty().append(html);
 			          }
@@ -403,21 +387,22 @@
 					}
 				})
 			}
-			function openSearch(dept) {
-				if (dept == '全部'){
-					sessionStorage.ELK_DEPTNAME = '';
+			function openSearch(org) {
+				if (org == '全部'){
+					sessionStorage.ES_ORGNAME = '';
 				} else {
-					sessionStorage.ELK_DEPTNAME = dept;
+					sessionStorage.ES_ORGNAME = org;
 				}
-				$('.all').attr('title',dept);
-				$('.all').text(dept);
+				$('.all').attr('title',org);
+				$('.all').text(org);
 				page = 1;
 				initPage();
 			}
 			function openWindow(data) {
 				//console.log(dataMap[data])
 				sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
-				 window.location = 'xq.html';
+				 // window.location = 'xq.html';
+				 window.location = 'xqwj-copy.html';
 			}
 			function escape2Html(str) {
 			 var arrEntities={'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'};
@@ -531,7 +516,7 @@
 			function openWindow(data) {
 				console.log(dataMap[data])
 				sessionStorage.ELK_ARTICLE = JSON.stringify(dataMap[data]);
-				window.location = 'xq.html';
+				window.location = 'xqwj-copy.html';
 			}
 			
 			function openWindow2(data) {

nngkxxdp/src/main/resources/static/zdjc/xqwj-copy.html

@@ -91,27 +91,27 @@
 							<table>
 								<tr>
 									<td class="td1">标题:</td>
-									<td class="td2">Savings</td>
+									<td class="td2" id="title">Savings</td>
 									<td class="td1">发文机关:</td>
-									<td class="td2">发改委办公厅工业和信息化部办公</td>
+									<td class="td2" id="fwjg">发改委办公厅工业和信息化部办公</td>
 								</tr>
 								<tr>
 									<td class="td1">发文字号:</td>
-									<td class="td2">发改办环资（2021）1004号</td>
+									<td class="td2" id="fwzh">发改办环资（2021）1004号</td>
 									<td class="td1" >来源:</td>
-									<td class="td2">发展改委网站</td>
+									<td class="td2" id="ly">发展改委网站</td>
 								</tr>
 								<tr>
 									<td class="td1">主题分类:</td>
-									<td class="td2">城乡建设、环境保护\环境监测、保护与治理</td>
+									<td class="td2" id="ztfl">城乡建设、环境保护\环境监测、保护与治理</td>
 									<td class="td1">公文种类:</td>
-									<td class="td2">通知</td>
+									<td class="td2" id="gwzl">通知</td>
 								</tr>
 								<tr>
 									<td class="td1">成文日期:</td>
-									<td class="td2">2021年3月23号</td>
+									<td class="td2" id="cwrq">2021年3月23号</td>
 									<td class="td1">发布日期</td>
-									<td class="td2">2021年</td>
+									<td class="td2" id="fbrq">2021年</td>
 								</tr>
 							</table>
 						</div>
@@ -241,8 +241,8 @@
 					layer.msg('请输入检索信息');
 					return;
 				}
-				sessionStorage.ELK_SEARCH = $('#search-input').val();
-				window.location = 'wj.html';
+				sessionStorage.ES_SEARCH = $('#search-input').val();
+				window.location = 'wj2.html';
 			});
 			$('#search-input').bind('keyup', function(event) {
 				if (event.keyCode == "13") {
@@ -291,24 +291,41 @@
 			var data = sessionStorage.ELK_ARTICLE;
 			if (data) {
 				data = JSON.parse(data);
+				console.log(data)
+				// 标题
+				$('#title').text(data.title);
+				// 发文机关
+				$('#fwjg').text(data.puborg);
+				// 发文字号
+				$('#fwzh').text(data.pcode);
+				// 来源
+				$('#ly').text(data.source);
+				// 主题分类
+				$('#ztfl').text(data.childtype);
+				// 公文种类
+				$('#gwzl').text("公文种类还没找到对应字段");
+				// 成文日期
+				$('#cwrq').text("成文日期还没找到对应字段");
+				// 发布日期
+				$('#fbrq').text(data.pubtimestr);
 				$('#d-title').text(data.title);
 				$('#d-content').empty().append(escape2Html(data.content));
-				$('#d-dept').text(data.departmentname);
+				// $('#d-dept').text(data.departmentname);
 			}
 			$
 					.ajax({
 						type : 'get',
 
-						url : '/elk/deptAll',
+						url : '/elk/getPubs',
 						success : function(obj) {
 							if (obj.data && obj.data.length > 0) {
 								var data = obj.data;
 								var html = '<div class="tangchu-item" title="全部" onclick="openSearch(\'全部\')">全部</div>';
 								for (var i = 0; i < data.length; i++) {
 									html += '<div class="tangchu-item" title="'
-											+ data[i]
+											+ data[i].puborg
 											+ '" onclick="openSearch(\''
-											+ data[i] + '\')">' + data[i]
+											+ data[i].puborg + '\')">' + data[i].puborg
 											+ '</div>';
 								}
 								$('.tangchu').empty().append(html);
@@ -319,14 +336,14 @@
 						}
 					})
 		}
-		function openSearch(dept) {
-			if (dept == '全部') {
-				sessionStorage.ELK_DEPTNAME = '';
+		function openSearch(org) {
+			if (org == '全部') {
+				sessionStorage.ES_ORGNAME = '';
 			} else {
-				sessionStorage.ELK_DEPTNAME = dept;
+				sessionStorage.ES_ORGNAME = org;
 			}
-			$('.all').text(dept);
-			window.location = 'wj.html';
+			$('.all').text(org);
+			window.location = 'wj2.html';
 		}
 		function escape2Html(str) {
 			var arrEntities = {
@@ -409,7 +426,7 @@
 			$
 					.ajax({
 						type : 'get',
-						url : '/elk/searchHot',
+						url : '/elk/searchHotArticle',
 						data : {
 							'page' : page2,
 							'limit' : 5,
@@ -432,7 +449,7 @@
 								for (var i = 0; i < data.length; i++) {
 									var content = (data[i]).sourceAsMap.content;
 									var title = (data[i]).sourceAsMap.title;
-									var deptName = (data[i]).sourceAsMap.departmentname;
+									var colname = (data[i]).sourceAsMap.colname;
 									var url = (data[i]).sourceAsMap.url;
 									var iii = 2;
 									if (i < 2) {