2024-01-17 朱宝民 获取未绑控制器的取水口列表

Administrator

2024-01-17 d66fdfdeaf6a0fbfdeed97848ee507243977878e

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java

@@ -1,5 +1,6 @@
package com.dy.pipIrrProject.controller;

import com.alibaba.fastjson2.JSONArray;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.dy.common.aop.SsoAop;
@@ -81,7 +82,7 @@

    /**
     * 根据控制器编号获取控制器列表
     * @param controllerCode 控制器编号
     * @param rtuAddr 控制器地址
     * @return 符合条件的控制器列表
     */
    @Operation(summary = "获得控制器记录", description = "返回取控制器数据")
@@ -126,17 +127,23 @@
    @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
    //public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
    public BaseResponse<Boolean> add(@RequestBody @Valid PrController po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        PrController prController = DtoToPojo.INSTANCT.po2vo(po);
        //PrController prController = DtoToPojo.INSTANCT.po2vo(po);
        //Date operateTime = new Date();
        //prController.setOperatedt(operateTime);
        //prController.setDeleted((byte)0);
        //prController.setReporttime(operateTime);

        Date operateTime = new Date();
        prController.setOperatedt(operateTime);
        prController.setDeleted((byte)0);
        prController.setReporttime(operateTime);
        Integer rec = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
        po.setOperateDt(operateTime);
        po.setDeleted((byte)0);
        po.setFindDt(operateTime);
        Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
        if(rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_FAIL.getMessage());
        }
@@ -173,6 +180,34 @@
    }

    /**
     * 获取未绑控制器的取水口列表
     * @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 = BaClient.class))}
            )
    })
    @GetMapping(path = "nobinding_intakes")
    @SsoAop()
    public BaseResponse<JSONArray> getNoBindingIntakes(){
        try {
            JSONArray array = controllerSv.getNoBindingIntakes();
            if(array.size() <= 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_BINDING_INTAKE.getMessage());
            }
            return BaseResponseUtils.buildSuccess(array);
        } catch (Exception e) {
            log.error("查询控制器异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }

    /**
     * 导出控制器列表
     * @param response
     * @param vo