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

liurunyu

2025-08-15 de31eed424e62a219d6378fe193e615a8584ae0c

 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.voPr.*;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
import com.dy.pipIrrProject.intake.qo.QoIntake;
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.*;

@@ -74,11 +75,11 @@
    })
    @GetMapping(path = "all")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<PrIntake>>> all() {
    public BaseResponse<QueryResultVo<List<VoAllIntake>>> all() {
        try {
            QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
            QueryResultVo<List<VoAllIntake>> res = this.intakeSv.selectAll();
            if (res == null) {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
            } else {
                return BaseResponseUtils.buildSuccess(res);
            }
@@ -102,13 +103,14 @@
                            schema = @Schema(implementation = PrIntake.class))}
            )
    })
    @GetMapping(path = "one/{id}")
    @GetMapping(path = "one")
    @SsoAop()
    public BaseResponse<PrIntake> one(@PathVariable("id") Long id) {
        if (this.intakeSv.selectById(id) == null) {
            return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage());
    public BaseResponse<VoAllIntake> one(@RequestParam("id") Long id) {
        VoAllIntake po = this.intakeSv.selectById(id) ;
        if (po == null) {
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
        } else {
            return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
            return BaseResponseUtils.buildSuccess(po);
        }
    }

@@ -125,11 +127,7 @@
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo) {
        try {
            QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
            if (res == null) {
                return BaseResponseUtils.buildFail(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());
@@ -151,17 +149,17 @@
    public BaseResponse<Boolean> add(@RequestBody @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) {
        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        List<Long> ids = intakeSv.getIntakeIdsByName(po.getName());
        if (ids.size() > 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
        }
        po.setOperateDt(new Date());
        po.setDeleted((byte) 0);
        Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0);
        if (rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
        }
        return BaseResponseUtils.buildSuccess(true);
    }
@@ -185,11 +183,11 @@
    @SsoAop()
    public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), po.getName());
        if (ids.size() > 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
        }
        int count;
        po.setOperateDt(new Date());
@@ -200,7 +198,34 @@
            return BaseResponseUtils.buildException(e.getMessage());
        }
        if (count <= 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage());
        } else {
            return BaseResponseUtils.buildSuccess(true);
        }
    }

    /**
     * app修改取水口经纬度
     * @param po
     * @param bindingResult
     * @return
     */
    @PostMapping(path = "updateIntakeLngLat", consumes = MediaType.APPLICATION_JSON_VALUE)
    @SsoAop()
    public BaseResponse<Boolean> updateIntakeLngLat(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid IntakeUpdateLngLat po, @Parameter(hidden = true) BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        int count;
        po.setOperateDt(new Date());
        try {
            count = this.intakeSv.updateIntakeLngLat(po);
        } catch (Exception e) {
            log.error("保存取水口经纬度异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
        if (count <= 0) {
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage());
        } else {
            return BaseResponseUtils.buildSuccess(true);
        }
@@ -225,14 +250,14 @@
    @SsoAop()
    public BaseResponse<Boolean> delete(@RequestBody Map map) {
        if (map == null || map.size() <= 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage());
        }
        Long id = Long.parseLong(map.get("id").toString());
        try {
            //取水口ID
            Integer recordCount = Optional.ofNullable(intakeSv.delete(id)).orElse(0);
            if (recordCount == 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage());
                return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage());
            } else {
                return BaseResponseUtils.buildSuccess(true);
            }
@@ -240,8 +265,6 @@
            log.error("保存分水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }


    }

    /**
@@ -252,16 +275,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 +313,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 +327,8 @@
            log.error("查询取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

     }
     */
    /**
     * 根据操作员获取常用取水口（在线和不在线）
     *
@@ -325,4 +346,20 @@
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 获取未绑定到轮灌组的取水口列表
     * @return
     */
    @GetMapping(path = "getFreeIntakes")
    @SsoAop()
    public BaseResponse<List<VoIntakeSimple>> getFreeIntakes(QoIntake qo) {
        try {
            List<VoIntakeSimple> res = intakeSv.getFreeIntakes(qo);
            return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("查询取水口异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }
}