FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-30 09:56:54 +08:00
parent 2fb1faacfa 4c6cffa061
commit 56e62ac041
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class DocConverterPdf {
/** /**
* openOffice目录，window 可能在C://Program Files (x86)//OpenOffice 4 * openOffice目录，window 可能在C://Program Files (x86)//OpenOffice 4
*/ */
private static final String openOfficeHome = "E://Software//rtpro//Foton//File//openOffice//4"; private static final String openOfficeHome = "/opt/openoffice4";
/** /**
* openOffice端口 * openOffice端口
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+2 -2
View File
@@ -164,7 +164,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryShould.should(rangeQueryBuilder); boolQueryShould.should(rangeQueryBuilder);
RangeQueryBuilder rangeQueryBuilder2 = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); RangeQueryBuilder rangeQueryBuilder2 = QueryBuilders.rangeQuery("put_time_data").format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryShould.should(rangeQueryBuilder2); boolQueryShould.should(rangeQueryBuilder2);
} }
break; break;
@@ -597,7 +597,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
if (searchInfoEO.getPutTime() != null) { if (searchInfoEO.getPutTime() != null) {
Long starttime = searchInfoEO.getPutTime().getTime(); Long starttime = searchInfoEO.getPutTime().getTime();
Long endtime = searchInfoEO.getPutTime().getTime(); Long endtime = searchInfoEO.getPutTime().getTime();
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("put_time_data").format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true);
boolQueryBuilder.filter(rangeQueryBuilder); boolQueryBuilder.filter(rangeQueryBuilder);
} }
adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class SendBussMQService {
if (StringUtils.isNotBlank(infoEO.getPutTime())) { if (StringUtils.isNotBlank(infoEO.getPutTime())) {
try { try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
put_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00"); put_time_data = format.parse(dateFormatToStr(infoEO.getPutTime())+" 00:00:00");
} catch (ParseException ignored) { } catch (ParseException ignored) {
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
.like(StringUtils.isNotEmpty(cname),"cname",cname) .like(StringUtils.isNotEmpty(cname),"cname",cname)
.ge(start!=null,"start_time",start) .ge(start!=null,"start_time",start)
.le(end!=null,"end_time",end) .le(end!=null,"end_time",end)
.orderByDesc("start_time"); .orderByAsc("end_time");
Page<SarPublicIdea> page = new Page<>(p,size); Page<SarPublicIdea> page = new Page<>(p,size);
IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list); IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
System.out.println("总条数"+userIPage.getTotal()); System.out.println("总条数"+userIPage.getTotal());