From 7d6a2b0b88f7bc0fd94e894563fbb9ff51f6434d Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 4 Jul 2024 10:26:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?opt:=20=E7=A9=BF=E6=8B=94=E8=BD=B4=E8=B0=83?= =?UTF-8?q?=E5=BA=A6=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97=E4=B8=8D=E5=9C=A8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E6=9C=AA=E8=AF=BB=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E6=B6=88=E6=81=AF=E6=9D=A1=E6=95=B0=E7=9A=84=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java | 3 +++ .../org/nl/system/controller/notice/SysNoticeController.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java index dbadf3960..75e966453 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/auto/AutoCallAirShaftTask.java @@ -316,12 +316,15 @@ public class AutoCallAirShaftTask { device.put("device_code", shafttubeivt.getPoint_code()); array.add(device); JSONObject pointStatus = wmsToAcsService.getPointStatus(array); + log.info("ACS反馈气胀轴库信息：{}", pointStatus); JSONArray data = pointStatus.getJSONArray("data"); JSONObject jsonObject = data.getJSONObject(0); if (jsonObject.getInteger("qty") == 0) { // 没有货 + log.info("ACS告知无气胀轴，申请从气胀轴密集库出气胀轴"); toCreatShaftCacheTask(qzzSize, location, empty); } else { + log.info("开始给ACS写信号出气胀轴"); JSONArray acsParam = new JSONArray(); JSONObject acsQzz = new JSONObject(); acsQzz.put("device_code", shafttubeivt.getPoint_code()); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java b/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java index d3f7d6e3b..08e8a174c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/controller/notice/SysNoticeController.java @@ -64,13 +64,13 @@ public class SysNoticeController { return new ResponseEntity<>(HttpStatus.OK); } - @Log("获取未读的接收消息条数") +// @Log("获取未读的接收消息条数") @GetMapping("/countByReceiveNotRead") public ResponseEntity countByReceiveNotRead() { return new ResponseEntity<>(noticeService.countByReceiveNotRead(), HttpStatus.OK); } - @Log("接收消息分页") +// @Log("接收消息分页") @GetMapping("/pageByReceive") public ResponseEntity pageByReceive() { return new ResponseEntity<>(noticeService.pageByReceive(), HttpStatus.OK); From 2dcd2e1b22cc3973f4d4664cbb58ac9fdf8a8ae0 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 4 Jul 2024 10:58:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?opt:=20=E6=93=8D=E4=BD=9C/=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=97=A5=E5=BF=97=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/system/service/logging/impl/SysLogServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java index 1bf8913a2..dd678142f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** *

@@ -57,7 +58,9 @@ public class SysLogServiceImpl extends ServiceImpl impleme LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.eq(ObjectUtil.isNotEmpty(log_type), SysLog::getLog_type, log_type) .eq(ObjectUtil.isNotEmpty(username), SysLog::getUsername, username) - .like(ObjectUtil.isNotEmpty(blurry), SysLog::getDescription, blurry) + .and(ObjectUtil.isNotEmpty(blurry), la -> la.like(SysLog::getDescription, blurry) + .or() + .like(SysLog::getParams, blurry)) .le(ObjectUtil.isNotEmpty(end_time), SysLog::getCreate_time, end_time) .ge(ObjectUtil.isNotEmpty(begin_time), SysLog::getCreate_time, begin_time) .orderByDesc(SysLog::getCreate_time); From 2df0a36d4ebfa0078618be6ba520cdf609918d06 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 4 Jul 2024 14:22:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=8F=90=E5=89=8D=E9=87=8A=E6=94=BE?= =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=BB=BB=E5=8A=A1=E6=A0=A1=E9=AA=8C071?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml | 2 +- .../org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index c93860e13..04be2eb48 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -12,7 +12,7 @@ AND bic.point_location = #{area} AND 0 = (SELECT COUNT(*) FROM sch_base_task t - WHERE t.task_status '07' + WHERE t.task_status '071' AND t.task_status ]]> '07' AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code OR t.point_code1 = bic.truss_point_code1 oR t.point_code2 = bic.truss_point_code1 OR t.point_code1 = bic.truss_point_code2 oR t.point_code2 = bic.truss_point_code2) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml index 9c790d1d2..409a2aaaa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml @@ -53,7 +53,7 @@ AND bcp.point_location = #{location} AND 0 = ( SELECT COUNT(*) FROM sch_base_task t - WHERE t.task_status '07' AND (t.point_code2 = bcp.point_code OR t.point_code2 = bcp.truss_point_code1 + WHERE t.task_status '071' AND t.task_status ]]> '07' AND (t.point_code2 = bcp.point_code OR t.point_code2 = bcp.truss_point_code1 OR t.point_code4 = bcp.truss_point_code1 OR t.point_code2 = bcp.truss_point_code2 OR t.point_code4 = bcp.truss_point_code2) ) ORDER BY ABS(bcp.sort_seq - #{sortSeq})