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

opt:暂时注释固化室同步固化状态

Browse Source
This commit is contained in:
gongbaoxiong
2024-10-21 11:18:05 +08:00
parent 8a520c57e4
commit 55b5ee1b16
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java
View File

@@ -149,13 +149,14 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements
if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
}else { }else {
log.info("检查：固化室{}反馈工艺运行中，开始通知lms开始固化", devicecode);
this.instruction_require_time = date; this.instruction_require_time = date;
log.info("固化室{}反馈工艺运行中，开始通知lms", devicecode); //todo 临时注释
FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest(); // FeedBackTaskStatusRequest request = new FeedBackTaskStatusRequest();
request.setDevice_code(this.devicecode); // request.setDevice_code(this.devicecode);
request.setType("1"); // request.setType("1");
request.setState("4"); // request.setState("4");
acsToWmsService.notify(request); // acsToWmsService.notify(request);
} }
} }
//现场要测水分，手动更改 //现场要测水分，手动更改

2
lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
View File

@@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSourceQ
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 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: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 # 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