From c0661d4c390dab230962855b670cd3246ccb6012 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 9 Feb 2023 18:00:20 +0800 Subject: [PATCH 1/4] add:es --- .../java/org/nl/modules/logging/aspect/LogAspect.java | 10 +++++----- .../org/nl/modules/logging/service/dto/LogQuery.java | 2 +- .../modules/logging/service/impl/EsLogServiceImpl.java | 5 +++-- .../nl/system/service/quartz/utils/ExecutionJob.java | 8 +------- .../java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java | 8 ++++---- .../src/main/resources/logback-spring.xml | 2 +- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index 76053b8cd..1e279badd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java @@ -74,9 +74,10 @@ public class LogAspect { String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()"; String params = getParameter(method, joinPoint.getArgs()); HttpServletRequest request = RequestHolder.getHttpServletRequest(); + String url = request.getRequestURI(); String requestIp = StringUtils.getIp(request); - MDC.put("requestMethod",methodName); + MDC.put("requestMethod",url); MDC.put("requestIp", StringUtils.getIp(request)); MDC.put("traceId", BaseCode.intToChars(IdUtil.getLongId())); MDC.put("requestTime", DateUtil.now()); @@ -84,7 +85,7 @@ public class LogAspect { Object result = null; long comming = System.currentTimeMillis(); try { - log.info("[--request--][请求方法:{}][请求参数:{}]",methodName,params); + log.info("[--request--][请求接口:{}][请求参数:{}]",url,params); result = joinPoint.proceed(); //是否把日志存到日志表 if (logInfo.isAddLogTable()) { @@ -112,17 +113,16 @@ public class LogAspect { json.put("return_result", parse); interfaceLog.insert(json); } catch (Exception e) { - } } }catch (Exception ex){ - log.error("[--requestError--][请求方法:{}][请求参数:{}]【异常信息 :{}】", methodName,params, ex); + log.error("[--requestError--][请求接口:{}][请求参数:{}]【异常信息 :{}】", url,params, ex); Log log = new Log("ERROR", System.currentTimeMillis() - comming); log.setExceptionDetail(ThrowableUtil.getStackTrace(ex).getBytes()); logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log); throw ex; }finally { - log.info("[--response--][请求方法:{}][请求参数:{}],请求执行结束",methodName,params); + log.info("[--response--][请求接口:{}][请求参数:{}],请求执行结束",url,params); MDC.clear(); } return result; diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java index 9523a2480..bc006286d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java @@ -38,5 +38,5 @@ public class LogQuery { private Integer size = 20; - private Integer page = 0; + private Integer page = 1; } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java index d8a10dcdb..d0f550a69 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java @@ -43,7 +43,7 @@ public class EsLogServiceImpl implements EsLogService { if (logQuery != null){ BoolQueryBuilder query = QueryBuilders.boolQuery(); //requestMethod extractedParam(logQuery, query); - Iterable all = esLogRepository.search(query, PageRequest.of(logQuery.getPage(),logQuery.getSize(), Sort.by("@timestamp").descending())); + Iterable all = esLogRepository.search(query, PageRequest.of(logQuery.getPage()-1,logQuery.getSize(), Sort.by("@timestamp").descending())); page.setRecords(((AggregatedPageImpl) all).getContent()); page.setTotal(((AggregatedPageImpl) all).getTotalElements()); page.setPages(logQuery.getPage()); @@ -63,6 +63,7 @@ public class EsLogServiceImpl implements EsLogService { if (logQuery.getFilterSql()){ query.mustNot().add(QueryBuilders.wildcardQuery("logger","org.nl.modules.wql.core.engine.*")); } + query.mustNot().add(QueryBuilders.matchPhraseQuery("logger","org.elasticsearch.client.RestClient")); if (StringUtils.isNotEmpty(logQuery.getTraceId())){ query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId())); } @@ -85,7 +86,7 @@ public class EsLogServiceImpl implements EsLogService { for (LevelEnum value : LevelEnum.values()) { JSONObject level = new JSONObject(); level.put("label", value.name()); - level.put("Value", value.name()); + level.put("value", value.name()); result.add(level); } return result; diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java index f24515c21..9a289805c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/utils/ExecutionJob.java @@ -56,8 +56,6 @@ public class ExecutionJob extends QuartzJobBean { logDto.setCronExpression(quartzJob.getCronExpression()); try { // 执行任务 - System.out.println("--------------------------------------------------------------"); - System.out.println("任务开始执行，任务名称：" + quartzJob.getJobName()); QuartzRunnable task = new QuartzRunnable(quartzJob.getBeanName(), quartzJob.getMethodName(), quartzJob.getParams()); Future future = EXECUTOR.submit(task); @@ -69,8 +67,6 @@ public class ExecutionJob extends QuartzJobBean { } // 任务状态 logDto.setIsSuccess(true); - System.out.println("任务执行完毕，任务名称：" + quartzJob.getJobName() + ", 执行时间：" + times + "毫秒"); - System.out.println("--------------------------------------------------------------"); // 判断是否存在子任务 if (StrUtil.isNotEmpty(quartzJob.getSubTask())) { String[] tasks = quartzJob.getSubTask().split("[,，]"); @@ -81,8 +77,6 @@ public class ExecutionJob extends QuartzJobBean { if (StrUtil.isNotEmpty(uuid)) { redisUtils.set(uuid, false); } - System.out.println("任务执行失败，任务名称：" + quartzJob.getJobName()); - System.out.println("--------------------------------------------------------------"); long times = System.currentTimeMillis() - startTime; logDto.setTime(times); // 任务状态 0：成功 1：失败 @@ -95,7 +89,7 @@ public class ExecutionJob extends QuartzJobBean { quartzJobService.updateIsPause(quartzJob); } //异常时候打印日志 - log.info(logDto.toString()); + log.error(logDto.toString()); quartzLogMapper.insert(logDto); } finally { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java index f16bb8c18..3b075623f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/BookTwoConfirmTask.java @@ -6,11 +6,9 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.sch.AcsTaskDto; @@ -18,6 +16,7 @@ import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,11 +25,12 @@ import java.util.HashMap; import java.util.List; @Service -@RequiredArgsConstructor @Slf4j public class BookTwoConfirmTask extends AbstractAcsTask { private final String THIS_CLASS = BookTwoConfirmTask.class.getName(); - private final CutConveyorTask conveyorTask; + @Autowired + private CutConveyorTask conveyorTask; + @Override public List addTask() { diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index 075f0ab5c..e86c14ebe 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -85,7 +85,7 @@ https://juejin.cn/post/6844903775631572999 requestTime - %X{requestTime} + %d{yyyy-MM-dd HH:mm:ss.SSS} requestIp From 597635c7d869648a251fe02b17cf12f41fc94bfd Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 9 Feb 2023 18:06:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CoveyorControlWithScannerDeviceDriver.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index 1ddc0e543..ac3042120 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java @@ -244,20 +244,21 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe } catch (Exception var17) { return; } - if (!this.itemProtocol.getIsonline()) { +// if (!this.itemProtocol.getIsonline()) { +// this.setIsonline(false); +// this.setIserror(true); +// message = "信号量同步异常"; +// //未联机 +// } else + if (mode == 0) { this.setIsonline(false); - this.setIserror(true); - message = "信号量同步异常"; - //未联机 - } else if (mode == 0) { - this.setIsonline(false); - this.setIserror(true); message = "未联机"; - } else { this.setIsonline(true); this.setIserror(false); - message = ""; + if(error>0){ + this.setIserror(true); + } Instruction instruction = null; List toInstructions; switch (mode) { From e629ad21fb2dd95af213fea8566986785bb25232 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 9 Feb 2023 19:16:28 +0800 Subject: [PATCH 3/4] 1 --- .../logging/service/impl/EsLogServiceImpl.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java index d0f550a69..1ec150cfa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.script.Script; import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.LevelEnum; import org.nl.modules.logging.repository.EsLogRepository; @@ -23,6 +24,8 @@ import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.HashMap; import java.util.Map; /** @@ -68,13 +71,17 @@ public class EsLogServiceImpl implements EsLogService { query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId())); } if (StringUtils.isNotEmpty(logQuery.getMessage())){ - query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("50%")); - } - if (logQuery.getStartTime()!=null){ - query.must().add(QueryBuilders.rangeQuery("requestTime").gte(logQuery.getStartTime())); + query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("80%")); } if (logQuery.getEndTime()!=null){ - query.must().add(QueryBuilders.rangeQuery("requestTime").lte(logQuery.getStartTime())); + long end = logQuery.getEndTime().getTime(); + query.must().add(QueryBuilders.rangeQuery("@timestamp").gte(logQuery.getEndTime())); + } + if (logQuery.getStartTime()!=null){ + long start = logQuery.getStartTime().getTime(); + String script = "doc['@timestamp'].value.millis > "+start+"L"; + Script Script = new Script(script); + query.must().add(QueryBuilders.scriptQuery(Script)); } } From d0eabfd08f981dd0c9209b706bbcb2def19e8fc8 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 9 Feb 2023 19:46:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logging/service/impl/EsLogServiceImpl.java | 12 +++++------- .../src/main/resources/logback-spring.xml | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java index 1ec150cfa..9d6ccdd38 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java @@ -73,15 +73,13 @@ public class EsLogServiceImpl implements EsLogService { if (StringUtils.isNotEmpty(logQuery.getMessage())){ query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("80%")); } - if (logQuery.getEndTime()!=null){ - long end = logQuery.getEndTime().getTime(); - query.must().add(QueryBuilders.rangeQuery("@timestamp").gte(logQuery.getEndTime())); + if (logQuery.getEndTime()!=null ){ + String script = "doc['@timestamp'].value.millis < " + logQuery.getEndTime().getTime() + "L"; + query.must().add(QueryBuilders.scriptQuery(new Script(script))); } if (logQuery.getStartTime()!=null){ - long start = logQuery.getStartTime().getTime(); - String script = "doc['@timestamp'].value.millis > "+start+"L"; - Script Script = new Script(script); - query.must().add(QueryBuilders.scriptQuery(Script)); + String script = "doc['@timestamp'].value.millis > " + logQuery.getStartTime().getTime() + "L"; + query.must().add(QueryBuilders.scriptQuery(new Script(script))); } } diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index e86c14ebe..66b819723 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -137,7 +137,7 @@ https://juejin.cn/post/6844903775631572999 - +