From eb967d7573a8297e493d455dfce2c77319215990 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 九月 2023 08:31:25 +0800
Subject: [PATCH] 注册页面中英文替换 修改电气管理顶部导航栏布局
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 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 fd4f6b4..384b18c 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
@@ -3,28 +3,30 @@
import org.apache.ibatis.annotations.*;
import com.example.springboot.entity.StorageCage;
+import com.example.springboot.entity.alarmmg;
import java.util.List;
@Mapper
public interface HomeMapper {
- @Select("SELECT cage,round(round(sum(state)/42,2)*100) as cell,42-sum(state) as state FROM storage_cage group by cage")
+ //鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
+ @Select("SELECT cage,ROUND(sum(case when state=1 or state=2 or state=3 then 1 else 0 end)/42*100) as cell,42-sum(case when state=1 or state=2 or state=3 then 1 else 0 end) as state FROM `storage_cage` group by cage")
List<StorageCage> selectAll();
// 鏌ヨ1-5绗煎唴灞傛牸瀛愮姸鎬�
- @Select("SELECT state from storage_cage where cage<=5 and tier=1")
+ @Select("SELECT cage,state from storage_cage where cage<=5 and tier=1")
List<StorageCage> selectRack1();
// 鏌ヨ6-10绗煎唴灞傛牸瀛愮姸鎬�
- @Select("SELECT state from storage_cage where cage>5 and tier=1")
+ @Select("SELECT cage,state from storage_cage where cage>5 and tier=1")
List<StorageCage> selectRack2();
// 鏌ヨ1-5绗煎灞傛牸瀛愮姸鎬�
- @Select("SELECT state from storage_cage where cage<=5 and tier=2")
+ @Select("SELECT cage,state from storage_cage where cage<=5 and tier=2")
List<StorageCage> selectRack3();
// 鏌ヨ6-10绗煎灞傛牸瀛愮姸鎬�
- @Select("SELECT state from storage_cage where cage>5 and tier=2")
+ @Select("SELECT cage,state from storage_cage where cage>5 and tier=2")
List<StorageCage> selectRack4();
// 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
@@ -48,6 +50,26 @@
short SelectOutTask();
// 鎵嬪姩瀹屾垚浠诲姟
- @Select("update storage_task set state=1 where shelf_rack=#{shelf_rack} and task_type=#{task_type} and task_state=0")
- short UpdateTask(@Param("task_type") Integer task_type, @Param("shelf_rack") Integer shelf_rack);
+ @Update("update storage_task set task_state=1 where shelf_rack=#{shelf_rack} and task_type=#{task_type} and task_state=0")
+ void UpdateTask(@Param("task_type") Integer task_type, @Param("shelf_rack") Integer shelf_rack);
+
+ // 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
+ @Update("update storage_cage set state=1 where cell=#{cell} and state=2")
+ void UpdateCageTask1(@Param("cell") Integer cell);
+
+ // 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
+ @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where cell=#{cell} and state=2")
+ void UpdateCageTask2(@Param("cell") Integer cell);
+
+ //鑾峰彇鎶ヨ淇℃伅
+ @Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
+ List<alarmmg> SelectAlarmmgInfo();
+
+ //鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
+ @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where cage=#{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);
+
}
--
Gitblit v1.8.0