自动化立体仓库 - WCS系统
Junjie
2023-12-15 1abe5ed8b8e3a25b0d3851b467deb9b38d7c082e
#提升机小车运行数据接口
5个文件已修改
48 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MonitorController.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/BasShuttleOptMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasLiftOptMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasShuttleOptMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
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();//获取提升机每天运行数据
}
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();//获取小车每天运行数据
}
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 &gt; DATEADD(day, DATEDIFF(day, 0, GETDATE()), 0)
        and send_time &lt; DATEADD(day, DATEDIFF(day, 0, GETDATE())+1, 0)
        group by lift_no
    </select>
</mapper>
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 &gt;= DATEADD(day, DATEDIFF(day, 0, GETDATE()), 0)
        and send_time &lt; DATEADD(day, DATEDIFF(day, 0, GETDATE())+1, 0)
        group by shuttle_no
    </select>
</mapper>