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

liurunyu

2024-10-29 4acdf28be7df0b59882de810481f6a8f53fddc87

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java

@@ -1,17 +1,17 @@
package com.dy.pipIrrProject.intake;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.excel.CellWriteHandler;
import com.dy.pipIrrGlobal.excel.ExcelUtil;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
import com.dy.pipIrrProject.result.ProjectResultCode;
import com.taobao.api.ApiException;
import io.swagger.v3.oas.annotations.Operation;
@@ -35,6 +35,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;

@@ -125,11 +126,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo) {
        try {
            QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
            if (res == null) {
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
            }
            return BaseResponseUtils.buildSuccess(res);
            return BaseResponseUtils.buildSuccess(intakeSv.getIntakes(vo));
        } catch (Exception e) {
            log.error("获取取水口记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
@@ -240,8 +237,6 @@
            log.error("保存分水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }


    }

    /**
@@ -252,16 +247,15 @@
     */
    @SneakyThrows(IOException.class)
    @GetMapping(value = "exportIntakes")
    @SsoAop()
    public void exportIntakes(HttpServletResponse response, QueryVo vo) {
        setExcelRespProp(response, "取水口列表");
        //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class);
        List<VoIntake> memberList = intakeSv.exportIntakes(vo);
        List<VoIntake> intakeList = intakeSv.exportIntakes(vo);

        EasyExcel.write(response.getOutputStream())
                .head(VoIntake.class)
                .excelType(ExcelTypeEnum.XLSX)
                .sheet("取水口列表")
                .doWrite(memberList);
        ExcelUtil.setExcelRespProp(response, "取水口列表" + LocalDate.now());
        EasyExcel.write(response.getOutputStream(), VoIntake.class)
                .registerWriteHandler(new CellWriteHandler("取水口列表"))
                .sheet("取水口")
                .doWrite(intakeList);
    }

    /**
@@ -291,14 +285,13 @@
    }

    /**
     * 此功能已經移植到remote模塊的MonitroCtrl中
     * 获取取水口列表（在线和不在线）
     *
     * @param qo
     * @return
     */
    @GetMapping(path = "all_intakes")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
     @GetMapping(path = "all_intakes")
     @SsoAop()
     public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
        try {
            QueryResultVo<List<VoOnLineIntake>> res = intakeSv.selectOnLineIntakes(qo);
            return BaseResponseUtils.buildSuccess(res);
@@ -306,8 +299,8 @@
            log.error("查询取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

     }
     */
    /**
     * 根据操作员获取常用取水口（在线和不在线）
     *