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 | 93 +++++++++++++++++++++++++++++++--------------- 1 files changed, 63 insertions(+), 30 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 85d809a..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,48 +2,81 @@ import org.apache.ibatis.annotations.*; +import com.example.springboot.entity.CarPosition; 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(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 state from storage_cage where cage<=5 and tier=1") - List<StorageCage> selectRack1(); + // 鏌ヨ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") + 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,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 state from storage_cage where cage<=5 and tier=2") - List<StorageCage> selectRack3(); + // 鏌ヨ1-5绗煎灞傛牸瀛愮姸鎬� + @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 state from storage_cage where cage>5 and tier=2") - List<StorageCage> selectRack4(); + // 鏌ヨ6-10绗煎灞傛牸瀛愮姸鎬� + @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(); - // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝e湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅 - @Select("select * from storage_cage where state=#{task_type} limit 1") - List<StorageCage> selectinout(@Param("task_type") Integer task_type); + // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝e湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅 + @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`( `order_id`,`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(); - - //鏌ヨ鏄惁瀛樺湪姝e湪涓婄墖鐨勪换鍔� - @Select("select count(*) from storage_task where task_state=0 and task_type=1") - short SelectOutTask(); + // 鍋滄鎸夊綋鍓嶈鍗曞嚭鐗� + @Update("update order_out set state=1 where state=0") + void updateOrder(); + + // 鏌ヨ鏄惁瀛樺湪姝e湪涓婄墖鐨勪换鍔� + @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} 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