WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2022-09-02 17:41:11 +08:00
parent eab008751b f95f647367
commit bb6b238ec9
4 changed files with 83 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+30 -10
View File
@@ -555,15 +555,15 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
Map<String, Object> map31 = new HashMap<>(); Map<String, Object> map31 = new HashMap<>();
Map<String, Object> map41 = new HashMap<>(); Map<String, Object> map41 = new HashMap<>();
if("serial_number".equals(field)){ if("serial_number".equals(field)){
map31.put("boost",1); map31.put("boost",10);
}else if("title".equals(field)){ }else if("title".equals(field)){
map31.put("boost",1); map31.put("boost",10);
}else if("file_text".equals(field)){ }else if("file_text".equals(field)){
map31.put("boost",0.01); map31.put("boost",0.01);
}else if("content".equals(field)){ }else if("content".equals(field)){
map31.put("boost",0.01); map31.put("boost",0.01);
}else if("file_name".equals(field)){ }else if("file_name".equals(field)){
map31.put("boost",1); map31.put("boost",10);
} }
map31.put("value", selectValue); map31.put("value", selectValue);
map21.put(field + ".keyword", map31); map21.put(field + ".keyword", map31);
@@ -575,15 +575,15 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
Map<String, Object> map32 = new HashMap<>(); Map<String, Object> map32 = new HashMap<>();
Map<String, Object> map42 = new HashMap<>(); Map<String, Object> map42 = new HashMap<>();
if("serial_number".equals(field)){ if("serial_number".equals(field)){
map32.put("boost",1); map32.put("boost",10);
}else if("title".equals(field)){ }else if("title".equals(field)){
map32.put("boost",1); map32.put("boost",10);
}else if("file_text".equals(field)){ }else if("file_text".equals(field)){
map32.put("boost",0.01); map32.put("boost",0.01);
}else if("content".equals(field)){ }else if("content".equals(field)){
map32.put("boost",0.01); map32.put("boost",0.01);
}else if("file_name".equals(field)){ }else if("file_name".equals(field)){
map32.put("boost",1); map32.put("boost",10);
} }
map32.put("query", selectValue); map32.put("query", selectValue);
map22.put(field, map32); map22.put(field, map32);
@@ -593,8 +593,21 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
// match分词匹配查询 // match分词匹配查询
// 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字 // 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字
Map<String, Object> map23 = new HashMap<>(); Map<String, Object> map23 = new HashMap<>();
Map<String, Object> map33 = new HashMap<>();
Map<String, Object> map43 = new HashMap<>(); Map<String, Object> map43 = new HashMap<>();
map23.put(field, selectValue); if("serial_number".equals(field)){
map33.put("boost",10);
}else if("title".equals(field)){
map33.put("boost",10);
}else if("file_text".equals(field)){
map33.put("boost",0.01);
}else if("content".equals(field)){
map33.put("boost",0.01);
}else if("file_name".equals(field)){
map33.put("boost",10);
}
map33.put("query", selectValue);
map23.put(field, map33);
map43.put("match", map23); map43.put("match", map23);
queryMapJson.add(map43); queryMapJson.add(map43);
@@ -1519,7 +1532,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
Map<String, Object> map31 = new HashMap<>(); Map<String, Object> map31 = new HashMap<>();
Map<String, Object> map41 = new HashMap<>(); Map<String, Object> map41 = new HashMap<>();
if("title".equals(field)){ if("title".equals(field)){
map31.put("boost",1); map31.put("boost",10);
}else if("content".equals(field)){ }else if("content".equals(field)){
map31.put("boost",0.01); map31.put("boost",0.01);
} }
@@ -1533,7 +1546,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
Map<String, Object> map32 = new HashMap<>(); Map<String, Object> map32 = new HashMap<>();
Map<String, Object> map42 = new HashMap<>(); Map<String, Object> map42 = new HashMap<>();
if("title".equals(field)){ if("title".equals(field)){
map32.put("boost",1); map32.put("boost",10);
}else if("content".equals(field)){ }else if("content".equals(field)){
map32.put("boost",0.01); map32.put("boost",0.01);
} }
@@ -1545,8 +1558,15 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
// match分词匹配查询 // match分词匹配查询
// 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字 // 情况举例：用户可能他知道开头的前缀几个字，知道中间的几个字
Map<String, Object> map23 = new HashMap<>(); Map<String, Object> map23 = new HashMap<>();
Map<String, Object> map33 = new HashMap<>();
Map<String, Object> map43 = new HashMap<>(); Map<String, Object> map43 = new HashMap<>();
map23.put(field, selectValue); if("title".equals(field)){
map33.put("boost",10);
}else if("content".equals(field)){
map33.put("boost",0.01);
}
map33.put("query", selectValue);
map23.put(field, map33);
map43.put("match", map23); map43.put("match", map23);
queryMapJson.add(map43); queryMapJson.add(map43);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
+3 -4
View File
@@ -251,7 +251,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
if("title".equals(field)){ if("title".equals(field)){
map31.put("boost",10); map31.put("boost",10);
}else if("content".equals(field)){ }else if("content".equals(field)){
map31.put("boost",2); map31.put("boost",0.01);
} }
map31.put("value", selectValue); map31.put("value", selectValue);
map21.put(field + ".keyword", map31); map21.put(field + ".keyword", map31);
@@ -265,7 +265,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
if("title".equals(field)){ if("title".equals(field)){
map32.put("boost",10); map32.put("boost",10);
}else if("content".equals(field)){ }else if("content".equals(field)){
map32.put("boost",2); map32.put("boost",0.01);
} }
map32.put("query", selectValue); map32.put("query", selectValue);
map22.put(field, map32); map22.put(field, map32);
@@ -280,11 +280,10 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
if("title".equals(field)){ if("title".equals(field)){
map33.put("boost",10); map33.put("boost",10);
}else if("content".equals(field)){ }else if("content".equals(field)){
map33.put("boost",2); map33.put("boost",0.01);
} }
map33.put("query", selectValue); map33.put("query", selectValue);
map23.put(field, map33); map23.put(field, map33);
map23.put(field, selectValue);
map43.put("match", map23); map43.put("match", map23);
queryMapJson.add(map43); queryMapJson.add(map43);
jero-web/src/components/search/index.vue
+26 -21
View File
@@ -191,7 +191,7 @@
searchQuery() { searchQuery() {
if (this.isDefault) { if (this.isDefault) {
let startTime = moment(new Date()).format('YYYY-MM-DD') let startTime = moment(new Date()).format('YYYY-MM-DD')
let endTime = this.haflYear() let endTime = this.getNowdate()
if (this.queryParam['WarnTime'].length == 0) { if (this.queryParam['WarnTime'].length == 0) {
this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam['WarnTime'] = [startTime, endTime]
} }
@@ -203,7 +203,8 @@
this.queryParam = {} this.queryParam = {}
if (this.isDefault) { if (this.isDefault) {
let startTime = moment(new Date()).format('YYYY-MM-DD') let startTime = moment(new Date()).format('YYYY-MM-DD')
let endTime = this.haflYear() let endTime = this.getNowdate()
console.log(endTime)
this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam['WarnTime'] = [startTime, endTime]
this.queryParam = { ...this.queryParam } this.queryParam = { ...this.queryParam }
} }
@@ -225,26 +226,30 @@
} }
}) })
}, },
haflYear() { getNowdate(){
// 先获取当前时间 var date_now = new Date()//获取当前时间
var curDate = (new Date()).getTime() var year = date_now.getFullYear()//获取当前时间的年份
// 将半年的时间单位换算成毫秒 var month = date_now.getMonth()//获取当前时间的月份
var halfYear = 365 / 2 * 24 * 3600 * 1000 var day = date_now.getDate()//获取当前时间的日
// 半年前的时间（毫秒单位） var days = new Date(year,month,0)//将获取到的年月赋值给days
var pastResult = curDate + halfYear days = days.getDate()//获取当前年月的日
// 日期函数，定义起点为半年前 var year2 = year
var pastDate = new Date(pastResult) var month2 = parseInt(month+7)//获取当前月份的1一个月以后的月份
var pastYear = pastDate.getFullYear() if(month2 > 12){
var pastMonth = pastDate.getMonth() + 1 year2 = parseInt(year2) + 1
var pastDay = pastDate.getDate() month2 = parseInt(month2) % 12
if (pastMonth >= 1 && pastMonth <= 9) { }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
pastMonth = '0' + pastMonth var day2 = day
var days2 = new Date(year2,month2,0)
days2 = days2.getDate()
if(day2>days2){
day2 = days2
}//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
if(month2 < 10){
month2 = '0' + month2
} }
if (pastDay >= 0 && pastDay <= 9) { var time = year2 + '-' + month2 + '-' + day2
pastDay = '0' + pastDay return time
}
var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1)
return endDate
}, },
dateChange(item) { dateChange(item) {
this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD') this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
jero-web/src/views/regulatoryEarlyWarning/index.vue
+24 -20
View File
@@ -273,32 +273,36 @@
}, },
clearSelected() { clearSelected() {
let startTime = moment(new Date()).format('YYYY-MM-DD') let startTime = moment(new Date()).format('YYYY-MM-DD')
let endTime = this.haflYear() let endTime = this.getNowdate()
this.searchParmes['WarnTime'] = [startTime, endTime] this.searchParmes['WarnTime'] = [startTime, endTime]
this.searchParmes = { ...this.searchParmes } this.searchParmes = { ...this.searchParmes }
this.pageNo = 1 this.pageNo = 1
this.getList() this.getList()
}, },
haflYear() { getNowdate(){
// 先获取当前时间 var date_now = new Date()//获取当前时间
var curDate = (new Date()).getTime() var year = date_now.getFullYear()//获取当前时间的年份
// 将半年的时间单位换算成毫秒 var month = date_now.getMonth()//获取当前时间的月份
var halfYear = 365 / 2 * 24 * 3600 * 1000 var day = date_now.getDate()//获取当前时间的日
// 半年前的时间（毫秒单位） var days = new Date(year,month,0)//将获取到的年月赋值给days
var pastResult = curDate + halfYear days = days.getDate()//获取当前年月的日
// 日期函数，定义起点为半年前 var year2 = year
var pastDate = new Date(pastResult) var month2 = parseInt(month+7)//获取当前月份的1一个月以后的月份
var pastYear = pastDate.getFullYear() if(month2 > 12){
var pastMonth = pastDate.getMonth() + 1 year2 = parseInt(year2) + 1
var pastDay = pastDate.getDate() month2 = parseInt(month2) % 12
if (pastMonth >= 1 && pastMonth <= 9) { }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
pastMonth = '0' + pastMonth var day2 = day
var days2 = new Date(year2,month2,0)
days2 = days2.getDate()
if(day2>days2){
day2 = days2
}//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
if(month2 < 10){
month2 = '0' + month2
} }
if (pastDay >= 0 && pastDay <= 9) { var time = year2 + '-' + month2 + '-' + day2
pastDay = '0' + pastDay return time
}
var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1)
return endDate
}, },
pageOnChange(page) { pageOnChange(page) {
this.pageNo = page this.pageNo = page