From 209a57aecbf26911f6a3ae0692b51ed0289f5b1a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 14 九月 2023 17:04:56 +0800
Subject: [PATCH] 优化理片笼逻辑
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 81 ++++++++++++++++++++++++++++------------
1 files changed, 56 insertions(+), 25 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 112af50..3e22d2c 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,42 +3,73 @@
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();
+ //鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
+ @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")
- List<StorageCage> selectRack1();
+ // 鏌ヨ1-5绗煎唴灞傛牸瀛愮姸鎬�
+ @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")
- List<StorageCage> selectRack2();
+ // 鏌ヨ6-10绗煎唴灞傛牸瀛愮姸鎬�
+ @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")
- List<StorageCage> selectRack3();
+ // 鏌ヨ1-5绗煎灞傛牸瀛愮姸鎬�
+ @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")
- List<StorageCage> selectRack4();
+ // 鏌ヨ6-10绗煎灞傛牸瀛愮姸鎬�
+ @Select("SELECT cage,state from storage_cage where cage>5 and tier=2")
+ List<StorageCage> selectRack4();
- // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
- @Select("select * from storage_cage where state=#{task_type} limit 1")
- List<StorageCage> selectinout(@Param("task_type") Integer task_type);
+ // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
+ @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1")
+ List<StorageCage> selectinout(@Param("task_type") Integer task_type);
- // 鏌ヨ鏄惁瀛樺湪姝よ鍗�
- @Select("select count(*) from storage_cage where order_id=#{orderid} and state=0")
- short SelectOrder(@Param("orderid") String orderid);
+ // 鏌ヨ鏄惁瀛樺湪姝よ鍗�
+ @Select("select count(*) from storage_cage where order_id=#{orderid} and state=1")
+ short SelectOrder(@Param("orderid") String orderid);
- // @Insert("insert into order_out(orderid) values('#{orderid}')")
- @Insert("INSERT INTO `canadames`.`order_out`( `orderid`,`mod_time`) VALUES ( #{orderid},now())")
- void InsertOrder(String orderid);
+ // @Insert("insert into order_out(orderid) values('#{orderid}')")
+ @Insert("INSERT INTO `canadames`.`order_out`( `order_id`,`state`) VALUES ( #{orderid},0)")
+ void InsertOrder(String orderid);
- @Update("update order_out set state=1 where state=0")
- void updateOrder();
+ // 鍋滄鎸夊綋鍓嶈鍗曞嚭鐗�
+ @Update("update order_out set state=1 where state=0")
+ void updateOrder();
+
+ // 鏌ヨ鏄惁瀛樺湪姝ｅ湪涓婄墖鐨勪换鍔�
+ @Select("select count(*) from storage_task where task_state=0 and task_type=1")
+ short SelectOutTask();
+
+ // 鎵嬪姩瀹屾垚浠诲姟
+ @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 glass_id=#{glassid} and state=2")
+ void UpdateCageTask1(@Param("cell") Integer cell,@Param("glassid") Integer glassid);
+
+ // 鎵嬪姩瀹屾垚鍑虹墖浠诲姟淇敼绗煎瓙鏁版嵁
+ @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where cell=#{cell} and glass_id=#{glassid} and state=3")
+ void UpdateCageTask2(@Param("cell") Integer cell,@Param("glassid") Integer glassid);
+
+ //鑾峰彇鎶ヨ淇℃伅
+ @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