diff --git a/src/main/config/es/fess_log.json b/src/main/config/es/fess_log.json index 463e69b43..c5781d8ef 100644 --- a/src/main/config/es/fess_log.json +++ b/src/main/config/es/fess_log.json @@ -25,8 +25,9 @@ "enabled" : false }, "properties" : { - "createdTime" : { - "type" : "long" + "createdAt" : { + "type" : "date", + "format" : "date_optional_time" }, "url" : { "type" : "string", @@ -45,7 +46,7 @@ "properties" : { "createdAt" : { "type" : "date", - "format" : "dateOptionalTime" + "format" : "date_optional_time" }, "createdBy" : { "type" : "string", @@ -69,8 +70,9 @@ "enabled" : false }, "properties" : { - "requestedTime" : { - "type" : "long" + "requestedAt" : { + "type" : "date", + "format" : "date_optional_time" }, "searchLogId" : { "type" : "string", @@ -91,6 +93,10 @@ "type" : "string", "index" : "not_analyzed" }, + "user" : { + "type" : "string", + "index" : "not_analyzed" + }, "clientIp" : { "type" : "string", "index" : "not_analyzed" @@ -108,11 +114,15 @@ "type" : "string", "index" : "not_analyzed" }, - "requestedTime" : { - "type" : "long" + "requestedAt" : { + "type" : "date", + "format" : "date_optional_time" }, "responseTime" : { - "type" : "integer" + "type" : "long" + }, + "queryTime" : { + "type" : "long" }, "searchWord" : { "type" : "string", @@ -137,15 +147,13 @@ "enabled" : false }, "properties" : { - "code" : { - "type" : "string", - "index" : "not_analyzed" + "createdAt" : { + "type" : "date", + "format" : "date_optional_time" }, - "createdTime" : { - "type" : "long" - }, - "updatedTime" : { - "type" : "long" + "updatedAt" : { + "type" : "date", + "format" : "date_optional_time" } } } diff --git a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java index 8583a2f88..a8fe6ac60 100644 --- a/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java +++ b/src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java @@ -38,13 +38,11 @@ public class FavoriteLogService { protected FavoriteLogBhv favoriteLogBhv; public boolean addUrl(final String userCode, final String url) { - return userInfoBhv.selectEntity(cb -> { - cb.query().setCode_Equal(userCode); - }).map(userInfo -> { + return userInfoBhv.selectByPK(userCode).map(userInfo -> { final FavoriteLog favoriteLog = new FavoriteLog(); favoriteLog.setUserInfoId(userInfo.getId()); favoriteLog.setUrl(url); - favoriteLog.setCreatedTime(systemHelper.getCurrentTimeAsLong()); + favoriteLog.setCreatedAt(systemHelper.getCurrentTimeAsLocalDateTime()); favoriteLogBhv.insert(favoriteLog); return true; }).orElse(false); @@ -55,9 +53,7 @@ public class FavoriteLogService { return urlList; } - return userInfoBhv.selectEntity(cb -> { - cb.query().setCode_Equal(userCode); - }).map(userInfo -> { + return userInfoBhv.selectByPK(userCode).map(userInfo -> { final ListResultBean list = favoriteLogBhv.selectList(cb2 -> { cb2.query().setUserInfoId_Equal(userInfo.getId()); cb2.query().setUrl_InScope(urlList); diff --git a/src/main/java/org/codelibs/fess/app/service/SearchService.java b/src/main/java/org/codelibs/fess/app/service/SearchService.java index aaa018808..274de42e3 100644 --- a/src/main/java/org/codelibs/fess/app/service/SearchService.java +++ b/src/main/java/org/codelibs/fess/app/service/SearchService.java @@ -16,6 +16,7 @@ package org.codelibs.fess.app.service; import java.text.NumberFormat; +import java.time.LocalDateTime; import java.util.Enumeration; import java.util.HashSet; import java.util.List; @@ -40,7 +41,6 @@ import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.es.client.FessEsClient.SearchConditionBuilder; import org.codelibs.fess.es.client.FessEsClientException; import org.codelibs.fess.es.log.exentity.SearchLog; -import org.codelibs.fess.es.log.exentity.UserInfo; import org.codelibs.fess.helper.FieldHelper; import org.codelibs.fess.helper.QueryHelper; import org.codelibs.fess.helper.SearchLogHelper; @@ -49,6 +49,7 @@ import org.codelibs.fess.helper.UserInfoHelper; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.QueryResponseList; import org.dbflute.optional.OptionalEntity; +import org.dbflute.util.DfTypeUtil; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.index.query.QueryBuilders; @@ -153,11 +154,6 @@ public class SearchService { data.setAppendHighlightParams(buf.toString()); } - // search log - if (searchLogSupport) { - storeSearchLog(request, requestedTime, query, pageStart, pageSize, queryResponseList); - } - queryResponseList.setExecTime(System.currentTimeMillis() - startTime); final NumberFormat nf = NumberFormat.getInstance(request.getLocale()); nf.setMaximumIntegerDigits(2); @@ -183,40 +179,41 @@ public class SearchService { data.setQueryTime(queryResponseList.getQueryTime()); data.setSearchQuery(query); data.setRequestedTime(requestedTime); + + // search log + if (searchLogSupport) { + storeSearchLog(request, DfTypeUtil.toLocalDateTime(requestedTime), query, pageStart, pageSize, queryResponseList); + } } - protected void storeSearchLog(final HttpServletRequest request, final long requestedTime, final String query, final int pageStart, - final int pageSize, final QueryResponseList queryResponseList) { + protected void storeSearchLog(final HttpServletRequest request, final LocalDateTime requestedTime, final String query, + final int pageStart, final int pageSize, final QueryResponseList queryResponseList) { final SearchLogHelper searchLogHelper = ComponentUtil.getSearchLogHelper(); final SearchLog searchLog = new SearchLog(); - String userCode = null; if (Constants.TRUE.equals(crawlerProperties.getProperty(Constants.USER_INFO_PROPERTY, Constants.TRUE))) { - userCode = userInfoHelper.getUserCode(); - if (StringUtil.isNotBlank(userCode)) { - final UserInfo userInfo = new UserInfo(); - userInfo.setCode(userCode); - userInfo.setCreatedTime(requestedTime); - userInfo.setUpdatedTime(requestedTime); - searchLog.setUserInfo(OptionalEntity.of(userInfo)); + String userCode = userInfoHelper.getUserCode(); + if (userCode != null) { + searchLog.setUserSessionId(userCode); } } searchLog.setHitCount(queryResponseList.getAllRecordCount()); - searchLog.setResponseTime(Integer.valueOf((int) queryResponseList.getExecTime())); + searchLog.setResponseTime(queryResponseList.getExecTime()); + searchLog.setQueryTime(queryResponseList.getQueryTime()); searchLog.setSearchWord(StringUtils.abbreviate(query, 1000)); searchLog.setSearchQuery(StringUtils.abbreviate(queryResponseList.getSearchQuery(), 1000)); - searchLog.setRequestedTime(requestedTime); + searchLog.setRequestedAt(requestedTime); searchLog.setQueryOffset(pageStart); searchLog.setQueryPageSize(pageSize); + ComponentUtil.getLoginAssist().getSessionUserBean().ifPresent(user -> { + searchLog.setUser(user.getUserId()); + }); searchLog.setClientIp(StringUtils.abbreviate(request.getRemoteAddr(), 50)); searchLog.setReferer(StringUtils.abbreviate(request.getHeader("referer"), 1000)); searchLog.setUserAgent(StringUtils.abbreviate(request.getHeader("user-agent"), 255)); - if (userCode != null) { - searchLog.setUserSessionId(userCode); - } final Object accessType = request.getAttribute(Constants.SEARCH_LOG_ACCESS_TYPE); if (Constants.SEARCH_LOG_ACCESS_TYPE_JSON.equals(accessType)) { searchLog.setAccessType(Constants.SEARCH_LOG_ACCESS_TYPE_JSON); diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java index 9cc2147fa..5287b18b5 100644 --- a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java @@ -34,6 +34,7 @@ import org.codelibs.fess.helper.SearchLogHelper; import org.codelibs.fess.helper.ViewHelper; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocumentUtil; +import org.dbflute.util.DfTypeUtil; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.TermQueryBuilder; import org.lastaflute.web.Execute; @@ -93,9 +94,8 @@ public class GoAction extends FessSearchAction { final SearchLogHelper searchLogHelper = ComponentUtil.getSearchLogHelper(); final ClickLog clickLog = new ClickLog(); clickLog.setUrl(url); - final long now = systemHelper.getCurrentTimeAsLong(); - clickLog.setRequestedTime(now); - clickLog.setQueryRequestedTime(Long.parseLong(form.rt)); + clickLog.setRequestedAt(systemHelper.getCurrentTimeAsLocalDateTime()); + clickLog.setQueryRequestedAt(DfTypeUtil.toLocalDateTime(Long.parseLong(form.rt))); clickLog.setUserSessionId(userSessionId); clickLog.setDocId(form.docId); long clickCount = 0; diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java index 24a06e282..3167ce40c 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java @@ -230,6 +230,10 @@ public abstract class EsAbstractBehavior indexOption = esEntity.asDocMeta().indexOption(); if (indexOption != null) { indexOption.callback(builder); diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java index af1d972a0..fbc65c4fb 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java @@ -230,6 +230,10 @@ public abstract class EsAbstractBehavior indexOption = esEntity.asDocMeta().indexOption(); if (indexOption != null) { indexOption.callback(builder); diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java index 8102b2943..e1e7f2fea 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java @@ -74,7 +74,7 @@ public abstract class BsClickLogBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class entityType) { try { final RESULT result = entityType.newInstance(); - result.setRequestedTime(DfTypeUtil.toLong(source.get("requestedTime"))); + result.setRequestedAt(DfTypeUtil.toLocalDateTime(source.get("requestedAt"))); result.setSearchLogId(DfTypeUtil.toString(source.get("searchLogId"))); result.setUrl(DfTypeUtil.toString(source.get("url"))); return result; diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java index c1b6f0cbd..c4027f680 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java @@ -74,7 +74,7 @@ public abstract class BsFavoriteLogBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class entityType) { try { final RESULT result = entityType.newInstance(); - result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime"))); + result.setCreatedAt(DfTypeUtil.toLocalDateTime(source.get("createdAt"))); result.setUrl(DfTypeUtil.toString(source.get("url"))); result.setUserInfoId(DfTypeUtil.toString(source.get("userInfoId"))); return result; diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java index f0b167ec2..b8dc4237b 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java @@ -75,13 +75,15 @@ public abstract class BsSearchLogBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class entityType) { try { final RESULT result = entityType.newInstance(); - result.setCode(DfTypeUtil.toString(source.get("code"))); - result.setCreatedTime(DfTypeUtil.toLong(source.get("createdTime"))); - result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime"))); + result.setCreatedAt(DfTypeUtil.toLocalDateTime(source.get("createdAt"))); + result.setUpdatedAt(DfTypeUtil.toLocalDateTime(source.get("updatedAt"))); return result; } catch (InstantiationException | IllegalAccessException e) { final String msg = "Cannot create a new instance: " + entityType.getName(); diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java index 1a5387391..8c07b8459 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsClickLog.java @@ -37,8 +37,8 @@ public class BsClickLog extends EsAbstractEntity { // =================================================================================== // Attribute // ========= - /** requestedTime */ - protected Long requestedTime; + /** requestedAt */ + protected LocalDateTime requestedAt; /** searchLogId */ protected String searchLogId; @@ -67,8 +67,8 @@ public class BsClickLog extends EsAbstractEntity { @Override public Map toSource() { Map sourceMap = new HashMap<>(); - if (requestedTime != null) { - sourceMap.put("requestedTime", requestedTime); + if (requestedAt != null) { + sourceMap.put("requestedAt", requestedAt); } if (searchLogId != null) { sourceMap.put("searchLogId", searchLogId); @@ -85,7 +85,7 @@ public class BsClickLog extends EsAbstractEntity { @Override protected String doBuildColumnString(String dm) { StringBuilder sb = new StringBuilder(); - sb.append(dm).append(requestedTime); + sb.append(dm).append(requestedAt); sb.append(dm).append(searchLogId); sb.append(dm).append(url); if (sb.length() > dm.length()) { @@ -98,14 +98,14 @@ public class BsClickLog extends EsAbstractEntity { // =================================================================================== // Accessor // ======== - public Long getRequestedTime() { - checkSpecifiedProperty("requestedTime"); - return requestedTime; + public LocalDateTime getRequestedAt() { + checkSpecifiedProperty("requestedAt"); + return requestedAt; } - public void setRequestedTime(Long value) { - registerModifiedProperty("requestedTime"); - this.requestedTime = value; + public void setRequestedAt(LocalDateTime value) { + registerModifiedProperty("requestedAt"); + this.requestedAt = value; } public String getSearchLogId() { diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java index 4561d86bb..ede9f8b8b 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsFavoriteLog.java @@ -37,8 +37,8 @@ public class BsFavoriteLog extends EsAbstractEntity { // =================================================================================== // Attribute // ========= - /** createdTime */ - protected Long createdTime; + /** createdAt */ + protected LocalDateTime createdAt; /** url */ protected String url; @@ -67,8 +67,8 @@ public class BsFavoriteLog extends EsAbstractEntity { @Override public Map toSource() { Map sourceMap = new HashMap<>(); - if (createdTime != null) { - sourceMap.put("createdTime", createdTime); + if (createdAt != null) { + sourceMap.put("createdAt", createdAt); } if (url != null) { sourceMap.put("url", url); @@ -85,7 +85,7 @@ public class BsFavoriteLog extends EsAbstractEntity { @Override protected String doBuildColumnString(String dm) { StringBuilder sb = new StringBuilder(); - sb.append(dm).append(createdTime); + sb.append(dm).append(createdAt); sb.append(dm).append(url); sb.append(dm).append(userInfoId); if (sb.length() > dm.length()) { @@ -98,14 +98,14 @@ public class BsFavoriteLog extends EsAbstractEntity { // =================================================================================== // Accessor // ======== - public Long getCreatedTime() { - checkSpecifiedProperty("createdTime"); - return createdTime; + public LocalDateTime getCreatedAt() { + checkSpecifiedProperty("createdAt"); + return createdAt; } - public void setCreatedTime(Long value) { - registerModifiedProperty("createdTime"); - this.createdTime = value; + public void setCreatedAt(LocalDateTime value) { + registerModifiedProperty("createdAt"); + this.createdAt = value; } public String getUrl() { diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java index 74932d9d5..c606b265f 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsSearchLog.java @@ -40,6 +40,9 @@ public class BsSearchLog extends EsAbstractEntity { /** accessType */ protected String accessType; + /** user */ + protected String user; + /** clientIp */ protected String clientIp; @@ -55,11 +58,14 @@ public class BsSearchLog extends EsAbstractEntity { /** referer */ protected String referer; - /** requestedTime */ - protected Long requestedTime; + /** requestedAt */ + protected LocalDateTime requestedAt; /** responseTime */ - protected Integer responseTime; + protected Long responseTime; + + /** queryTime */ + protected Long queryTime; /** searchWord */ protected String searchWord; @@ -97,6 +103,9 @@ public class BsSearchLog extends EsAbstractEntity { if (accessType != null) { sourceMap.put("accessType", accessType); } + if (user != null) { + sourceMap.put("user", user); + } if (clientIp != null) { sourceMap.put("clientIp", clientIp); } @@ -112,12 +121,15 @@ public class BsSearchLog extends EsAbstractEntity { if (referer != null) { sourceMap.put("referer", referer); } - if (requestedTime != null) { - sourceMap.put("requestedTime", requestedTime); + if (requestedAt != null) { + sourceMap.put("requestedAt", requestedAt); } if (responseTime != null) { sourceMap.put("responseTime", responseTime); } + if (queryTime != null) { + sourceMap.put("queryTime", queryTime); + } if (searchWord != null) { sourceMap.put("searchWord", searchWord); } @@ -140,13 +152,15 @@ public class BsSearchLog extends EsAbstractEntity { protected String doBuildColumnString(String dm) { StringBuilder sb = new StringBuilder(); sb.append(dm).append(accessType); + sb.append(dm).append(user); sb.append(dm).append(clientIp); sb.append(dm).append(hitCount); sb.append(dm).append(queryOffset); sb.append(dm).append(queryPageSize); sb.append(dm).append(referer); - sb.append(dm).append(requestedTime); + sb.append(dm).append(requestedAt); sb.append(dm).append(responseTime); + sb.append(dm).append(queryTime); sb.append(dm).append(searchWord); sb.append(dm).append(userAgent); sb.append(dm).append(userInfoId); @@ -171,6 +185,16 @@ public class BsSearchLog extends EsAbstractEntity { this.accessType = value; } + public String getUser() { + checkSpecifiedProperty("user"); + return convertEmptyToNull(user); + } + + public void setUser(String value) { + registerModifiedProperty("user"); + this.user = value; + } + public String getClientIp() { checkSpecifiedProperty("clientIp"); return convertEmptyToNull(clientIp); @@ -221,26 +245,36 @@ public class BsSearchLog extends EsAbstractEntity { this.referer = value; } - public Long getRequestedTime() { - checkSpecifiedProperty("requestedTime"); - return requestedTime; + public LocalDateTime getRequestedAt() { + checkSpecifiedProperty("requestedAt"); + return requestedAt; } - public void setRequestedTime(Long value) { - registerModifiedProperty("requestedTime"); - this.requestedTime = value; + public void setRequestedAt(LocalDateTime value) { + registerModifiedProperty("requestedAt"); + this.requestedAt = value; } - public Integer getResponseTime() { + public Long getResponseTime() { checkSpecifiedProperty("responseTime"); return responseTime; } - public void setResponseTime(Integer value) { + public void setResponseTime(Long value) { registerModifiedProperty("responseTime"); this.responseTime = value; } + public Long getQueryTime() { + checkSpecifiedProperty("queryTime"); + return queryTime; + } + + public void setQueryTime(Long value) { + registerModifiedProperty("queryTime"); + this.queryTime = value; + } + public String getSearchWord() { checkSpecifiedProperty("searchWord"); return convertEmptyToNull(searchWord); diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java b/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java index c8e6d7f77..eb5de8a1e 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/BsUserInfo.java @@ -37,14 +37,11 @@ public class BsUserInfo extends EsAbstractEntity { // =================================================================================== // Attribute // ========= - /** code */ - protected String code; + /** createdAt */ + protected LocalDateTime createdAt; - /** createdTime */ - protected Long createdTime; - - /** updatedTime */ - protected Long updatedTime; + /** updatedAt */ + protected LocalDateTime updatedAt; // [Referrers] *comment only @@ -67,14 +64,11 @@ public class BsUserInfo extends EsAbstractEntity { @Override public Map toSource() { Map sourceMap = new HashMap<>(); - if (code != null) { - sourceMap.put("code", code); + if (createdAt != null) { + sourceMap.put("createdAt", createdAt); } - if (createdTime != null) { - sourceMap.put("createdTime", createdTime); - } - if (updatedTime != null) { - sourceMap.put("updatedTime", updatedTime); + if (updatedAt != null) { + sourceMap.put("updatedAt", updatedAt); } return sourceMap; } @@ -85,9 +79,8 @@ public class BsUserInfo extends EsAbstractEntity { @Override protected String doBuildColumnString(String dm) { StringBuilder sb = new StringBuilder(); - sb.append(dm).append(code); - sb.append(dm).append(createdTime); - sb.append(dm).append(updatedTime); + sb.append(dm).append(createdAt); + sb.append(dm).append(updatedAt); if (sb.length() > dm.length()) { sb.delete(0, dm.length()); } @@ -98,33 +91,23 @@ public class BsUserInfo extends EsAbstractEntity { // =================================================================================== // Accessor // ======== - public String getCode() { - checkSpecifiedProperty("code"); - return convertEmptyToNull(code); + public LocalDateTime getCreatedAt() { + checkSpecifiedProperty("createdAt"); + return createdAt; } - public void setCode(String value) { - registerModifiedProperty("code"); - this.code = value; + public void setCreatedAt(LocalDateTime value) { + registerModifiedProperty("createdAt"); + this.createdAt = value; } - public Long getCreatedTime() { - checkSpecifiedProperty("createdTime"); - return createdTime; + public LocalDateTime getUpdatedAt() { + checkSpecifiedProperty("updatedAt"); + return updatedAt; } - public void setCreatedTime(Long value) { - registerModifiedProperty("createdTime"); - this.createdTime = value; - } - - public Long getUpdatedTime() { - checkSpecifiedProperty("updatedTime"); - return updatedTime; - } - - public void setUpdatedTime(Long value) { - registerModifiedProperty("updatedTime"); - this.updatedTime = value; + public void setUpdatedAt(LocalDateTime value) { + registerModifiedProperty("updatedAt"); + this.updatedAt = value; } } diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java index bc1a6a44c..216bea24f 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java @@ -79,8 +79,8 @@ public class ClickLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((ClickLog) et).getRequestedTime(), (et, vl) -> ((ClickLog) et).setRequestedTime(DfTypeUtil.toLong(vl)), - "requestedTime"); + setupEpg(_epgMap, et -> ((ClickLog) et).getRequestedAt(), + (et, vl) -> ((ClickLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); setupEpg(_epgMap, et -> ((ClickLog) et).getSearchLogId(), (et, vl) -> ((ClickLog) et).setSearchLogId(DfTypeUtil.toString(vl)), "searchLogId"); setupEpg(_epgMap, et -> ((ClickLog) et).getUrl(), (et, vl) -> ((ClickLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); @@ -120,15 +120,15 @@ public class ClickLogDbm extends AbstractDBMeta { // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnRequestedTime = cci("requestedTime", "requestedTime", null, null, Long.class, "requestedTime", null, - false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, + false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnRequestedTime() { - return _columnRequestedTime; + public ColumnInfo columnRequestedAt() { + return _columnRequestedAt; } public ColumnInfo columnSearchLogId() { @@ -141,7 +141,7 @@ public class ClickLogDbm extends AbstractDBMeta { protected List ccil() { List ls = newArrayList(); - ls.add(columnRequestedTime()); + ls.add(columnRequestedAt()); ls.add(columnSearchLogId()); ls.add(columnUrl()); return ls; diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java index cbb590fda..f61502bae 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java @@ -79,8 +79,8 @@ public class FavoriteLogDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((FavoriteLog) et).getCreatedTime(), (et, vl) -> ((FavoriteLog) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); + setupEpg(_epgMap, et -> ((FavoriteLog) et).getCreatedAt(), + (et, vl) -> ((FavoriteLog) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), "createdAt"); setupEpg(_epgMap, et -> ((FavoriteLog) et).getUrl(), (et, vl) -> ((FavoriteLog) et).setUrl(DfTypeUtil.toString(vl)), "url"); setupEpg(_epgMap, et -> ((FavoriteLog) et).getUserInfoId(), (et, vl) -> ((FavoriteLog) et).setUserInfoId(DfTypeUtil.toString(vl)), "userInfoId"); @@ -120,15 +120,15 @@ public class FavoriteLogDbm extends AbstractDBMeta { // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, + false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; + public ColumnInfo columnCreatedAt() { + return _columnCreatedAt; } public ColumnInfo columnUrl() { @@ -141,7 +141,7 @@ public class FavoriteLogDbm extends AbstractDBMeta { protected List ccil() { List ls = newArrayList(); - ls.add(columnCreatedTime()); + ls.add(columnCreatedAt()); ls.add(columnUrl()); ls.add(columnUserInfoId()); return ls; diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java index b85c57cba..2b70006dc 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java @@ -81,6 +81,7 @@ public class SearchLogDbm extends AbstractDBMeta { { setupEpg(_epgMap, et -> ((SearchLog) et).getAccessType(), (et, vl) -> ((SearchLog) et).setAccessType(DfTypeUtil.toString(vl)), "accessType"); + setupEpg(_epgMap, et -> ((SearchLog) et).getUser(), (et, vl) -> ((SearchLog) et).setUser(DfTypeUtil.toString(vl)), "user"); setupEpg(_epgMap, et -> ((SearchLog) et).getClientIp(), (et, vl) -> ((SearchLog) et).setClientIp(DfTypeUtil.toString(vl)), "clientIp"); setupEpg(_epgMap, et -> ((SearchLog) et).getHitCount(), (et, vl) -> ((SearchLog) et).setHitCount(DfTypeUtil.toLong(vl)), "hitCount"); @@ -89,10 +90,12 @@ public class SearchLogDbm extends AbstractDBMeta { setupEpg(_epgMap, et -> ((SearchLog) et).getQueryPageSize(), (et, vl) -> ((SearchLog) et).setQueryPageSize(DfTypeUtil.toInteger(vl)), "queryPageSize"); setupEpg(_epgMap, et -> ((SearchLog) et).getReferer(), (et, vl) -> ((SearchLog) et).setReferer(DfTypeUtil.toString(vl)), "referer"); - setupEpg(_epgMap, et -> ((SearchLog) et).getRequestedTime(), (et, vl) -> ((SearchLog) et).setRequestedTime(DfTypeUtil.toLong(vl)), - "requestedTime"); - setupEpg(_epgMap, et -> ((SearchLog) et).getResponseTime(), (et, vl) -> ((SearchLog) et).setResponseTime(DfTypeUtil.toInteger(vl)), + setupEpg(_epgMap, et -> ((SearchLog) et).getRequestedAt(), + (et, vl) -> ((SearchLog) et).setRequestedAt(DfTypeUtil.toLocalDateTime(vl)), "requestedAt"); + setupEpg(_epgMap, et -> ((SearchLog) et).getResponseTime(), (et, vl) -> ((SearchLog) et).setResponseTime(DfTypeUtil.toLong(vl)), "responseTime"); + setupEpg(_epgMap, et -> ((SearchLog) et).getQueryTime(), (et, vl) -> ((SearchLog) et).setQueryTime(DfTypeUtil.toLong(vl)), + "queryTime"); setupEpg(_epgMap, et -> ((SearchLog) et).getSearchWord(), (et, vl) -> ((SearchLog) et).setSearchWord(DfTypeUtil.toString(vl)), "searchWord"); setupEpg(_epgMap, et -> ((SearchLog) et).getUserAgent(), (et, vl) -> ((SearchLog) et).setUserAgent(DfTypeUtil.toString(vl)), @@ -139,6 +142,8 @@ public class SearchLogDbm extends AbstractDBMeta { // =========== protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "String", 0, + 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false, @@ -149,10 +154,12 @@ public class SearchLogDbm extends AbstractDBMeta { null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnRequestedTime = cci("requestedTime", "requestedTime", null, null, Long.class, "requestedTime", null, + protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, + false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Integer.class, "responseTime", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false, + false, "Long", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, @@ -166,6 +173,10 @@ public class SearchLogDbm extends AbstractDBMeta { return _columnAccessType; } + public ColumnInfo columnUser() { + return _columnUser; + } + public ColumnInfo columnClientIp() { return _columnClientIp; } @@ -186,14 +197,18 @@ public class SearchLogDbm extends AbstractDBMeta { return _columnReferer; } - public ColumnInfo columnRequestedTime() { - return _columnRequestedTime; + public ColumnInfo columnRequestedAt() { + return _columnRequestedAt; } public ColumnInfo columnResponseTime() { return _columnResponseTime; } + public ColumnInfo columnQueryTime() { + return _columnQueryTime; + } + public ColumnInfo columnSearchWord() { return _columnSearchWord; } @@ -213,13 +228,15 @@ public class SearchLogDbm extends AbstractDBMeta { protected List ccil() { List ls = newArrayList(); ls.add(columnAccessType()); + ls.add(columnUser()); ls.add(columnClientIp()); ls.add(columnHitCount()); ls.add(columnQueryOffset()); ls.add(columnQueryPageSize()); ls.add(columnReferer()); - ls.add(columnRequestedTime()); + ls.add(columnRequestedAt()); ls.add(columnResponseTime()); + ls.add(columnQueryTime()); ls.add(columnSearchWord()); ls.add(columnUserAgent()); ls.add(columnUserInfoId()); diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java index 444ae6a5c..0a956c4c8 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java @@ -79,11 +79,10 @@ public class UserInfoDbm extends AbstractDBMeta { // --------------- protected final Map _epgMap = newHashMap(); { - setupEpg(_epgMap, et -> ((UserInfo) et).getCode(), (et, vl) -> ((UserInfo) et).setCode(DfTypeUtil.toString(vl)), "code"); - setupEpg(_epgMap, et -> ((UserInfo) et).getCreatedTime(), (et, vl) -> ((UserInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)), - "createdTime"); - setupEpg(_epgMap, et -> ((UserInfo) et).getUpdatedTime(), (et, vl) -> ((UserInfo) et).setUpdatedTime(DfTypeUtil.toLong(vl)), - "updatedTime"); + setupEpg(_epgMap, et -> ((UserInfo) et).getCreatedAt(), (et, vl) -> ((UserInfo) et).setCreatedAt(DfTypeUtil.toLocalDateTime(vl)), + "createdAt"); + setupEpg(_epgMap, et -> ((UserInfo) et).getUpdatedAt(), (et, vl) -> ((UserInfo) et).setUpdatedAt(DfTypeUtil.toLocalDateTime(vl)), + "updatedAt"); } @Override @@ -120,30 +119,23 @@ public class UserInfoDbm extends AbstractDBMeta { // =================================================================================== // Column Info // =========== - protected final ColumnInfo _columnCode = cci("code", "code", null, null, String.class, "code", null, false, false, false, "String", 0, - 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); - protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, + false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + protected final ColumnInfo _columnUpdatedAt = cci("updatedAt", "updatedAt", null, null, LocalDateTime.class, "updatedAt", null, false, + false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); - public ColumnInfo columnCode() { - return _columnCode; + public ColumnInfo columnCreatedAt() { + return _columnCreatedAt; } - public ColumnInfo columnCreatedTime() { - return _columnCreatedTime; - } - - public ColumnInfo columnUpdatedTime() { - return _columnUpdatedTime; + public ColumnInfo columnUpdatedAt() { + return _columnUpdatedAt; } protected List ccil() { List ls = newArrayList(); - ls.add(columnCode()); - ls.add(columnCreatedTime()); - ls.add(columnUpdatedTime()); + ls.add(columnCreatedAt()); + ls.add(columnUpdatedAt()); return ls; } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java index 518563f80..0cc7a732c 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java @@ -158,8 +158,8 @@ public class BsClickLogCB extends EsAbstractConditionBean { doColumn("_id"); } - public void columnRequestedTime() { - doColumn("requestedTime"); + public void columnRequestedAt() { + doColumn("requestedAt"); } public void columnSearchLogId() { diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java index 08c3e9705..4b442c9b2 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java @@ -158,8 +158,8 @@ public class BsFavoriteLogCB extends EsAbstractConditionBean { doColumn("_id"); } - public void columnCreatedTime() { - doColumn("createdTime"); + public void columnCreatedAt() { + doColumn("createdAt"); } public void columnUrl() { diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java index ae41a338f..96dfc32e8 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java @@ -162,6 +162,10 @@ public class BsSearchLogCB extends EsAbstractConditionBean { doColumn("accessType"); } + public void columnUser() { + doColumn("user"); + } + public void columnClientIp() { doColumn("clientIp"); } @@ -182,14 +186,18 @@ public class BsSearchLogCB extends EsAbstractConditionBean { doColumn("referer"); } - public void columnRequestedTime() { - doColumn("requestedTime"); + public void columnRequestedAt() { + doColumn("requestedAt"); } public void columnResponseTime() { doColumn("responseTime"); } + public void columnQueryTime() { + doColumn("queryTime"); + } + public void columnSearchWord() { doColumn("searchWord"); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java index 498a91821..bb16ddaf3 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java @@ -158,16 +158,12 @@ public class BsUserInfoCB extends EsAbstractConditionBean { doColumn("_id"); } - public void columnCode() { - doColumn("code"); + public void columnCreatedAt() { + doColumn("createdAt"); } - public void columnCreatedTime() { - doColumn("createdTime"); - } - - public void columnUpdatedTime() { - doColumn("updatedTime"); + public void columnUpdatedAt() { + doColumn("updatedAt"); } } } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java index 5c9c955ac..a10f9b5de 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java @@ -175,158 +175,158 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery { return this; } - public void setRequestedTime_Equal(Long requestedTime) { - setRequestedTime_Term(requestedTime, null); + public void setRequestedAt_Equal(LocalDateTime requestedAt) { + setRequestedAt_Term(requestedAt, null); } - public void setRequestedTime_Equal(Long requestedTime, ConditionOptionCall opLambda) { - setRequestedTime_Term(requestedTime, opLambda); + public void setRequestedAt_Equal(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + setRequestedAt_Term(requestedAt, opLambda); } - public void setRequestedTime_Term(Long requestedTime) { - setRequestedTime_Term(requestedTime, null); + public void setRequestedAt_Term(LocalDateTime requestedAt) { + setRequestedAt_Term(requestedAt, null); } - public void setRequestedTime_Term(Long requestedTime, ConditionOptionCall opLambda) { - TermQueryBuilder builder = regTermQ("requestedTime", requestedTime); + public void setRequestedAt_Term(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_NotEqual(Long requestedTime) { - setRequestedTime_NotTerm(requestedTime, null); + public void setRequestedAt_NotEqual(LocalDateTime requestedAt) { + setRequestedAt_NotTerm(requestedAt, null); } - public void setRequestedTime_NotEqual(Long requestedTime, ConditionOptionCall opLambda) { - setRequestedTime_NotTerm(requestedTime, opLambda); + public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + setRequestedAt_NotTerm(requestedAt, opLambda); } - public void setRequestedTime_NotTerm(Long requestedTime) { - setRequestedTime_NotTerm(requestedTime, null); + public void setRequestedAt_NotTerm(LocalDateTime requestedAt) { + setRequestedAt_NotTerm(requestedAt, null); } - public void setRequestedTime_NotTerm(Long requestedTime, ConditionOptionCall opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedTime", requestedTime)); + public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedAt", requestedAt)); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_Terms(Collection requestedTimeList) { - setRequestedTime_Terms(requestedTimeList, null); + public void setRequestedAt_Terms(Collection requestedAtList) { + setRequestedAt_Terms(requestedAtList, null); } - public void setRequestedTime_Terms(Collection requestedTimeList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("requestedTime", requestedTimeList); + public void setRequestedAt_Terms(Collection requestedAtList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("requestedAt", requestedAtList); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_InScope(Collection requestedTimeList) { - setRequestedTime_Terms(requestedTimeList, null); + public void setRequestedAt_InScope(Collection requestedAtList) { + setRequestedAt_Terms(requestedAtList, null); } - public void setRequestedTime_InScope(Collection requestedTimeList, ConditionOptionCall opLambda) { - setRequestedTime_Terms(requestedTimeList, opLambda); + public void setRequestedAt_InScope(Collection requestedAtList, ConditionOptionCall opLambda) { + setRequestedAt_Terms(requestedAtList, opLambda); } - public void setRequestedTime_Match(Long requestedTime) { - setRequestedTime_Match(requestedTime, null); + public void setRequestedAt_Match(LocalDateTime requestedAt) { + setRequestedAt_Match(requestedAt, null); } - public void setRequestedTime_Match(Long requestedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchQ("requestedTime", requestedTime); + public void setRequestedAt_Match(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_MatchPhrase(Long requestedTime) { - setRequestedTime_MatchPhrase(requestedTime, null); + public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt) { + setRequestedAt_MatchPhrase(requestedAt, null); } - public void setRequestedTime_MatchPhrase(Long requestedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("requestedTime", requestedTime); + public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_MatchPhrasePrefix(Long requestedTime) { - setRequestedTime_MatchPhrasePrefix(requestedTime, null); + public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt) { + setRequestedAt_MatchPhrasePrefix(requestedAt, null); } - public void setRequestedTime_MatchPhrasePrefix(Long requestedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("requestedTime", requestedTime); + public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_Fuzzy(Long requestedTime) { - setRequestedTime_Fuzzy(requestedTime, null); + public void setRequestedAt_Fuzzy(LocalDateTime requestedAt) { + setRequestedAt_Fuzzy(requestedAt, null); } - public void setRequestedTime_Fuzzy(Long requestedTime, ConditionOptionCall opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("requestedTime", requestedTime); + public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_GreaterThan(Long requestedTime) { - setRequestedTime_GreaterThan(requestedTime, null); + public void setRequestedAt_GreaterThan(LocalDateTime requestedAt) { + setRequestedAt_GreaterThan(requestedAt, null); } - public void setRequestedTime_GreaterThan(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_GREATER_THAN, requestedTime); + public void setRequestedAt_GreaterThan(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_LessThan(Long requestedTime) { - setRequestedTime_LessThan(requestedTime, null); + public void setRequestedAt_LessThan(LocalDateTime requestedAt) { + setRequestedAt_LessThan(requestedAt, null); } - public void setRequestedTime_LessThan(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_LESS_THAN, requestedTime); + public void setRequestedAt_LessThan(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_GreaterEqual(Long requestedTime) { - setRequestedTime_GreaterEqual(requestedTime, null); + public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt) { + setRequestedAt_GreaterEqual(requestedAt, null); } - public void setRequestedTime_GreaterEqual(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_GREATER_EQUAL, requestedTime); + public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_LessEqual(Long requestedTime) { - setRequestedTime_LessEqual(requestedTime, null); + public void setRequestedAt_LessEqual(LocalDateTime requestedAt) { + setRequestedAt_LessEqual(requestedAt, null); } - public void setRequestedTime_LessEqual(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_LESS_EQUAL, requestedTime); + public void setRequestedAt_LessEqual(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public BsClickLogCQ addOrderBy_RequestedTime_Asc() { - regOBA("requestedTime"); + public BsClickLogCQ addOrderBy_RequestedAt_Asc() { + regOBA("requestedAt"); return this; } - public BsClickLogCQ addOrderBy_RequestedTime_Desc() { - regOBD("requestedTime"); + public BsClickLogCQ addOrderBy_RequestedAt_Desc() { + regOBD("requestedAt"); return this; } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java index fc6ff0218..eea09538f 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java @@ -175,158 +175,158 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery { return this; } - public void setCreatedTime_Equal(Long createdTime) { - setCreatedTime_Term(createdTime, null); + public void setCreatedAt_Equal(LocalDateTime createdAt) { + setCreatedAt_Term(createdAt, null); } - public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall opLambda) { - setCreatedTime_Term(createdTime, opLambda); + public void setCreatedAt_Equal(LocalDateTime createdAt, ConditionOptionCall opLambda) { + setCreatedAt_Term(createdAt, opLambda); } - public void setCreatedTime_Term(Long createdTime) { - setCreatedTime_Term(createdTime, null); + public void setCreatedAt_Term(LocalDateTime createdAt) { + setCreatedAt_Term(createdAt, null); } - public void setCreatedTime_Term(Long createdTime, ConditionOptionCall opLambda) { - TermQueryBuilder builder = regTermQ("createdTime", createdTime); + public void setCreatedAt_Term(LocalDateTime createdAt, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_NotEqual(Long createdTime) { - setCreatedTime_NotTerm(createdTime, null); + public void setCreatedAt_NotEqual(LocalDateTime createdAt) { + setCreatedAt_NotTerm(createdAt, null); } - public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall opLambda) { - setCreatedTime_NotTerm(createdTime, opLambda); + public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall opLambda) { + setCreatedAt_NotTerm(createdAt, opLambda); } - public void setCreatedTime_NotTerm(Long createdTime) { - setCreatedTime_NotTerm(createdTime, null); + public void setCreatedAt_NotTerm(LocalDateTime createdAt) { + setCreatedAt_NotTerm(createdAt, null); } - public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime)); + public void setCreatedAt_NotTerm(LocalDateTime createdAt, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdAt", createdAt)); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_Terms(Collection createdTimeList) { - setCreatedTime_Terms(createdTimeList, null); + public void setCreatedAt_Terms(Collection createdAtList) { + setCreatedAt_Terms(createdAtList, null); } - public void setCreatedTime_Terms(Collection createdTimeList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("createdTime", createdTimeList); + public void setCreatedAt_Terms(Collection createdAtList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("createdAt", createdAtList); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_InScope(Collection createdTimeList) { - setCreatedTime_Terms(createdTimeList, null); + public void setCreatedAt_InScope(Collection createdAtList) { + setCreatedAt_Terms(createdAtList, null); } - public void setCreatedTime_InScope(Collection createdTimeList, ConditionOptionCall opLambda) { - setCreatedTime_Terms(createdTimeList, opLambda); + public void setCreatedAt_InScope(Collection createdAtList, ConditionOptionCall opLambda) { + setCreatedAt_Terms(createdAtList, opLambda); } - public void setCreatedTime_Match(Long createdTime) { - setCreatedTime_Match(createdTime, null); + public void setCreatedAt_Match(LocalDateTime createdAt) { + setCreatedAt_Match(createdAt, null); } - public void setCreatedTime_Match(Long createdTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchQ("createdTime", createdTime); + public void setCreatedAt_Match(LocalDateTime createdAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_MatchPhrase(Long createdTime) { - setCreatedTime_MatchPhrase(createdTime, null); + public void setCreatedAt_MatchPhrase(LocalDateTime createdAt) { + setCreatedAt_MatchPhrase(createdAt, null); } - public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime); + public void setCreatedAt_MatchPhrase(LocalDateTime createdAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_MatchPhrasePrefix(Long createdTime) { - setCreatedTime_MatchPhrasePrefix(createdTime, null); + public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt) { + setCreatedAt_MatchPhrasePrefix(createdAt, null); } - public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime); + public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_Fuzzy(Long createdTime) { - setCreatedTime_Fuzzy(createdTime, null); + public void setCreatedAt_Fuzzy(LocalDateTime createdAt) { + setCreatedAt_Fuzzy(createdAt, null); } - public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime); + public void setCreatedAt_Fuzzy(LocalDateTime createdAt, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_GreaterThan(Long createdTime) { - setCreatedTime_GreaterThan(createdTime, null); + public void setCreatedAt_GreaterThan(LocalDateTime createdAt) { + setCreatedAt_GreaterThan(createdAt, null); } - public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime); + public void setCreatedAt_GreaterThan(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_THAN, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_LessThan(Long createdTime) { - setCreatedTime_LessThan(createdTime, null); + public void setCreatedAt_LessThan(LocalDateTime createdAt) { + setCreatedAt_LessThan(createdAt, null); } - public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime); + public void setCreatedAt_LessThan(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_THAN, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_GreaterEqual(Long createdTime) { - setCreatedTime_GreaterEqual(createdTime, null); + public void setCreatedAt_GreaterEqual(LocalDateTime createdAt) { + setCreatedAt_GreaterEqual(createdAt, null); } - public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime); + public void setCreatedAt_GreaterEqual(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_EQUAL, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_LessEqual(Long createdTime) { - setCreatedTime_LessEqual(createdTime, null); + public void setCreatedAt_LessEqual(LocalDateTime createdAt) { + setCreatedAt_LessEqual(createdAt, null); } - public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime); + public void setCreatedAt_LessEqual(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_EQUAL, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public BsFavoriteLogCQ addOrderBy_CreatedTime_Asc() { - regOBA("createdTime"); + public BsFavoriteLogCQ addOrderBy_CreatedAt_Asc() { + regOBA("createdAt"); return this; } - public BsFavoriteLogCQ addOrderBy_CreatedTime_Desc() { - regOBD("createdTime"); + public BsFavoriteLogCQ addOrderBy_CreatedAt_Desc() { + regOBD("createdAt"); return this; } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java index b321d9866..d44285c7f 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java @@ -341,6 +341,172 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { return this; } + public void setUser_Equal(String user) { + setUser_Term(user, null); + } + + public void setUser_Equal(String user, ConditionOptionCall opLambda) { + setUser_Term(user, opLambda); + } + + public void setUser_Term(String user) { + setUser_Term(user, null); + } + + public void setUser_Term(String user, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("user", user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_NotEqual(String user) { + setUser_NotTerm(user, null); + } + + public void setUser_NotEqual(String user, ConditionOptionCall opLambda) { + setUser_NotTerm(user, opLambda); + } + + public void setUser_NotTerm(String user) { + setUser_NotTerm(user, null); + } + + public void setUser_NotTerm(String user, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("user", user)); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_Terms(Collection userList) { + setUser_Terms(userList, null); + } + + public void setUser_Terms(Collection userList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("user", userList); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_InScope(Collection userList) { + setUser_Terms(userList, null); + } + + public void setUser_InScope(Collection userList, ConditionOptionCall opLambda) { + setUser_Terms(userList, opLambda); + } + + public void setUser_Match(String user) { + setUser_Match(user, null); + } + + public void setUser_Match(String user, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("user", user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_MatchPhrase(String user) { + setUser_MatchPhrase(user, null); + } + + public void setUser_MatchPhrase(String user, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("user", user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_MatchPhrasePrefix(String user) { + setUser_MatchPhrasePrefix(user, null); + } + + public void setUser_MatchPhrasePrefix(String user, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("user", user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_Fuzzy(String user) { + setUser_Fuzzy(user, null); + } + + public void setUser_Fuzzy(String user, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("user", user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_Prefix(String user) { + setUser_Prefix(user, null); + } + + public void setUser_Prefix(String user, ConditionOptionCall opLambda) { + PrefixQueryBuilder builder = regPrefixQ("user", user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_GreaterThan(String user) { + setUser_GreaterThan(user, null); + } + + public void setUser_GreaterThan(String user, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_THAN, user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_LessThan(String user) { + setUser_LessThan(user, null); + } + + public void setUser_LessThan(String user, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_THAN, user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_GreaterEqual(String user) { + setUser_GreaterEqual(user, null); + } + + public void setUser_GreaterEqual(String user, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_EQUAL, user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setUser_LessEqual(String user) { + setUser_LessEqual(user, null); + } + + public void setUser_LessEqual(String user, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_EQUAL, user); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public BsSearchLogCQ addOrderBy_User_Asc() { + regOBA("user"); + return this; + } + + public BsSearchLogCQ addOrderBy_User_Desc() { + regOBD("user"); + return this; + } + public void setClientIp_Equal(String clientIp) { setClientIp_Term(clientIp, null); } @@ -1138,300 +1304,300 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { return this; } - public void setRequestedTime_Equal(Long requestedTime) { - setRequestedTime_Term(requestedTime, null); + public void setRequestedAt_Equal(LocalDateTime requestedAt) { + setRequestedAt_Term(requestedAt, null); } - public void setRequestedTime_Equal(Long requestedTime, ConditionOptionCall opLambda) { - setRequestedTime_Term(requestedTime, opLambda); + public void setRequestedAt_Equal(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + setRequestedAt_Term(requestedAt, opLambda); } - public void setRequestedTime_Term(Long requestedTime) { - setRequestedTime_Term(requestedTime, null); + public void setRequestedAt_Term(LocalDateTime requestedAt) { + setRequestedAt_Term(requestedAt, null); } - public void setRequestedTime_Term(Long requestedTime, ConditionOptionCall opLambda) { - TermQueryBuilder builder = regTermQ("requestedTime", requestedTime); + public void setRequestedAt_Term(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_NotEqual(Long requestedTime) { - setRequestedTime_NotTerm(requestedTime, null); + public void setRequestedAt_NotEqual(LocalDateTime requestedAt) { + setRequestedAt_NotTerm(requestedAt, null); } - public void setRequestedTime_NotEqual(Long requestedTime, ConditionOptionCall opLambda) { - setRequestedTime_NotTerm(requestedTime, opLambda); + public void setRequestedAt_NotEqual(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + setRequestedAt_NotTerm(requestedAt, opLambda); } - public void setRequestedTime_NotTerm(Long requestedTime) { - setRequestedTime_NotTerm(requestedTime, null); + public void setRequestedAt_NotTerm(LocalDateTime requestedAt) { + setRequestedAt_NotTerm(requestedAt, null); } - public void setRequestedTime_NotTerm(Long requestedTime, ConditionOptionCall opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedTime", requestedTime)); + public void setRequestedAt_NotTerm(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("requestedAt", requestedAt)); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_Terms(Collection requestedTimeList) { - setRequestedTime_Terms(requestedTimeList, null); + public void setRequestedAt_Terms(Collection requestedAtList) { + setRequestedAt_Terms(requestedAtList, null); } - public void setRequestedTime_Terms(Collection requestedTimeList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("requestedTime", requestedTimeList); + public void setRequestedAt_Terms(Collection requestedAtList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("requestedAt", requestedAtList); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_InScope(Collection requestedTimeList) { - setRequestedTime_Terms(requestedTimeList, null); + public void setRequestedAt_InScope(Collection requestedAtList) { + setRequestedAt_Terms(requestedAtList, null); } - public void setRequestedTime_InScope(Collection requestedTimeList, ConditionOptionCall opLambda) { - setRequestedTime_Terms(requestedTimeList, opLambda); + public void setRequestedAt_InScope(Collection requestedAtList, ConditionOptionCall opLambda) { + setRequestedAt_Terms(requestedAtList, opLambda); } - public void setRequestedTime_Match(Long requestedTime) { - setRequestedTime_Match(requestedTime, null); + public void setRequestedAt_Match(LocalDateTime requestedAt) { + setRequestedAt_Match(requestedAt, null); } - public void setRequestedTime_Match(Long requestedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchQ("requestedTime", requestedTime); + public void setRequestedAt_Match(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_MatchPhrase(Long requestedTime) { - setRequestedTime_MatchPhrase(requestedTime, null); + public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt) { + setRequestedAt_MatchPhrase(requestedAt, null); } - public void setRequestedTime_MatchPhrase(Long requestedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("requestedTime", requestedTime); + public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_MatchPhrasePrefix(Long requestedTime) { - setRequestedTime_MatchPhrasePrefix(requestedTime, null); + public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt) { + setRequestedAt_MatchPhrasePrefix(requestedAt, null); } - public void setRequestedTime_MatchPhrasePrefix(Long requestedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("requestedTime", requestedTime); + public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_Fuzzy(Long requestedTime) { - setRequestedTime_Fuzzy(requestedTime, null); + public void setRequestedAt_Fuzzy(LocalDateTime requestedAt) { + setRequestedAt_Fuzzy(requestedAt, null); } - public void setRequestedTime_Fuzzy(Long requestedTime, ConditionOptionCall opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("requestedTime", requestedTime); + public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_GreaterThan(Long requestedTime) { - setRequestedTime_GreaterThan(requestedTime, null); + public void setRequestedAt_GreaterThan(LocalDateTime requestedAt) { + setRequestedAt_GreaterThan(requestedAt, null); } - public void setRequestedTime_GreaterThan(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_GREATER_THAN, requestedTime); + public void setRequestedAt_GreaterThan(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_LessThan(Long requestedTime) { - setRequestedTime_LessThan(requestedTime, null); + public void setRequestedAt_LessThan(LocalDateTime requestedAt) { + setRequestedAt_LessThan(requestedAt, null); } - public void setRequestedTime_LessThan(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_LESS_THAN, requestedTime); + public void setRequestedAt_LessThan(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_GreaterEqual(Long requestedTime) { - setRequestedTime_GreaterEqual(requestedTime, null); + public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt) { + setRequestedAt_GreaterEqual(requestedAt, null); } - public void setRequestedTime_GreaterEqual(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_GREATER_EQUAL, requestedTime); + public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setRequestedTime_LessEqual(Long requestedTime) { - setRequestedTime_LessEqual(requestedTime, null); + public void setRequestedAt_LessEqual(LocalDateTime requestedAt) { + setRequestedAt_LessEqual(requestedAt, null); } - public void setRequestedTime_LessEqual(Long requestedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("requestedTime", ConditionKey.CK_LESS_EQUAL, requestedTime); + public void setRequestedAt_LessEqual(LocalDateTime requestedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, requestedAt); if (opLambda != null) { opLambda.callback(builder); } } - public BsSearchLogCQ addOrderBy_RequestedTime_Asc() { - regOBA("requestedTime"); + public BsSearchLogCQ addOrderBy_RequestedAt_Asc() { + regOBA("requestedAt"); return this; } - public BsSearchLogCQ addOrderBy_RequestedTime_Desc() { - regOBD("requestedTime"); + public BsSearchLogCQ addOrderBy_RequestedAt_Desc() { + regOBD("requestedAt"); return this; } - public void setResponseTime_Equal(Integer responseTime) { + public void setResponseTime_Equal(Long responseTime) { setResponseTime_Term(responseTime, null); } - public void setResponseTime_Equal(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_Equal(Long responseTime, ConditionOptionCall opLambda) { setResponseTime_Term(responseTime, opLambda); } - public void setResponseTime_Term(Integer responseTime) { + public void setResponseTime_Term(Long responseTime) { setResponseTime_Term(responseTime, null); } - public void setResponseTime_Term(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_Term(Long responseTime, ConditionOptionCall opLambda) { TermQueryBuilder builder = regTermQ("responseTime", responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_NotEqual(Integer responseTime) { + public void setResponseTime_NotEqual(Long responseTime) { setResponseTime_NotTerm(responseTime, null); } - public void setResponseTime_NotEqual(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_NotEqual(Long responseTime, ConditionOptionCall opLambda) { setResponseTime_NotTerm(responseTime, opLambda); } - public void setResponseTime_NotTerm(Integer responseTime) { + public void setResponseTime_NotTerm(Long responseTime) { setResponseTime_NotTerm(responseTime, null); } - public void setResponseTime_NotTerm(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_NotTerm(Long responseTime, ConditionOptionCall opLambda) { NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("responseTime", responseTime)); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_Terms(Collection responseTimeList) { + public void setResponseTime_Terms(Collection responseTimeList) { setResponseTime_Terms(responseTimeList, null); } - public void setResponseTime_Terms(Collection responseTimeList, ConditionOptionCall opLambda) { + public void setResponseTime_Terms(Collection responseTimeList, ConditionOptionCall opLambda) { TermsQueryBuilder builder = regTermsQ("responseTime", responseTimeList); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_InScope(Collection responseTimeList) { + public void setResponseTime_InScope(Collection responseTimeList) { setResponseTime_Terms(responseTimeList, null); } - public void setResponseTime_InScope(Collection responseTimeList, ConditionOptionCall opLambda) { + public void setResponseTime_InScope(Collection responseTimeList, ConditionOptionCall opLambda) { setResponseTime_Terms(responseTimeList, opLambda); } - public void setResponseTime_Match(Integer responseTime) { + public void setResponseTime_Match(Long responseTime) { setResponseTime_Match(responseTime, null); } - public void setResponseTime_Match(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_Match(Long responseTime, ConditionOptionCall opLambda) { MatchQueryBuilder builder = regMatchQ("responseTime", responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_MatchPhrase(Integer responseTime) { + public void setResponseTime_MatchPhrase(Long responseTime) { setResponseTime_MatchPhrase(responseTime, null); } - public void setResponseTime_MatchPhrase(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_MatchPhrase(Long responseTime, ConditionOptionCall opLambda) { MatchQueryBuilder builder = regMatchPhraseQ("responseTime", responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_MatchPhrasePrefix(Integer responseTime) { + public void setResponseTime_MatchPhrasePrefix(Long responseTime) { setResponseTime_MatchPhrasePrefix(responseTime, null); } - public void setResponseTime_MatchPhrasePrefix(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_MatchPhrasePrefix(Long responseTime, ConditionOptionCall opLambda) { MatchQueryBuilder builder = regMatchPhrasePrefixQ("responseTime", responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_Fuzzy(Integer responseTime) { + public void setResponseTime_Fuzzy(Long responseTime) { setResponseTime_Fuzzy(responseTime, null); } - public void setResponseTime_Fuzzy(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_Fuzzy(Long responseTime, ConditionOptionCall opLambda) { FuzzyQueryBuilder builder = regFuzzyQ("responseTime", responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_GreaterThan(Integer responseTime) { + public void setResponseTime_GreaterThan(Long responseTime) { setResponseTime_GreaterThan(responseTime, null); } - public void setResponseTime_GreaterThan(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_GreaterThan(Long responseTime, ConditionOptionCall opLambda) { RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_GREATER_THAN, responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_LessThan(Integer responseTime) { + public void setResponseTime_LessThan(Long responseTime) { setResponseTime_LessThan(responseTime, null); } - public void setResponseTime_LessThan(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_LessThan(Long responseTime, ConditionOptionCall opLambda) { RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_LESS_THAN, responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_GreaterEqual(Integer responseTime) { + public void setResponseTime_GreaterEqual(Long responseTime) { setResponseTime_GreaterEqual(responseTime, null); } - public void setResponseTime_GreaterEqual(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_GreaterEqual(Long responseTime, ConditionOptionCall opLambda) { RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_GREATER_EQUAL, responseTime); if (opLambda != null) { opLambda.callback(builder); } } - public void setResponseTime_LessEqual(Integer responseTime) { + public void setResponseTime_LessEqual(Long responseTime) { setResponseTime_LessEqual(responseTime, null); } - public void setResponseTime_LessEqual(Integer responseTime, ConditionOptionCall opLambda) { + public void setResponseTime_LessEqual(Long responseTime, ConditionOptionCall opLambda) { RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_LESS_EQUAL, responseTime); if (opLambda != null) { opLambda.callback(builder); @@ -1448,6 +1614,161 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery { return this; } + public void setQueryTime_Equal(Long queryTime) { + setQueryTime_Term(queryTime, null); + } + + public void setQueryTime_Equal(Long queryTime, ConditionOptionCall opLambda) { + setQueryTime_Term(queryTime, opLambda); + } + + public void setQueryTime_Term(Long queryTime) { + setQueryTime_Term(queryTime, null); + } + + public void setQueryTime_Term(Long queryTime, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("queryTime", queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_NotEqual(Long queryTime) { + setQueryTime_NotTerm(queryTime, null); + } + + public void setQueryTime_NotEqual(Long queryTime, ConditionOptionCall opLambda) { + setQueryTime_NotTerm(queryTime, opLambda); + } + + public void setQueryTime_NotTerm(Long queryTime) { + setQueryTime_NotTerm(queryTime, null); + } + + public void setQueryTime_NotTerm(Long queryTime, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("queryTime", queryTime)); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_Terms(Collection queryTimeList) { + setQueryTime_Terms(queryTimeList, null); + } + + public void setQueryTime_Terms(Collection queryTimeList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("queryTime", queryTimeList); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_InScope(Collection queryTimeList) { + setQueryTime_Terms(queryTimeList, null); + } + + public void setQueryTime_InScope(Collection queryTimeList, ConditionOptionCall opLambda) { + setQueryTime_Terms(queryTimeList, opLambda); + } + + public void setQueryTime_Match(Long queryTime) { + setQueryTime_Match(queryTime, null); + } + + public void setQueryTime_Match(Long queryTime, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("queryTime", queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_MatchPhrase(Long queryTime) { + setQueryTime_MatchPhrase(queryTime, null); + } + + public void setQueryTime_MatchPhrase(Long queryTime, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("queryTime", queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_MatchPhrasePrefix(Long queryTime) { + setQueryTime_MatchPhrasePrefix(queryTime, null); + } + + public void setQueryTime_MatchPhrasePrefix(Long queryTime, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryTime", queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_Fuzzy(Long queryTime) { + setQueryTime_Fuzzy(queryTime, null); + } + + public void setQueryTime_Fuzzy(Long queryTime, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("queryTime", queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_GreaterThan(Long queryTime) { + setQueryTime_GreaterThan(queryTime, null); + } + + public void setQueryTime_GreaterThan(Long queryTime, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_THAN, queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_LessThan(Long queryTime) { + setQueryTime_LessThan(queryTime, null); + } + + public void setQueryTime_LessThan(Long queryTime, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_THAN, queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_GreaterEqual(Long queryTime) { + setQueryTime_GreaterEqual(queryTime, null); + } + + public void setQueryTime_GreaterEqual(Long queryTime, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_EQUAL, queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setQueryTime_LessEqual(Long queryTime) { + setQueryTime_LessEqual(queryTime, null); + } + + public void setQueryTime_LessEqual(Long queryTime, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_EQUAL, queryTime); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public BsSearchLogCQ addOrderBy_QueryTime_Asc() { + regOBA("queryTime"); + return this; + } + + public BsSearchLogCQ addOrderBy_QueryTime_Desc() { + regOBD("queryTime"); + return this; + } + public void setSearchWord_Equal(String searchWord) { setSearchWord_Term(searchWord, null); } diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java index f86d94de3..7e150d0f0 100644 --- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java +++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java @@ -27,7 +27,6 @@ import org.elasticsearch.index.query.FuzzyQueryBuilder; import org.elasticsearch.index.query.IdsQueryBuilder; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.NotQueryBuilder; -import org.elasticsearch.index.query.PrefixQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; @@ -175,479 +174,313 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery { return this; } - public void setCode_Equal(String code) { - setCode_Term(code, null); + public void setCreatedAt_Equal(LocalDateTime createdAt) { + setCreatedAt_Term(createdAt, null); } - public void setCode_Equal(String code, ConditionOptionCall opLambda) { - setCode_Term(code, opLambda); + public void setCreatedAt_Equal(LocalDateTime createdAt, ConditionOptionCall opLambda) { + setCreatedAt_Term(createdAt, opLambda); } - public void setCode_Term(String code) { - setCode_Term(code, null); + public void setCreatedAt_Term(LocalDateTime createdAt) { + setCreatedAt_Term(createdAt, null); } - public void setCode_Term(String code, ConditionOptionCall opLambda) { - TermQueryBuilder builder = regTermQ("code", code); + public void setCreatedAt_Term(LocalDateTime createdAt, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_NotEqual(String code) { - setCode_NotTerm(code, null); + public void setCreatedAt_NotEqual(LocalDateTime createdAt) { + setCreatedAt_NotTerm(createdAt, null); } - public void setCode_NotEqual(String code, ConditionOptionCall opLambda) { - setCode_NotTerm(code, opLambda); + public void setCreatedAt_NotEqual(LocalDateTime createdAt, ConditionOptionCall opLambda) { + setCreatedAt_NotTerm(createdAt, opLambda); } - public void setCode_NotTerm(String code) { - setCode_NotTerm(code, null); + public void setCreatedAt_NotTerm(LocalDateTime createdAt) { + setCreatedAt_NotTerm(createdAt, null); } - public void setCode_NotTerm(String code, ConditionOptionCall opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("code", code)); + public void setCreatedAt_NotTerm(LocalDateTime createdAt, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdAt", createdAt)); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_Terms(Collection codeList) { - setCode_Terms(codeList, null); + public void setCreatedAt_Terms(Collection createdAtList) { + setCreatedAt_Terms(createdAtList, null); } - public void setCode_Terms(Collection codeList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("code", codeList); + public void setCreatedAt_Terms(Collection createdAtList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("createdAt", createdAtList); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_InScope(Collection codeList) { - setCode_Terms(codeList, null); + public void setCreatedAt_InScope(Collection createdAtList) { + setCreatedAt_Terms(createdAtList, null); } - public void setCode_InScope(Collection codeList, ConditionOptionCall opLambda) { - setCode_Terms(codeList, opLambda); + public void setCreatedAt_InScope(Collection createdAtList, ConditionOptionCall opLambda) { + setCreatedAt_Terms(createdAtList, opLambda); } - public void setCode_Match(String code) { - setCode_Match(code, null); + public void setCreatedAt_Match(LocalDateTime createdAt) { + setCreatedAt_Match(createdAt, null); } - public void setCode_Match(String code, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchQ("code", code); + public void setCreatedAt_Match(LocalDateTime createdAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_MatchPhrase(String code) { - setCode_MatchPhrase(code, null); + public void setCreatedAt_MatchPhrase(LocalDateTime createdAt) { + setCreatedAt_MatchPhrase(createdAt, null); } - public void setCode_MatchPhrase(String code, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("code", code); + public void setCreatedAt_MatchPhrase(LocalDateTime createdAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_MatchPhrasePrefix(String code) { - setCode_MatchPhrasePrefix(code, null); + public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt) { + setCreatedAt_MatchPhrasePrefix(createdAt, null); } - public void setCode_MatchPhrasePrefix(String code, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("code", code); + public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_Fuzzy(String code) { - setCode_Fuzzy(code, null); + public void setCreatedAt_Fuzzy(LocalDateTime createdAt) { + setCreatedAt_Fuzzy(createdAt, null); } - public void setCode_Fuzzy(String code, ConditionOptionCall opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("code", code); + public void setCreatedAt_Fuzzy(LocalDateTime createdAt, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("createdAt", createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_Prefix(String code) { - setCode_Prefix(code, null); + public void setCreatedAt_GreaterThan(LocalDateTime createdAt) { + setCreatedAt_GreaterThan(createdAt, null); } - public void setCode_Prefix(String code, ConditionOptionCall opLambda) { - PrefixQueryBuilder builder = regPrefixQ("code", code); + public void setCreatedAt_GreaterThan(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_THAN, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_GreaterThan(String code) { - setCode_GreaterThan(code, null); + public void setCreatedAt_LessThan(LocalDateTime createdAt) { + setCreatedAt_LessThan(createdAt, null); } - public void setCode_GreaterThan(String code, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("code", ConditionKey.CK_GREATER_THAN, code); + public void setCreatedAt_LessThan(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_THAN, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_LessThan(String code) { - setCode_LessThan(code, null); + public void setCreatedAt_GreaterEqual(LocalDateTime createdAt) { + setCreatedAt_GreaterEqual(createdAt, null); } - public void setCode_LessThan(String code, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("code", ConditionKey.CK_LESS_THAN, code); + public void setCreatedAt_GreaterEqual(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_EQUAL, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_GreaterEqual(String code) { - setCode_GreaterEqual(code, null); + public void setCreatedAt_LessEqual(LocalDateTime createdAt) { + setCreatedAt_LessEqual(createdAt, null); } - public void setCode_GreaterEqual(String code, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("code", ConditionKey.CK_GREATER_EQUAL, code); + public void setCreatedAt_LessEqual(LocalDateTime createdAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_EQUAL, createdAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCode_LessEqual(String code) { - setCode_LessEqual(code, null); - } - - public void setCode_LessEqual(String code, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("code", ConditionKey.CK_LESS_EQUAL, code); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public BsUserInfoCQ addOrderBy_Code_Asc() { - regOBA("code"); + public BsUserInfoCQ addOrderBy_CreatedAt_Asc() { + regOBA("createdAt"); return this; } - public BsUserInfoCQ addOrderBy_Code_Desc() { - regOBD("code"); + public BsUserInfoCQ addOrderBy_CreatedAt_Desc() { + regOBD("createdAt"); return this; } - public void setCreatedTime_Equal(Long createdTime) { - setCreatedTime_Term(createdTime, null); + public void setUpdatedAt_Equal(LocalDateTime updatedAt) { + setUpdatedAt_Term(updatedAt, null); } - public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall opLambda) { - setCreatedTime_Term(createdTime, opLambda); + public void setUpdatedAt_Equal(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + setUpdatedAt_Term(updatedAt, opLambda); } - public void setCreatedTime_Term(Long createdTime) { - setCreatedTime_Term(createdTime, null); + public void setUpdatedAt_Term(LocalDateTime updatedAt) { + setUpdatedAt_Term(updatedAt, null); } - public void setCreatedTime_Term(Long createdTime, ConditionOptionCall opLambda) { - TermQueryBuilder builder = regTermQ("createdTime", createdTime); + public void setUpdatedAt_Term(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("updatedAt", updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_NotEqual(Long createdTime) { - setCreatedTime_NotTerm(createdTime, null); + public void setUpdatedAt_NotEqual(LocalDateTime updatedAt) { + setUpdatedAt_NotTerm(updatedAt, null); } - public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall opLambda) { - setCreatedTime_NotTerm(createdTime, opLambda); + public void setUpdatedAt_NotEqual(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + setUpdatedAt_NotTerm(updatedAt, opLambda); } - public void setCreatedTime_NotTerm(Long createdTime) { - setCreatedTime_NotTerm(createdTime, null); + public void setUpdatedAt_NotTerm(LocalDateTime updatedAt) { + setUpdatedAt_NotTerm(updatedAt, null); } - public void setCreatedTime_NotTerm(Long createdTime, ConditionOptionCall opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("createdTime", createdTime)); + public void setUpdatedAt_NotTerm(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedAt", updatedAt)); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_Terms(Collection createdTimeList) { - setCreatedTime_Terms(createdTimeList, null); + public void setUpdatedAt_Terms(Collection updatedAtList) { + setUpdatedAt_Terms(updatedAtList, null); } - public void setCreatedTime_Terms(Collection createdTimeList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("createdTime", createdTimeList); + public void setUpdatedAt_Terms(Collection updatedAtList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("updatedAt", updatedAtList); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_InScope(Collection createdTimeList) { - setCreatedTime_Terms(createdTimeList, null); + public void setUpdatedAt_InScope(Collection updatedAtList) { + setUpdatedAt_Terms(updatedAtList, null); } - public void setCreatedTime_InScope(Collection createdTimeList, ConditionOptionCall opLambda) { - setCreatedTime_Terms(createdTimeList, opLambda); + public void setUpdatedAt_InScope(Collection updatedAtList, ConditionOptionCall opLambda) { + setUpdatedAt_Terms(updatedAtList, opLambda); } - public void setCreatedTime_Match(Long createdTime) { - setCreatedTime_Match(createdTime, null); + public void setUpdatedAt_Match(LocalDateTime updatedAt) { + setUpdatedAt_Match(updatedAt, null); } - public void setCreatedTime_Match(Long createdTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchQ("createdTime", createdTime); + public void setUpdatedAt_Match(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("updatedAt", updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_MatchPhrase(Long createdTime) { - setCreatedTime_MatchPhrase(createdTime, null); + public void setUpdatedAt_MatchPhrase(LocalDateTime updatedAt) { + setUpdatedAt_MatchPhrase(updatedAt, null); } - public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime); + public void setUpdatedAt_MatchPhrase(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhraseQ("updatedAt", updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_MatchPhrasePrefix(Long createdTime) { - setCreatedTime_MatchPhrasePrefix(createdTime, null); + public void setUpdatedAt_MatchPhrasePrefix(LocalDateTime updatedAt) { + setUpdatedAt_MatchPhrasePrefix(updatedAt, null); } - public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime); + public void setUpdatedAt_MatchPhrasePrefix(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedAt", updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_Fuzzy(Long createdTime) { - setCreatedTime_Fuzzy(createdTime, null); + public void setUpdatedAt_Fuzzy(LocalDateTime updatedAt) { + setUpdatedAt_Fuzzy(updatedAt, null); } - public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime); + public void setUpdatedAt_Fuzzy(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + FuzzyQueryBuilder builder = regFuzzyQ("updatedAt", updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_GreaterThan(Long createdTime) { - setCreatedTime_GreaterThan(createdTime, null); + public void setUpdatedAt_GreaterThan(LocalDateTime updatedAt) { + setUpdatedAt_GreaterThan(updatedAt, null); } - public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime); + public void setUpdatedAt_GreaterThan(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_GREATER_THAN, updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_LessThan(Long createdTime) { - setCreatedTime_LessThan(createdTime, null); + public void setUpdatedAt_LessThan(LocalDateTime updatedAt) { + setUpdatedAt_LessThan(updatedAt, null); } - public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime); + public void setUpdatedAt_LessThan(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_LESS_THAN, updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_GreaterEqual(Long createdTime) { - setCreatedTime_GreaterEqual(createdTime, null); + public void setUpdatedAt_GreaterEqual(LocalDateTime updatedAt) { + setUpdatedAt_GreaterEqual(updatedAt, null); } - public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime); + public void setUpdatedAt_GreaterEqual(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_GREATER_EQUAL, updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public void setCreatedTime_LessEqual(Long createdTime) { - setCreatedTime_LessEqual(createdTime, null); + public void setUpdatedAt_LessEqual(LocalDateTime updatedAt) { + setUpdatedAt_LessEqual(updatedAt, null); } - public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime); + public void setUpdatedAt_LessEqual(LocalDateTime updatedAt, ConditionOptionCall opLambda) { + RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_LESS_EQUAL, updatedAt); if (opLambda != null) { opLambda.callback(builder); } } - public BsUserInfoCQ addOrderBy_CreatedTime_Asc() { - regOBA("createdTime"); + public BsUserInfoCQ addOrderBy_UpdatedAt_Asc() { + regOBA("updatedAt"); return this; } - public BsUserInfoCQ addOrderBy_CreatedTime_Desc() { - regOBD("createdTime"); - return this; - } - - public void setUpdatedTime_Equal(Long updatedTime) { - setUpdatedTime_Term(updatedTime, null); - } - - public void setUpdatedTime_Equal(Long updatedTime, ConditionOptionCall opLambda) { - setUpdatedTime_Term(updatedTime, opLambda); - } - - public void setUpdatedTime_Term(Long updatedTime) { - setUpdatedTime_Term(updatedTime, null); - } - - public void setUpdatedTime_Term(Long updatedTime, ConditionOptionCall opLambda) { - TermQueryBuilder builder = regTermQ("updatedTime", updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_NotEqual(Long updatedTime) { - setUpdatedTime_NotTerm(updatedTime, null); - } - - public void setUpdatedTime_NotEqual(Long updatedTime, ConditionOptionCall opLambda) { - setUpdatedTime_NotTerm(updatedTime, opLambda); - } - - public void setUpdatedTime_NotTerm(Long updatedTime) { - setUpdatedTime_NotTerm(updatedTime, null); - } - - public void setUpdatedTime_NotTerm(Long updatedTime, ConditionOptionCall opLambda) { - NotQueryBuilder builder = QueryBuilders.notQuery(regTermQ("updatedTime", updatedTime)); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_Terms(Collection updatedTimeList) { - setUpdatedTime_Terms(updatedTimeList, null); - } - - public void setUpdatedTime_Terms(Collection updatedTimeList, ConditionOptionCall opLambda) { - TermsQueryBuilder builder = regTermsQ("updatedTime", updatedTimeList); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_InScope(Collection updatedTimeList) { - setUpdatedTime_Terms(updatedTimeList, null); - } - - public void setUpdatedTime_InScope(Collection updatedTimeList, ConditionOptionCall opLambda) { - setUpdatedTime_Terms(updatedTimeList, opLambda); - } - - public void setUpdatedTime_Match(Long updatedTime) { - setUpdatedTime_Match(updatedTime, null); - } - - public void setUpdatedTime_Match(Long updatedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchQ("updatedTime", updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_MatchPhrase(Long updatedTime) { - setUpdatedTime_MatchPhrase(updatedTime, null); - } - - public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime) { - setUpdatedTime_MatchPhrasePrefix(updatedTime, null); - } - - public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall opLambda) { - MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_Fuzzy(Long updatedTime) { - setUpdatedTime_Fuzzy(updatedTime, null); - } - - public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall opLambda) { - FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_GreaterThan(Long updatedTime) { - setUpdatedTime_GreaterThan(updatedTime, null); - } - - public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_LessThan(Long updatedTime) { - setUpdatedTime_LessThan(updatedTime, null); - } - - public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_GreaterEqual(Long updatedTime) { - setUpdatedTime_GreaterEqual(updatedTime, null); - } - - public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public void setUpdatedTime_LessEqual(Long updatedTime) { - setUpdatedTime_LessEqual(updatedTime, null); - } - - public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall opLambda) { - RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime); - if (opLambda != null) { - opLambda.callback(builder); - } - } - - public BsUserInfoCQ addOrderBy_UpdatedTime_Asc() { - regOBA("updatedTime"); - return this; - } - - public BsUserInfoCQ addOrderBy_UpdatedTime_Desc() { - regOBD("updatedTime"); + public BsUserInfoCQ addOrderBy_UpdatedAt_Desc() { + regOBD("updatedAt"); return this; } diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java index b46933443..d33a94a53 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/ClickLog.java @@ -15,10 +15,8 @@ */ package org.codelibs.fess.es.log.exentity; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.LocalDateTime; -import org.codelibs.fess.Constants; import org.codelibs.fess.es.log.bsentity.BsClickLog; import org.codelibs.fess.es.log.exbhv.SearchLogBhv; import org.codelibs.fess.util.ComponentUtil; @@ -31,7 +29,7 @@ public class ClickLog extends BsClickLog { private static final long serialVersionUID = 1L; - private long queryRequestedTime; + private LocalDateTime queryRequestedAt; private String userSessionId; @@ -59,20 +57,12 @@ public class ClickLog extends BsClickLog { this.userSessionId = userSessionId; } - public long getQueryRequestedTime() { - return queryRequestedTime; + public LocalDateTime getQueryRequestedAt() { + return queryRequestedAt; } - public void setQueryRequestedTime(final long queryRequestedTime) { - this.queryRequestedTime = queryRequestedTime; - } - - public String getRequestedTimeForList() { - final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT); - if (getRequestedTime() != null) { - return sdf.format(new Date(getRequestedTime())); - } - return null; + public void setQueryRequestedAt(final LocalDateTime queryRequestedAt) { + this.queryRequestedAt = queryRequestedAt; } public String getDocId() { diff --git a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java index 79d42e4b7..f44aa6abf 100644 --- a/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java +++ b/src/main/java/org/codelibs/fess/es/log/exentity/SearchLog.java @@ -15,7 +15,6 @@ */ package org.codelibs.fess.es.log.exentity; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -62,14 +61,6 @@ public class SearchLog extends BsSearchLog { } - public String getRequestedTimeForList() { - final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT); - if (getRequestedTime() != null) { - return sdf.format(getRequestedTime()); - } - return null; - } - public void addSearchFieldLogValue(final String name, final String value) { if (StringUtil.isNotBlank(name) && StringUtil.isNotBlank(value)) { final SearchFieldLog fieldLog = new SearchFieldLog(); @@ -87,11 +78,11 @@ public class SearchLog extends BsSearchLog { } public OptionalEntity getUserInfo() { - if (userInfo == null) { + if (getUserInfoId() == null) { + return OptionalEntity.empty(); + } else if (userInfo == null) { final UserInfoBhv userInfoBhv = ComponentUtil.getComponent(UserInfoBhv.class); - userInfo = userInfoBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(getUserInfoId()); - }); + userInfo = userInfoBhv.selectByPK(getUserInfoId()); } return userInfo; } @@ -120,4 +111,10 @@ public class SearchLog extends BsSearchLog { return searchFieldLogList; } + @Override + public void setUserInfoId(String value) { + userInfo = null; + super.setUserInfoId(value); + } + } diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java index 447b31114..9017f6a09 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java @@ -230,6 +230,10 @@ public abstract class EsAbstractBehavior indexOption = esEntity.asDocMeta().indexOption(); if (indexOption != null) { indexOption.callback(builder); diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java index 3ba0a1f2a..00df88798 100644 --- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java @@ -15,6 +15,7 @@ */ package org.codelibs.fess.helper; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -25,7 +26,6 @@ import java.util.concurrent.ConcurrentLinkedQueue; import javax.annotation.PostConstruct; import javax.annotation.Resource; -import org.codelibs.core.beans.util.BeanUtil; import org.codelibs.core.collection.LruHashMap; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; @@ -115,24 +115,19 @@ public class SearchLogHelper { final UserInfoBhv userInfoBhv = ComponentUtil.getComponent(UserInfoBhv.class); - final List list = userInfoBhv.selectList(cb -> { - cb.query().setCode_Equal(userCode); - cb.query().addOrderBy_UpdatedTime_Desc(); + final LocalDateTime now = ComponentUtil.getSystemHelper().getCurrentTimeAsLocalDateTime(); + userInfoBhv.selectByPK(userCode).ifPresent(userInfo -> { + userInfo.setUpdatedAt(now); + new Thread(() -> { + userInfoBhv.insertOrUpdate(userInfo); + }).start(); + }).orElse(() -> { + UserInfo userInfo = new UserInfo(); + userInfo.setId(userCode); + userInfo.setCreatedAt(now); + userInfo.setUpdatedAt(now); + userInfoBhv.insert(userInfo); }); - - final UserInfo userInfo; - final long now = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); - if (list.isEmpty()) { - userInfo = new UserInfo(); - userInfo.setCode(userCode); - userInfo.setCreatedTime(now); - } else { - userInfo = list.get(0); - } - userInfo.setUpdatedTime(now); - new Thread(() -> { - userInfoBhv.insertOrUpdate(userInfo); - }).start(); userInfoCache.put(userCode, current); } } @@ -153,10 +148,10 @@ public class SearchLogHelper { final boolean isBot = userAgent != null && StreamUtil.of(botNames).anyMatch(botName -> userAgent.indexOf(botName) >= 0); if (!isBot) { searchLog.getUserInfo().ifPresent(userInfo -> { - final String code = userInfo.getCode(); + final String code = userInfo.getId(); final UserInfo oldUserInfo = userInfoMap.get(code); if (oldUserInfo != null) { - userInfo.setCreatedTime(oldUserInfo.getCreatedTime()); + userInfo.setCreatedAt(oldUserInfo.getCreatedAt()); } userInfoMap.put(code, userInfo); }); @@ -168,22 +163,21 @@ public class SearchLogHelper { final List insertList = new ArrayList<>(userInfoMap.values()); final List updateList = new ArrayList<>(); final UserInfoBhv userInfoBhv = SingletonLaContainer.getComponent(UserInfoBhv.class); - final List list = userInfoBhv.selectList(cb -> { - cb.query().setCode_InScope(userInfoMap.keySet()); - }); - for (final UserInfo userInfo : list) { - final String code = userInfo.getCode(); + userInfoBhv.selectList(cb -> { + cb.query().setId_InScope(userInfoMap.keySet()); + }).forEach(userInfo -> { + final String code = userInfo.getId(); final UserInfo entity = userInfoMap.get(code); - BeanUtil.copyBeanToBean(userInfo, entity, option -> option.include("id", "createdTime")); + entity.setId(userInfo.getId()); + entity.setCreatedAt(userInfo.getCreatedAt()); updateList.add(entity); insertList.remove(entity); - } + }); userInfoBhv.batchInsert(insertList); userInfoBhv.batchUpdate(updateList); searchLogList.stream().forEach(searchLog -> { searchLog.getUserInfo().ifPresent(userInfo -> { - final UserInfo entity = userInfoMap.get(userInfo.getCode()); - searchLog.setUserInfoId(entity.getId()); + searchLog.setUserInfoId(userInfo.getId()); }); }); } @@ -216,7 +210,7 @@ public class SearchLogHelper { try { final SearchLogBhv searchLogBhv = SingletonLaContainer.getComponent(SearchLogBhv.class); searchLogBhv.selectEntity(cb -> { - cb.query().setRequestedTime_Equal(clickLog.getQueryRequestedTime()); + cb.query().setRequestedAt_Equal(clickLog.getQueryRequestedAt()); cb.query().setUserSessionId_Equal(clickLog.getUserSessionId()); }).ifPresent(entity -> { clickLog.setSearchLogId(entity.getId()); diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index e1c6471b0..3128500da 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -131,6 +132,10 @@ public class SystemHelper implements Serializable { return System.currentTimeMillis(); } + public LocalDateTime getCurrentTimeAsLocalDateTime() { + return LocalDateTime.now(); + } + public String getLogFilePath() { final String value = System.getProperty("fess.log.path"); if (value != null) { diff --git a/src/main/resources/fess_indices/fess_log/click_log.json b/src/main/resources/fess_indices/fess_log/click_log.json index fb313995f..468c12fa3 100644 --- a/src/main/resources/fess_indices/fess_log/click_log.json +++ b/src/main/resources/fess_indices/fess_log/click_log.json @@ -15,8 +15,9 @@ "type": "string", "index": "not_analyzed" }, - "requestedTime": { - "type": "long" + "requestedAt": { + "type": "date", + "format": "date_optional_time" } } } diff --git a/src/main/resources/fess_indices/fess_log/event_log.json b/src/main/resources/fess_indices/fess_log/event_log.json index 53ce3000d..b9e2c0400 100644 --- a/src/main/resources/fess_indices/fess_log/event_log.json +++ b/src/main/resources/fess_indices/fess_log/event_log.json @@ -23,7 +23,8 @@ "index": "not_analyzed" }, "createdAt": { - "type": "date" + "type": "date", + "format": "date_optional_time" } } } diff --git a/src/main/resources/fess_indices/fess_log/favorite_log.json b/src/main/resources/fess_indices/fess_log/favorite_log.json index 56da2cda5..c1815b80e 100644 --- a/src/main/resources/fess_indices/fess_log/favorite_log.json +++ b/src/main/resources/fess_indices/fess_log/favorite_log.json @@ -15,8 +15,9 @@ "type": "string", "index": "not_analyzed" }, - "createdTime": { - "type": "long" + "createdAt": { + "type": "date", + "format": "date_optional_time" } } } diff --git a/src/main/resources/fess_indices/fess_log/search_log.json b/src/main/resources/fess_indices/fess_log/search_log.json index 8172112c0..99174d485 100644 --- a/src/main/resources/fess_indices/fess_log/search_log.json +++ b/src/main/resources/fess_indices/fess_log/search_log.json @@ -7,15 +7,23 @@ "enabled": false }, "properties": { + "user": { + "type": "string", + "index": "not_analyzed" + }, "searchWord": { "type": "string", "index": "not_analyzed" }, - "requestedTime": { - "type": "long" + "requestedAt": { + "type": "date", + "format": "date_optional_time" }, "responseTime": { - "type": "integer" + "type": "long" + }, + "queryTime": { + "type": "long" }, "hitCount": { "type": "long" diff --git a/src/main/resources/fess_indices/fess_log/user_info.json b/src/main/resources/fess_indices/fess_log/user_info.json index c5636a932..d13f20545 100644 --- a/src/main/resources/fess_indices/fess_log/user_info.json +++ b/src/main/resources/fess_indices/fess_log/user_info.json @@ -7,15 +7,13 @@ "enabled": false }, "properties": { - "code": { - "type": "string", - "index": "not_analyzed" + "createdAt": { + "type": "date", + "format": "date_optional_time" }, - "createdTime": { - "type": "long" - }, - "updatedTime": { - "type": "long" + "updatedAt": { + "type": "date", + "format": "date_optional_time" } } }