From 79307172cb39dad68ce93106eb986fec2fc8fb60 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 15 四月 2025 22:43:43 +0800
Subject: [PATCH] 修改耐丝配置文件
---
ruoyi-admin/src/main/resources/application-test.yml | 2 +-
ruoyi-admin/src/main/resources/application-ztzb.yml | 2 +-
ruoyi-admin/src/main/resources/application-druid.yml | 4 ++--
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 2 +-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index dba348e..fd03462 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -501,7 +501,7 @@
}
// 鐢熸垚缂栧彿
String no = numberGenerator.generateNumberWithPrefix(3,
- "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
+ "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
InsOrder::getEntrustCode);
// 鍒ゆ柇鏄惁鏄搴︽楠�, 鏄搴︽楠屽彇娑堝師鏉愭枡瀛ｅ害妫�楠屼笅鍗�
if (InsOrderTypeConstants.QUARTERLY_TEST.equals(order.getOrderType())) {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 155010a..0d3c844 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -287,7 +287,7 @@
String code = "Y";
// 鐢熸垚缂栧彿
String no = numberGenerator.generateNumberWithPrefix(3,
- "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
+ "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
InsOrder::getEntrustCode);
insOrderMapper.insert(insOrder); // 涓昏〃
@@ -408,7 +408,7 @@
String code = "Y";
// 鐢熸垚缂栧彿
String no = numberGenerator.generateNumberWithPrefix(3,
- "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
+ "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
InsOrder::getEntrustCode);
insOrder.setExamineTime(LocalDateTime.now());
insOrder.setEntrustCode(no);
@@ -510,7 +510,7 @@
String code = "Y";
// 鐢熸垚缂栧彿
String no = numberGenerator.generateNumberWithPrefix(3,
- "JCZX/ZB-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
+ "JCZX/NS-" + code + LimsDateUtil.resetDate(LocalDateTime.now()),
InsOrder::getEntrustCode);
insOrderMapper.insert(insOrder); // 涓昏〃
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c88c67b..f2b8da6 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/center-lims-ztns?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: 123456
# 浠庡簱鏁版嵁婧�
@@ -69,7 +69,7 @@
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 1
# # 瀵嗙爜
# password: root2022!
# 杩炴帴瓒呮椂鏃堕棿
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index 95840c7..f7d121e 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -70,7 +70,7 @@
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 1
# # 瀵嗙爜
password: zttZTT123!
# 杩炴帴瓒呮椂鏃堕棿
diff --git a/ruoyi-admin/src/main/resources/application-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztzb.yml
index ffa6d56..b49b460 100644
--- a/ruoyi-admin/src/main/resources/application-ztzb.yml
+++ b/ruoyi-admin/src/main/resources/application-ztzb.yml
@@ -70,7 +70,7 @@
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
- database: 0
+ database: 1
# # 瀵嗙爜
password: zttZTT123!
# 杩炴帴瓒呮椂鏃堕棿
--
Gitblit v1.9.3