From b82757712111aef7ba795a06dd9ca6e448fef373 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 15 三月 2024 12:56:10 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 11 ++++++++++- src/main/java/com/zy/core/thread/SiemensCrnThread.java | 10 ++++++---- src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java | 5 +++++ src/main/java/com/zy/asrs/mapper/ApiLogMapper.java | 1 + src/main/java/com/zy/asrs/service/ApiLogService.java | 1 + src/main/resources/mapper/ApiLogMapper.xml | 6 ++++++ 6 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java index 7f9c418..afe9451 100644 --- a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java +++ b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java @@ -9,4 +9,5 @@ @Repository public interface ApiLogMapper extends BaseMapper<ApiLog> { + int clearWeekBefore(); } diff --git a/src/main/java/com/zy/asrs/service/ApiLogService.java b/src/main/java/com/zy/asrs/service/ApiLogService.java index aa01c8f..5db32b9 100644 --- a/src/main/java/com/zy/asrs/service/ApiLogService.java +++ b/src/main/java/com/zy/asrs/service/ApiLogService.java @@ -7,4 +7,5 @@ void save(String namespace, String url, String appkey, String ip, String request, String response, boolean success); + boolean clearWeekBefore(); } diff --git a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java index 1ca14f4..41b5ea0 100644 --- a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java @@ -42,4 +42,9 @@ log.error("鎺ュ彛璋冪敤鏃ュ織淇濆瓨澶辫触锛�"); } } + + @Override + public boolean clearWeekBefore() { + return this.baseMapper.clearWeekBefore() > 0; + } } diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java index 29f7382..cad2bd7 100644 --- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java @@ -202,7 +202,7 @@ }catch (Exception e){ log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触"); } - ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class); +// ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class); apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛" ,"10.32.53.195:8080"+"/wcsManager/wcsInterface/taskStatusFeedback" ,null @@ -231,6 +231,15 @@ } } + @Scheduled(cron = "0 0 1 * * ? ") + public void clearApiLog(){ + try { + apiLogService.clearWeekBefore(); + } catch (Exception e) { + log.error("绗笁鏂规帴鍙f棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e); + } + } + } diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java index eead574..a11b349 100644 --- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java +++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java @@ -327,9 +327,11 @@ one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16)); // one.setSourceStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 18)); // one.setDestinationStaNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20)); - if (!crnCommand.getTaskNo().equals(one.getTaskNo()) && !crnCommand.getAckFinish().equals(one.getAckFinish()) - && !crnCommand.getSourcePosZ().equals(one.getSourcePosZ()) && !crnCommand.getSourcePosX().equals(one.getSourcePosX()) && !crnCommand.getSourcePosY().equals(one.getSourcePosY()) - && !crnCommand.getDestinationPosZ().equals(one.getDestinationPosZ()) && !crnCommand.getDestinationPosX().equals(one.getDestinationPosX()) && !crnCommand.getDestinationPosY().equals(one.getDestinationPosY()) + if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode()) + || !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY()) + || !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX()) + || !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ()) + ){ log.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one)); log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(crnCommand)); @@ -496,7 +498,7 @@ } } log.error("鍫嗗灈鏈哄懡浠ゅ洖璇诲け璐ュ悗锛岄噸鏂版坊鍔犱换鍔″埌闃熷垪 ===>> [id:{}],{}", slave.getId(), JSON.toJSON(command)); - MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command)); + MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(5, command)); Thread.sleep(100); readStatus(); return false; diff --git a/src/main/resources/mapper/ApiLogMapper.xml b/src/main/resources/mapper/ApiLogMapper.xml index ce84aac..e68e93a 100644 --- a/src/main/resources/mapper/ApiLogMapper.xml +++ b/src/main/resources/mapper/ApiLogMapper.xml @@ -21,5 +21,11 @@ <result column="memo" property="memo" /> </resultMap> + <delete id="clearWeekBefore"> + delete from man_api_log + where 1=1 + and datediff(week,create_time,getdate()) >= 1 + and result != 1 + </delete> </mapper> -- Gitblit v1.9.1