liurunyu
2024-12-21 90baa6a076b7c7ea036d2adac3a032a1a473b309
在“远程测控”增加查询一个取水口报警状态的功能,实现后端逻辑
3个文件已修改
47 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateCtrl.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-temp/说明.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateCtrl.java
@@ -64,6 +64,33 @@
    }
    /**
     * èŽ·å–æŒ‡å®šå–æ°´å£æŠ¥è­¦ä¸ŽçŠ¶æ€åˆ—è¡¨ï¼ˆåŽ†å²ï¼‰
     *
     * @param vo ç›¸è¯¢æ¡ä»¶ï¼Œå…¶ä¸­å¿…须赋值取水口ID
     * @return ç¬¦åˆæ¡ä»¶çš„æŽ§åˆ¶å™¨æŠ¥è­¦ä¸ŽçŠ¶æ€åˆ—è¡¨ï¼ˆåŽ†å²ï¼‰
     */
    @Operation(summary = "获得一页获取指定取水口报警与状态记录", description = "返回一页获取指定取水口报警与状态数据")
    @ApiResponses(value = {
            @ApiResponse(
                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                    description = "返回一页获取指定取水口报警与状态(BaseResponse.content:QueryResultVo[{}])",
                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
                            schema = @Schema(implementation = VoActiveCard.class))}
            )
    })
    @GetMapping(path = "/getOneControllerAlarmStateHistory")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoControllerAlarmState>>> getOneControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
        try {
            QueryResultVo<List<VoControllerAlarmState>> res = controllerAlarmStateSv.getOneControllerAlarmStateHistory(vo);
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取获取指定取水口报警与状态记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }
    /**
     * æ ¹æ®æŒ‡å®šæ¡ä»¶èŽ·å–æŽ§åˆ¶å™¨æŠ¥è­¦ä¸ŽçŠ¶æ€åˆ—è¡¨ï¼ˆæœ€æ–°ï¼‰
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java
@@ -48,6 +48,24 @@
        rsVo.obj = rmAlarmStateHistoryMapper.getControllerAlarmStateHistory(params);
        return rsVo;
    }
   /**
     * èŽ·å¾—ä¸€é¡µä¸€ä¸ªå–æ°´å£æŽ§åˆ¶å™¨æŠ¥è­¦ä¸ŽçŠ¶æ€è®°å½•(历史)
     * @param vo
     * @return
     */
    public QueryResultVo<List<VoControllerAlarmState>> getOneControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);
        Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
        QueryResultVo<List<VoControllerAlarmState>> rsVo = new QueryResultVo<>();
        rsVo.pageSize = vo.pageSize;
        rsVo.pageCurr = vo.pageCurr;
        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmAlarmStateHistoryMapper.getControllerAlarmStateHistory(params);
        return rsVo;
    }
    /**
pipIrr-platform/pipIrr-web/pipIrr-web-temp/˵Ã÷.txt
@@ -15,5 +15,5 @@
/temp/chSome/changeSomeIntakeDayAmount
5、重新统计取水口月取水量(执行前关闭通信中间件)
/temp/chSome/reStatisticsAllIntakeMonthAmount
6、重新统计取水口所取水量(执行前关闭通信中间件)
6、重新统计取水口年取水量(执行前关闭通信中间件)
/temp/chSome/reStatisticsAllIntakeYearAmount