重新定义并优化RTU上行数据接口

liurunyu

2024-10-23 389b77df2609f6c49a64ef22dee7ff867f9f19a6

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java

@@ -30,15 +30,30 @@
    private final IntakeSv intakeSv;

    /**
     * 根据取水口编号获取取水口对象
     * @param qo
     * @return
     */
    //@GetMapping(path = "one_intake")
    @GetMapping(path = "all_intakes")
    public BaseResponse<QueryResultVo<VoOnLineIntake>> getOneIntake(OnLineIntakesQO qo) {
        try {
            return BaseResponseUtils.buildSuccess(intakeSv.selectOneIntake(qo));
        } catch (Exception e) {
            log.error("查询取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 获取取水口列表（在线和不在线）
     * @param qo
     * @return
     */
    @GetMapping(path = "all_intakes")
    @GetMapping(path = "all_intakes2")
    public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
        try {
            QueryResultVo<List<VoOnLineIntake>> res = intakeSv.selectOnLineIntakes(qo);
            return BaseResponseUtils.buildSuccess(res);
            return BaseResponseUtils.buildSuccess(intakeSv.selectAllIntakes(qo));
        } catch (Exception e) {
            log.error("查询取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());