From 55b5ee1b16e3ccd5c9d4d86233ac4e1c346e7d41 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Mon, 21 Oct 2024 11:18:05 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=9B=BA=E5=8C=96=E5=AE=A4=E5=90=8C=E6=AD=A5=E5=9B=BA=E5=8C=96?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tianneng/guhuashi/GuhuashiSiteDeviceDriver.java | 13 +++++++------ .../src/main/resources/config/application-prod.yml | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java index 227e276..ade2c1c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java @@ -149,13 +149,14 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); }else { + log.info("检查：固化室{}反馈工艺运行中，开始通知lms开始固化", devicecode); this.instruction_require_time = date; - log.info("固化室{}反馈工艺运行中，开始通知lms", devicecode); - FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); - request.setDevice_code(this.devicecode); - request.setType("1"); - request.setState("4"); - acsToWmsService.notify(request); + //todo 临时注释 + // FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); + // request.setDevice_code(this.devicecode); + // request.setType("1"); + // request.setState("4"); + // acsToWmsService.notify(request); } } //现场要测水分，手动更改 diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml index bcdbea9..a3ad186 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml @@ -4,7 +4,7 @@ server: spring: datasource: druid: - db-type: com.alibaba.druid.pool.DruidDataSource + db-type: com.alibaba.druid.pool.DruidDataSourceQ driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true