From 1c01c236ed9c2802b1e4868832add2c912d14018 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 09 十月 2023 16:09:21 +0800
Subject: [PATCH] 修改电气管理
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 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 aa396cd..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
@@ -3,6 +3,7 @@
import org.apache.ibatis.annotations.*;
import com.example.springboot.entity.CarPosition;
+import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -11,22 +12,22 @@
@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();
- // 鏌ヨ1-5绗煎唴灞傛牸瀛愮姸鎬�
- @Select("SELECT cage,state,glasswidth/2750*2 as glasswidth from storage_cage where cage>5 and tier=2 order by cage desc,cell desc")
+ // 鏌ヨ10-6绗煎唴灞傛牸瀛愮姸鎬�
+ @Select("SELECT cage,state,ifnull(glasswidth/2750*2,0) as glasswidth from storage_cage where cage>5 and tier=2 order by cage desc,cell desc")
List<StorageCage> selectRack1();
- // 鏌ヨ6-10绗煎唴灞傛牸瀛愮姸鎬�
- @Select("SELECT cage,state,glasswidth/2750*2 as glasswidth from storage_cage where cage<=5 and tier=2 order by cage desc,cell desc")
+ // 鏌ヨ5-1绗煎唴灞傛牸瀛愮姸鎬�
+ @Select("SELECT cage,state,ifnull(glasswidth/2750*2,0) as glasswidth from storage_cage where cage<=5 and tier=2 order by cage desc,cell desc")
List<StorageCage> selectRack2();
- // 鏌ヨ1-5绗煎灞傛牸瀛愮姸鎬�
+ // 鏌ヨ10-6绗煎灞傛牸瀛愮姸鎬�
@Select("SELECT case when tier=1 then cage else 0 end as cage,case when tier=1 then state else 0 end as state,sum(case when tier=1 then glasswidth/2750*2 else 0 end) as glasswidth,sum(case when tier=2 then glasswidth/2750*2 else 0 end) as width from storage_cage where cage>5 group by cage,cell order by cage desc,cell desc")
List<StorageCage> selectRack3();
- // 鏌ヨ6-10绗煎灞傛牸瀛愮姸鎬�
+ // 鏌ヨ5-1绗煎灞傛牸瀛愮姸鎬�
@Select("SELECT case when tier=1 then cage else 0 end as cage,case when tier=1 then state else 0 end as state,sum(case when tier=1 then glasswidth/2750*2 else 0 end) as glasswidth,sum(case when tier=2 then glasswidth/2750*2 else 0 end) as width from storage_cage where cage<=5 group by cage,cell order by cage desc,cell desc")
List<StorageCage> selectRack4();
@@ -47,8 +48,8 @@
void updateOrder();
// 鏌ヨ鏄惁瀛樺湪姝ｅ湪涓婄墖鐨勪换鍔�
- @Select("select count(*) from storage_task where task_state=0 and task_type=1")
- short SelectOutTask();
+ @Select("select count(*) from storage_task where task_state=0 and task_type=0")
+ short SelectInTask();
// 鎵嬪姩瀹屾垚浠诲姟
@Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0")
@@ -56,30 +57,49 @@
// 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁
@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")
List<alarmmg> SelectAlarmmgInfo();
//鑾峰彇鐞嗙墖绗煎唴鐜荤拑淇℃伅
- @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where cage=#{cage} and state!=0 ")
+ @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