Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-02-24 dae44e71f055776501ebbb1d3524833a50ad439a

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java

@@ -35,7 +35,7 @@
     * @return
     */
    public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {

        vo.completionTime();
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);

        Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -54,6 +54,7 @@
     * @return
     */
    public QueryResultVo<List<VoControllerAlarmState>> getOneControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
        vo.completionTime();
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);

        Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -74,7 +75,7 @@
     * @return
     */
    public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateLast(ControllerAlarmStateQueryVo vo) {

        vo.completionTime();
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);

        Long itemTotal = rmAlarmStateLastMapper.getRecordCount(params);