From 67dfef894ae5e39f4b93d6de7c2a213042342840 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 9 Jan 2023 14:30:48 +0800 Subject: [PATCH] =?UTF-8?q?mdf:=E5=9E=8B=E6=9D=90=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=87=BA=E5=BA=93=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pda/st/out/service/impl/HandXCOutIvtServiceImpl.java | 9 ++++++--- .../src/main/resources/config/application-dev.yml | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java index 40045aed..e68400c9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java @@ -149,11 +149,14 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService { map.put("out_time",DateUtil.now()); PDM_BI_ProcedureOffline.update(map,"diskrecord_id='"+diskrecord_id+"'"); } - Map updateParam = new HashMap<>(); - updateParam.put("status","04"); if (!CollectionUtils.isEmpty(bucketuniques)){ + Map updateParam = new HashMap<>(); + updateParam.put("status","04"); + updateParam.put("outstor_optid",currentUserId+""); + updateParam.put("outstor_optname",userDto.getNickName()); + updateParam.put("outstor_time",DateUtil.now()); String allBucketunique = "(\""+bucketuniques.stream().collect(Collectors.joining("\",\""))+"\")"; - bucket.update(updateParam, "bucketunique in " + allBucketunique + " and status in ('02','03')"); + bucket.update(updateParam, "bucketunique in " + allBucketunique); } JSONObject returnjo = new JSONObject(); returnjo.put("code", "1"); diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml index 4dca18ca..4f8a8f96 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -20,9 +20,9 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:Root.123456} + password: ${DB_PWD:942464Yy} # username: ${DB_USER:root} # password: ${DB_PWD:root} # 初始连接数