From 09fe50d59e2f1e2261d376eb49ad6c40301f25b4 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期五, 10 五月 2024 16:08:59 +0800 Subject: [PATCH] 修改IP与数据库连接 --- springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 200 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 176 insertions(+), 24 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 7a964ac..683bcf0 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 @@ -4,34 +4,41 @@ import com.example.springboot.entity.CarPosition; import com.example.springboot.entity.StorageCage; +import com.example.springboot.entity.StorageTask; import com.example.springboot.entity.alarmmg; +import com.example.springboot.entity.north_glass_buffer1; +import com.example.springboot.entity.Out_slice; +import com.example.springboot.entity.Queue; +import com.example.springboot.entity.RolePermission; import java.util.List; @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(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") + // 鏌ヨ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") + // 鏌ヨ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绗煎灞傛牸瀛愮姸鎬� - @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") + // 鏌ヨ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绗煎灞傛牸瀛愮姸鎬� - @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") + // 鏌ヨ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(); + + // 鏍规嵁浠诲姟绫诲瀷鏌ヨ褰撳墠姝e湪鍑虹墖锛岃繘鐗囩殑鐜荤拑淇℃伅 - @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where state=#{task_type} limit 1") + @Select("select * from storage_cage where state=#{task_type}") List<StorageCage> selectinout(@Param("task_type") Integer task_type); // 鏌ヨ鏄惁瀛樺湪姝よ鍗� @@ -47,33 +54,178 @@ void updateOrder(); // 鏌ヨ鏄惁瀛樺湪姝e湪涓婄墖鐨勪换鍔� - @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 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_task set task_state=1 where task_type=#{task_type} and glass_id=#{glassid}") + void UpdateTask(@Param("task_type") Integer task_type,String glassid); // 鎵嬪姩瀹屾垚杩涚墖浠诲姟淇敼绗煎瓙鏁版嵁 - @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); + @Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2") + void UpdateCageTask1(@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 ") - List<StorageCage> SelectCageInfo(short cage); + @Select("select * from storage_cage where position(#{cage} in ifnull(glass_id,\"\"))") + List<StorageCage> SelectCageInfo(String 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,glasswidthmm=null,glassheightmm=null,listid=null,boxid=null,FrameBarcode=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(String glassid); + + //鏍规嵁鐜荤拑id鏌ヨ鐞嗙墖绗间俊鎭� + @Select("select * from storage_cage where glass_id=#{glassid}") + List<StorageCage> SelectStorageInfoByGlassId(String glassid); + + //鏌ヨ鐜荤拑淇℃伅 +// @Select("select * from glass where glassid=#{glassid}") + @Select("SELECT ordernumber,listnumber,boxnumber,barcode,glasslength,glassheight,glasslength_mm,glassheight_mm FROM north_glass_buffer1 where barcode=#{barcode}") + north_glass_buffer1 SelectGlassByGlassID(String barcode); + + //鍚敤/绂佺敤鐞嗙墖绗兼牸瀛� + @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.glasswidth},glassheight=#{glass.glassheight},glasswidthmm=#{glass.glasswidthmm},glassheightmm=#{glass.glassheightmm},listid=#{glass.listId},boxid=#{glass.boxId} where cage=#{cage} and cell=#{cell} and tier=#{tier}") + void Inglassid(Queue glass, short cage, short cell, short tier); + + //鏌ヨ鐞嗙墖绗间腑鏄惁鏈夋鐜荤拑 + @Select("select count(*) from storage_cage where glass_id=#{glassId}") + short SelectStorageByGlassId(String glassId); + + //鏍规嵁璁㈠崟鏌ヨ鐜荤拑淇℃伅 + @Select("select * from north_glass_buffer1 where position(#{orderid} in ordernumber)") + List<north_glass_buffer1> SelectGlass(String orderid); + + //鑾峰彇涓婄墖闃熷垪淇℃伅 + @Select("select * from queue where id=#{id}") + Queue GetQueueInfo(int id); + + //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠� + @Update("update queue set glassid=#{queue.glassId},orderid=#{queue.orderId},listId=#{queue.listId},boxId=#{queue.boxId},glasswidth=#{queue.glasswidth},glassheight=#{queue.glassheight},glasswidthmm=#{queue.glasswidthmm},glassheightmm=#{queue.glassheightmm},state=1 where id=#{id}") + void InsertQueueGlassId(Queue queue,Short id); + + //纭鎵爜浣嶇幓鐠冧俊鎭� + @Update("update queue set state=1 where id=1") + void UpdateQueueState(); + + //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠� + @Update("update queue set glassid=null,orderid=null,listid=null,boxid=null,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,state=0 where id=#{id}") + void DeleteQueueGlass(String id); + + //鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟 + @Select("select count(*) from storage_cage where order_id=#{orderid}") + Short SelectGlassNo(String orderid); + + //鏍规嵁鐜荤拑id浠庡鎴疯〃鏌ヨ鏁版嵁 + @Select("select * from north_glass_buffer1 where barcode=#{glassid}") + north_glass_buffer1 SelectBoxNo(String glassid); + + //鏌ヨ鍑虹墖闃熷垪淇℃伅 + @Select("select a.*,b.cell from out_slice a left join storage_cage b on a.glassId=b.glass_id order by sequence") + List<Out_slice> SelectProductionqueue(); + + //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅 + @Select("select * from storage_cage where glass_id=#{glassid}") + StorageCage SelectStorageGlassById(String glassid); + + //鏍规嵁鐜荤拑id鏌ヨ绗煎唴鐜荤拑淇℃伅 + @Select("select * from storage_cage where glass_id=#{glassid}") + List<StorageCage> SelectStoragesGlassById(String glassid); + + + // //鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑 + // @Update("update out_slice set state=4 where barcode=#{FrameNo} and (state=0 or state=1 or state=2)") + // void DeleteProductionQueueGlass(String id); + + //鏍规嵁閾濇id鏌ヨ瀵瑰簲鐜荤拑淇℃伅 + @Select("select * from north_glass_buffer1 where FrameBarcode=#{FrameBarcode}") + List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode); + + + //鏍规嵁鐜荤拑id鏌ヨ鍑虹墖闃熷垪淇℃伅 + @Select("select * from out_slice where glassid=#{getbarcode}") + Out_slice SelectQueueByglassid(String getbarcode); + + //娣诲姞鍑虹墖闃熷垪 + @Insert("INSERT INTO out_slice( `glassId`, `barcode`, `glasswidth`, `glassheight`, `state`, `flip`, `sequence`, `time` ,`position` ,`orderid` ,`listid` ,`boxid` ,`glasswidthmm` ,`glassheightmm` ,`framewidthmm` ,`frameheightmm` ,`framestate` ) VALUES ( #{glassid}, #{FrameNo}, #{glasslengthMm}, #{glassheightMm}, #{state}, #{flip}, #{sequence}, now(), #{position}, #{orderid}, #{listid}, #{boxid}, #{glasswidth}, #{glassheight}, #{framewidthmm}, #{frameheightmm}, 0);") + void AddOutSliceS(String glassid, String flip, String FrameNo, String glasslengthMm, String glassheightMm, int sequence, String position, Short state,String orderid, String listid, String boxid, String glasswidth, String glassheight,String framewidthmm,String frameheightmm); + + //鍑虹墖闃熷垪璋冨簭 + @Update("update out_slice set sequence=#{sequence} where glassid=#{glassId}") + void UpdateOutSliceSequence(String glassId,int sequence); + + //鏌ヨ鍑虹墖闃熷垪鏈�澶ч『搴� + @Select("select ifnull(max(sequence),0)+1 from out_slice ") + Short SelectMaxSquence(); + //鏌ヨ鐢ㄦ埛鏉冮檺 + @Select("select rp.* from role_permission rp inner join user r on rp.role_id=r.role_id and r.username=#{username} and (permission_id=32 or permission_id=33 or permission_id=34 or permission_id=35 or permission_id=36 or permission_id=37 or permission_id=38 or permission_id=39)") + List<RolePermission> SelectPermissionByUserName(String username); + + // //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟 + // @Update("update out_slice set state=2 where id=#{id}") + // void CompleteQueue(String id); + + //鏍规嵁鐜荤拑瀹屾垚鍑虹墖浠诲姟 + @Update("update out_slice set state=2 where glassid=#{glassid}") + void CompleteQueueByGlassId(String glassid); + + //鏌ヨ閾濇id瀵瑰簲鐜荤拑瀹屾垚鏁伴噺 + @Select("select count(*) from out_slice where barcode=#{frameid} and state!=4") + Short SelectCountByFrameNo(String frameid); + + //鍒犻櫎宸插畬鎴愮殑浠诲姟 + @Delete("delete from out_slice where Barcode=#{frameid}") + void CompleteQueueByFrameNo(String frameid); + + //鏌ヨ绗煎唴鏍煎瓙鍓╀綑瀹藉害 + @Select("Select width from storage_cage where cage=#{cage} and cell=#{cell} limit 1") + Double SelectCageWidth(short cage, short cell); + + //淇敼鍑虹墖闃熷垪鐜荤拑鐘舵�佷负缂哄け + @Update("update out_slice set state=3 where glassId=#{glassid} and state<3") + void UpdateOutSliceGlass(String glassid); + + //鏌ヨ鏈畬鎴愮殑浠诲姟 + @Select("select * from storage_task where task_state=0 and task_type=#{task_type}") + List<StorageTask> SelectTaskByState(int task_type); + + //淇敼鍑虹墖闃熷垪閾濇鐘舵�� + @Update("update out_slice set framestate=1 where barcode=#{frameno}") + void FrameStateUpdate(String frameno); + + //鏌ヨ褰撳墠閾濇淇℃伅 + @Select("select * from out_slice where framestate=0 order by id limit 1") + Out_slice SelectCurrentFrame(); + + //鏍规嵁鐜荤拑id鏌ヨ浠诲姟淇℃伅 + @Select("select task_type from storage_task where glass_id=#{glassid} and task_state!=1") + Short SelectTaskByGlassId(String glassid); + + //淇敼鏍煎瓙瀹藉害 + @Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};") + void UpdataCageWidth(double width, int cage, int cell); + + //鑾峰彇閾濇鏈夋病鏈夋鍦ㄥ嚭鐗囩殑鐜荤拑 + @Select("select count(*) from out_slice where barcode=#{frameNo} and state=1") + Short SelectOutingQueueCount(String frameNo); + + } -- Gitblit v1.8.0