2024-06-18 朱宝民 优化开关阀逻辑

Administrator

2024-06-18 292970714c72b6eb0e6acae509d70c1927402f9a

 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;
@@ -43,13 +44,14 @@
@Slf4j
@Tag(name = "控制器管理", description = "控制器操作")
@RestController
@RequestMapping(path="controller")
@RequestMapping(path = "controller")
@RequiredArgsConstructor
public class ControllerCtrl {
    private final ControllerSv controllerSv;

    /**
     * 根据指定条件获取控制器列表
     *
     * @param vo 查询条件
     * @return 符合条件的控制器列表
     */
@@ -64,23 +66,24 @@
    })
    @GetMapping(path = "/getControllers")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoController>>> getControllers(QueryVo vo){
    public BaseResponse<QueryResultVo<List<VoController>>> getControllers(QueryVo vo) {
        try {
            QueryResultVo<List<VoController>> res = controllerSv.getControllers(vo);
            if(res.itemTotal != null && res.itemTotal > 0) {
            if (res.itemTotal != null && res.itemTotal > 0) {
                return BaseResponseUtils.buildSuccess(res);
            }else {
            } else {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
            }
            //return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取开卡记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 根据控制器编号获取控制器列表
     *
     * @param rtuAddr 控制器地址
     * @return 符合条件的控制器列表
     */
@@ -95,22 +98,23 @@
    })
    @GetMapping(path = "controller_list")
    @SsoAop()
    public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr){
    public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr) {
        try {
            List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>());
            if(list.size() <= 0) {
            if (list.size() <= 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
            }
            return BaseResponseUtils.buildSuccess(list);
        } catch (Exception e) {
            log.error("查询控制器异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 添加控制器
     * @param po 控制器实体对象
     *
     * @param po            控制器实体对象
     * @param bindingResult
     * @return 添加是否成功
     */
@@ -127,8 +131,8 @@
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    //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()){
    public BaseResponse<Boolean> add(@RequestBody @Valid PrController po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

@@ -140,17 +144,21 @@

        Date operateTime = new Date();
        po.setOperateDt(operateTime);
        po.setDeleted((byte)0);
        po.setDeleted((byte) 0);
        po.setFindDt(operateTime);
        if (po.getAddWays() == null) {
            po.setAddWays((byte) 1);
        }
        Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
        if(rec == 0) {
        if (rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_FAIL.getMessage());
        }
        return BaseResponseUtils.buildSuccess(true) ;
        return BaseResponseUtils.buildSuccess(true);
    }

    /**
     * 根据控制器编号删除控制器
     *
     * @param map
     * @return
     */
@@ -165,21 +173,51 @@
    })
    @PostMapping(path = "delete")
    @SsoAop()
    public BaseResponse<Boolean> delete(@RequestBody Map map){
        if(map == null || map.size() <=0) {
    public BaseResponse<Boolean> delete(@RequestBody Map map) {
        if (map == null || map.size() <= 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_CONTROLLER_ID.getMessage());
        }

        Long controllerId = Long.parseLong(map.get("controllerId").toString());
        Integer recordCount = Optional.ofNullable(controllerSv.deleteControllerById(controllerId)).orElse(0);
        if(recordCount == 0) {
        if (recordCount == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_CONTROLLER_FAIL.getMessage());
        }
        return BaseResponseUtils.buildSuccess(true) ;
        return BaseResponseUtils.buildSuccess(true);
    }

    /**
     * 获取未绑控制器的取水口列表
     *
     * @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
     */
@@ -206,4 +244,6 @@
        String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
    }


}