From 79f33da4df32fc139c3855a8ecca6545723e0815 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 九月 2023 08:08:17 +0800
Subject: [PATCH] 删除不需要的代码，玻璃信息放入其他数据库 方便测试显示数据库连接的信息
---
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 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 384b18c..d4bd543 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
@@ -2,6 +2,7 @@
import org.apache.ibatis.annotations.*;
+import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
@@ -10,23 +11,23 @@
@Mapper
public interface HomeMapper {
//鏌ヨ姣忎釜绗煎瓙鐨勪娇鐢ㄦ儏鍐�
- @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")
+ @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")
List<StorageCage> selectAll();
// 鏌ヨ1-5绗煎唴灞傛牸瀛愮姸鎬�
- @Select("SELECT cage,state from storage_cage where cage<=5 and tier=1")
+ @Select("SELECT cage,state,glasswidth/2750*2 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 from storage_cage where cage>5 and tier=1")
+ @Select("SELECT cage,state,glasswidth/2750*2 as glasswidth from storage_cage where cage<=5 and tier=2 order by cage desc,cell desc")
List<StorageCage> selectRack2();
// 鏌ヨ1-5绗煎灞傛牸瀛愮姸鎬�
- @Select("SELECT cage,state from storage_cage where cage<=5 and tier=2")
+ @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绗煎灞傛牸瀛愮姸鎬�
- @Select("SELECT cage,state from storage_cage where cage>5 and tier=2")
+ @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();
// 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝ｅ湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅
@@ -34,11 +35,11 @@
List<StorageCage> selectinout(@Param("task_type") Integer task_type);
// 鏌ヨ鏄惁瀛樺湪姝よ鍗�
- @Select("select count(*) from storage_cage where order_id=#{orderid} and state=0")
+ @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())")
+ @Insert("INSERT INTO `canadames`.`order_out`( `order_id`,`state`) VALUES ( #{orderid},0)")
void InsertOrder(String orderid);
// 鍋滄鎸夊綋鍓嶈鍗曞嚭鐗�
@@ -54,22 +55,28 @@
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=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 state=2")
- void UpdateCageTask2(@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 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} ")
+ @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where cage=#{cage} and state!=0 ")
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);
+ @Select("select * from car_position")
+ List<CarPosition> Loadcarlist();
+
+ @Select("select dianqimima from user where id=1")
+ String SelectPassword();
+
}
--
Gitblit v1.8.0