From 1abe5ed8b8e3a25b0d3851b467deb9b38d7c082e Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期五, 15 十二月 2023 15:01:53 +0800 Subject: [PATCH] #提升机小车运行数据接口 --- src/main/resources/mapper/BasShuttleOptMapper.xml | 7 +++++++ src/main/java/com/zy/asrs/mapper/BasShuttleOptMapper.java | 5 +++++ src/main/resources/mapper/BasLiftOptMapper.xml | 7 +++++++ src/main/java/com/zy/asrs/controller/MonitorController.java | 24 ++++++++++++++++++++---- src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java | 5 +++++ 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java index 9d5b523..e5425d1 100644 --- a/src/main/java/com/zy/asrs/controller/MonitorController.java +++ b/src/main/java/com/zy/asrs/controller/MonitorController.java @@ -3,13 +3,12 @@ import com.core.common.Arith; import com.core.common.Cools; import com.core.common.R; -import com.core.common.SpringUtils; import com.zy.asrs.domain.dto.AxisBean; import com.zy.asrs.domain.dto.WorkChartAxis; import com.zy.asrs.domain.vo.LocChartPie; -import com.zy.asrs.entity.BasShuttleErr; +import com.zy.asrs.mapper.BasLiftOptMapper; +import com.zy.asrs.mapper.BasShuttleOptMapper; import com.zy.asrs.mapper.ReportQueryMapper; -import com.zy.asrs.service.BasShuttleErrService; import com.zy.common.service.CommonService; import com.zy.core.CrnThread; import com.zy.core.cache.SlaveConnection; @@ -48,6 +47,10 @@ private ReportQueryMapper reportQueryMapper; @Autowired private SlaveProperties slaveProperties; + @Autowired + private BasLiftOptMapper basLiftOptMapper; + @Autowired + private BasShuttleOptMapper basShuttleOptMapper; /** * 鑾峰彇褰撳墠鏃堕棿 @@ -367,7 +370,20 @@ return R.ok().add(list); } - + /** + * 鑾峰彇璁惧姣忓ぉ杩愯缁熻 + */ + @GetMapping("/deviceRunStatistic") + public R deviceRunStatistic() { + //鑾峰彇鎻愬崌鏈鸿繍琛屾暟鎹� + List<Map<String, Object>> liftList = basLiftOptMapper.selectRunStatistic(); + //鑾峰彇灏忚溅杩愯鏁版嵁 + List<Map<String, Object>> shuttleList = basShuttleOptMapper.selectRunStatistic(); + HashMap<String, Object> map = new HashMap<>(); + map.put("lift", liftList); + map.put("shuttle", shuttleList); + return R.ok().add(map); + } diff --git a/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java index 9c08342..c2ffef2 100644 --- a/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java +++ b/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java @@ -5,10 +5,15 @@ import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + @Mapper @Repository public interface BasLiftOptMapper extends BaseMapper<BasLiftOpt> { BasLiftOpt selectByDeviceWrk(String deviceWrk); + List<Map<String, Object>> selectRunStatistic();//鑾峰彇鎻愬崌鏈烘瘡澶╄繍琛屾暟鎹� + } diff --git a/src/main/java/com/zy/asrs/mapper/BasShuttleOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasShuttleOptMapper.java index 311b4e9..48383ce 100644 --- a/src/main/java/com/zy/asrs/mapper/BasShuttleOptMapper.java +++ b/src/main/java/com/zy/asrs/mapper/BasShuttleOptMapper.java @@ -5,8 +5,13 @@ import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + @Mapper @Repository public interface BasShuttleOptMapper extends BaseMapper<BasShuttleOpt> { + List<Map<String, Object>> selectRunStatistic();//鑾峰彇灏忚溅姣忓ぉ杩愯鏁版嵁 + } diff --git a/src/main/resources/mapper/BasLiftOptMapper.xml b/src/main/resources/mapper/BasLiftOptMapper.xml index 5436fd3..d6c1a60 100644 --- a/src/main/resources/mapper/BasLiftOptMapper.xml +++ b/src/main/resources/mapper/BasLiftOptMapper.xml @@ -23,4 +23,11 @@ order by send_time desc </select> + <select id="selectRunStatistic" resultType="map"> + select lift_no,count(*) count from asr_bas_lift_opt + where send_time > DATEADD(day, DATEDIFF(day, 0, GETDATE()), 0) + and send_time < DATEADD(day, DATEDIFF(day, 0, GETDATE())+1, 0) + group by lift_no + </select> + </mapper> diff --git a/src/main/resources/mapper/BasShuttleOptMapper.xml b/src/main/resources/mapper/BasShuttleOptMapper.xml index 99fefa1..0d135fa 100644 --- a/src/main/resources/mapper/BasShuttleOptMapper.xml +++ b/src/main/resources/mapper/BasShuttleOptMapper.xml @@ -22,4 +22,11 @@ </resultMap> + <select id="selectRunStatistic" resultType="map"> + select shuttle_no,count(*) count from asr_bas_shuttle_opt + where send_time >= DATEADD(day, DATEDIFF(day, 0, GETDATE()), 0) + and send_time < DATEADD(day, DATEDIFF(day, 0, GETDATE())+1, 0) + group by shuttle_no + </select> + </mapper> -- Gitblit v1.9.1