From b9a19ac538b7750fe6a042a99e57e23fa4c9580d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 11 十二月 2024 18:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 42 ------------------------------------------
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java | 2 +-
2 files changed, 1 insertions(+), 43 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-uat.yml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-uat.yml
deleted file mode 100644
index 0d9d757..0000000
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-uat.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- driver-class-name: com.ibm.db2.jcc.DB2Driver
- url: jdbc:db2://192.168.122.240:50000/MgEms:currentSchema=EXPERT;
- username: db2admin
- password: Pwd123456
- initial-size: 10
- max-active: 100
- min-idle: 10
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- time-between-eviction-runs-millis: 60000
- min-evictable-idle-time-millis: 300000
- #validationQuery是用来验证数据库连接的查询语句，这个查询语句必须是至少返回一条结果的SELECT语句。每种数据库都有各自的验证语句
- validation-query: select 1 from sysibm.sysdummy1
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- stat-view-servlet:
- enabled: true
- url-pattern: /druid/*
- #login-username: admin
- #login-password: admin
- filter:
- stat:
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: false
- wall:
- config:
- multi-statement-allow: true
-
-oadp:
- domain: http://172.16.1.148:6010
-
-influx-db:
- org: IAILab
- bucket: whs_data
- token: vhNZN5bZ4c2aa9daQUsmYtaM5qExnLVZYGE0fscVV9mAQhzAnFfExVdPWKrfGVtKPVPUUmM_xfWAJZ1iqqh0qQ==
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
index 165328f..6b60d6e 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmItemResultJsonServiceImpl.java
@@ -30,7 +30,7 @@
List<Object[]> result = new ArrayList<>();
QueryWrapper<MmItemResultJsonEntity> wrapper = new QueryWrapper<>();
wrapper.eq("outputid", outputId)
- .eq("predicttime", predictTime);
+ .eq("predicttime", DateUtils.format(predictTime,timeFormat));
MmItemResultJsonEntity data = baseDao.selectOne(wrapper);
if (data == null || StringUtils.isBlank(data.getJsonvalue())) {
return result;
--
Gitblit v1.9.3