root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-14 14:48:34 +08:00
parent 32c845edf8 568e02808f
commit dbe94ba27f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java
View File

@@ -87,7 +87,7 @@ public class EsLogServiceImpl implements EsLogService {
query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId())); query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId()));
} }
if (StringUtils.isNotEmpty(logQuery.getMessage())){ if (StringUtils.isNotEmpty(logQuery.getMessage())){
query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("80%")); query.must().add(QueryBuilders.matchPhraseQuery("message", logQuery.getMessage()));
} }
if (logQuery.getEndTime()!=null ){ if (logQuery.getEndTime()!=null ){
String script = "doc['@timestamp'].value.millis < " + logQuery.getEndTime().getTime() + "L"; String script = "doc['@timestamp'].value.millis < " + logQuery.getEndTime().getTime() + "L";

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -275,7 +275,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String row_num = empty_row.getString("row_num"); String row_num = empty_row.getString("row_num");
String placement_type = empty_row.getString("placement_type"); String placement_type = empty_row.getString("placement_type");
JSONArray isLock = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type not in ('4','5') AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1'").getResultJSONArray(0); JSONArray isLock = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type in ('4','5') AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(isLock)) { if (ObjectUtil.isEmpty(isLock)) {
@@ -354,7 +354,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String row_num = empty_row.getString("row_num"); String row_num = empty_row.getString("row_num");
String placement_type = empty_row.getString("placement_type"); String placement_type = empty_row.getString("placement_type");
JSONArray isLock = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type not in ('4','5') AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1'").getResultJSONArray(0); JSONArray isLock = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type in ('4','5') AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(isLock)) { if (ObjectUtil.isEmpty(isLock)) {
if (placement_type.equals("01") || placement_type.equals("03")) { if (placement_type.equals("01") || placement_type.equals("03")) {