From 477b4071ccf45b6d15280d37a4a002307aa2271c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 九月 2023 17:11:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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..c0ea329 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,11 +3,13 @@
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")
List<StorageCage> selectAll();
@@ -48,6 +50,18 @@
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 * from alarmmg where endTime is null")
+ List<alarmmg> SelectAlarmmgInfo();
}
--
Gitblit v1.8.0