From 1d6a06b2348fad07369a656b4be1e40db96d3d88 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 29 Oct 2024 16:27:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=91=E5=AE=9Arfid=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/MaMachineMapper.xml      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index f23d1a98..54b3db55 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -308,7 +308,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where m.rfid_code = #{rfidCode}
     </select>
     <select id="getMaMachineByMaIdAndMaCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
-        select * from ma_machine where ma_id = #{maId} and ma_code = #{maCode}
+        select *
+        from ma_machine
+        where 1=1
+            <if test="maId != null "> and ma_id = #{maId}</if>
+            <if test="maCode != null  and maCode != ''"> and ma_code = #{maCode}</if>
     </select>
     <select id="getMachineByQrCode" resultType="com.bonus.sgzb.base.api.domain.MaMachine">
         select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, msi.supplier as maVender, m.out_fac_time, m.out_fac_code,

From 5d45f87488ba4a45ba1c8655f2cc1d925816f913 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 29 Oct 2024 18:27:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?file=20=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/bootstrap-sgzb_cloud_dev.yml    | 46 +++++++++++++++++++
 .../resources/bootstrap-sgzb_cloud_local.yml  | 39 ++++++++++++++++
 .../src/main/resources/bootstrap.yml          | 41 +----------------
 3 files changed, 87 insertions(+), 39 deletions(-)
 create mode 100644 sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_dev.yml
 create mode 100644 sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_local.yml

diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_dev.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_dev.yml
new file mode 100644
index 00000000..a7f08180
--- /dev/null
+++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_dev.yml
@@ -0,0 +1,46 @@
+# 腾讯云cos
+tencent:
+  cos:
+    file:
+      # 存储桶所在地域
+      region: ap-guangzhou
+      # 存储桶所在地域
+      bucketregion: ap-guangzhou
+      # 存储桶名称
+      bucketname: prod-rental-1301524038
+      # API账号
+      secretid: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
+      # API密钥
+      secretkey: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
+file:
+  path: 1
+  prefix: 2
+  domain: 3
+
+fdfs:
+  domain: 3
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_nxjj
+      config:
+        # 配置中心地址
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_nxjj
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+
+
+
+
+
+
diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_local.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_local.yml
new file mode 100644
index 00000000..8a6db17b
--- /dev/null
+++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap-sgzb_cloud_local.yml
@@ -0,0 +1,39 @@
+# 腾讯云cos
+tencent:
+  cos:
+    file:
+      # 存储桶所在地域
+      region: ap-guangzhou
+      # 存储桶所在地域
+      bucketregion: ap-guangzhou
+      # 存储桶名称
+      bucketname: prod-rental-1301524038
+      # API账号
+      secretid: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
+      # API密钥
+      secretkey: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
+file:
+  path: 1
+  prefix: 2
+  domain: 3
+
+fdfs:
+  domain: 3
+
+# Spring
+spring:
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_cloud_dev_nxjj
+      config:
+        # 配置中心地址
+        server-addr: 127.0.0.1:8848
+        namespace: sgzb_cloud_dev_nxjj
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
index f98b1aee..31943176 100644
--- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
@@ -2,48 +2,11 @@
 server:
   port: 9300
 
-# 腾讯云cos
-tencent:
-  cos:
-    file:
-      # 存储桶所在地域
-      region: ap-guangzhou
-      # 存储桶所在地域
-      bucketregion: ap-guangzhou
-      # 存储桶名称
-      bucketname: prod-rental-1301524038
-      # API账号
-      secretid: AKIDrreCVaRKDtMcgfU5QW9iEfv67tMfldJn
-      # API密钥
-      secretkey: OXUgeMo0yhBRTGo6sVu3yiFX4rQtAzc3
-file:
-  path: 1
-  prefix: 2
-  domain: 3
-
-fdfs:
-  domain: 3
-
 # Spring
-spring: 
+spring:
   application:
     # 应用名称
     name: sgzb-file
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
-      config:
-        # 配置中心地址
-        server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    active: sgzb_cloud_local