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/EdgStorageCageDetailsMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
index 5d7d496..af01a6f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
@@ -50,6 +50,9 @@
             <if test="height != 0">
                 and t.height = #{height}
             </if>
+            <if test="cell == 2">
+                and t.thickness &lt; #{maxThickness}
+            </if>
         </where>
         order by total_count desc, glass_count, abs(t.slot - #{currentSlot})
         )
@@ -93,18 +96,19 @@
             AND t1.state = 100
             AND t1.device_id = #{deviceId}
             <if test="width != 0">
-                and t.width = #{width}
+                and t1.width = #{width}
             </if>
             <if test="height != 0">
-                and t.height = #{height}
+                and t1.height = #{height}
             </if>
             <if test="cell == 1">
-                and #{minOneFirstLength} &lt;= GREATEST(t.width, t.width)
-                and #{minOneSecondLength} &lt;= least(t.width, t.width)
+                and #{minOneFirstLength} &lt;= GREATEST(t1.width, t1.height)
+                and #{minOneSecondLength} &lt;= least(t1.width, t1.height)
             </if>
             <if test="cell == 2">
-                and #{maxTwoFirstLength} &gt;= GREATEST(t.width, t.width)
-                and #{maxTwoSecondLength} &gt;= least(t.width, t.width)
+                and #{maxTwoFirstLength} &gt;= GREATEST(t1.width, t1.height)
+                and #{maxTwoSecondLength} &gt;= least(t1.width, t1.height)
+                and t1.thickness &lt; #{maxThickness}
             </if>
         </where>
         ORDER BY abs(t.slot - #{currentCell})

--
Gitblit v1.8.0