From 40c8f926742ac885981e1791291b77b8fd662163 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 23 五月 2025 14:55:10 +0800
Subject: [PATCH] 1、编辑打包方式,避免生成的jar过大在升级过程耗费大量时间 将target下的config、lib和jar 统一放在同一目录下,修改服务启动命令 后续升级在不修改依赖、配置文件的情况下替换jar即可 涉及依赖、配置文件仅需在lib、config下新增/替换相关文件即可

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
index f2cbc0a..cd4c157 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
@@ -10,13 +10,20 @@
         <result column="remain_width" property="remainWidth" jdbcType="INTEGER"/>
     </resultMap>
 
+    <update id="resetSlotRemainWidth">
+        <foreach collection="list" item="item" separator=";" open="begin" close=";end;">
+            update edg_storage_cage set remain_width = #{item.remainWidth} where
+            device_id = #{item.deviceId} and slot = #{item.slot}
+        </foreach>
+    </update>
+
     <select id="getEdgStorageCageBySize" resultMap="baseMap">
         select t.*
         from edg_storage_cage t
                  left join edg_storage_cage_details t1 on t.slot = t1.slot
         where t.device_id = #{deviceId}
           and t1.state = 100
-          and t.remain_width >= #{width}
+          and t.remain_width >= GREATEST(#{width}, #{height})
           and t1.width = #{width}
           and t1.height = #{height}
           and t.enable_state = 1

--
Gitblit v1.8.0