From 182d78dfd33a25e0648f2f566eab1f7e79a83e78 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 27 十月 2023 16:28:10 +0800
Subject: [PATCH] 模块配置和参数翻译

---
 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 2a2bae3..f3bd4c0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -12,7 +12,7 @@
 @Mapper
 public interface HomeMapper {
   //鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
-  @Select("select cage,round(100-(21-sum(state))/21*100) as cell,21-sum(state) as state from (select cage,cell,max(state) as state from storage_cage group by cage,cell) as cages group by cage")
+  @Select("select cage,round(100-(21-sum(if(state>0,1,state)))/21*100) as cell,21-sum(if(state>0,1,state)) as state from (select cage,cell,max(state) as state from storage_cage group by cage,cell) as cages group by cage")
   List<StorageCage> selectAll();
 
   // 鏌ヨ10-6绗煎唴灞傛牸瀛愮姸鎬�
@@ -57,11 +57,11 @@
 
   // 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
   @Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
-  void UpdateCageTask1(@Param("glassid") Integer glassid);
+  void UpdateCageTask1(@Param("glassid") String glassid);
 
   // 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
-  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where glass_id=#{glassid} and state=3")
-  void UpdateCageTask2(@Param("glassid") Integer glassid);
+  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid} and state=3")
+  void UpdateCageTask2(@Param("glassid") String glassid);
 
   //鑾峰彇鎶ヨ淇℃伅
   @Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
@@ -71,19 +71,35 @@
   @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage  ")
   List<StorageCage> SelectCageInfo(short cage);
 
-  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where glass_id=#{glassid}")
-  void DeleteByGlassID(short glassid);
+  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
+  void DeleteByGlassID(String glassid);
 
+  //鏌ヨ灏忚溅浣嶇疆
   @Select("select * from car_position")
   List<CarPosition> Loadcarlist();
 
+  //鏌ヨ鎿嶄綔瀵嗙爜
   @Select("select dianqimima from user where id=1")
   String SelectPassword();
 
+  //鏍规嵁鐜荤拑id鏌ヨ鐞嗙墖绗间俊鎭�
   @Select("select * from storage_cage where glass_id=#{glassid}")
-  StorageCage SelectGlassInfo(Integer glassid);
+  StorageCage SelectGlassInfo(String glassid);
 
+  //鏌ヨ鐜荤拑淇℃伅
   @Select("select * from glass where glassid=#{glassid}")
   Glass SelectGlassByGlassID(String glassid);
 
+  //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛�
+  @Update("update storage_cage set disabled=#{disabled} where cage=#{cage} and cell=#{cell}")
+  void Disabled(short cage, short cell, short disabled);
+
+  //鐞嗙墖绗兼柊澧炵幓鐠�
+  @Update("update storage_cage set state=1,glass_id=#{glass.glassId},order_id=#{glass.orderId},glasswidth=#{glass.width},glassheight=#{glass.height} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
+  void Inglassid(Glass glass, short cage, short cell, short tier);
+
+  //鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑
+  @Select("select count(*) from storage_cage where glass_id=#{glassId}")
+  short SelectStorageByGlassId(String glassId);
+
 }

--
Gitblit v1.8.0