Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-09 a04797899856a822c792530d0d65e88b3622ddd7

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java

@@ -1,5 +1,7 @@
package com.dy.pipIrrProject.intakeController;


import cn.hutool.core.date.DateTime;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -204,8 +206,9 @@
        try {
            List<Map<String, Object>> list = Optional.ofNullable(intakeControllerSv.getBindsByIntakeId(intakeId)).orElse(new ArrayList<>());
            if(list.size() <= 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NO_RECORDS.getMessage());
            }
                //无绑定记录也返回成功 但数据为空
                return BaseResponseUtils.buildSuccess(list);
            }//成功返回绑定记录数据
            return BaseResponseUtils.buildSuccess(list);
        } catch (Exception e) {
            log.error("查询农户异常", e);
@@ -241,4 +244,75 @@
            return BaseResponseUtils.buildException(e.getMessage()) ;
        }
    }


    /**
     * 根据指定条件获取流浪控制器列表
     *
     * @param vo 查询条件
     * @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 = PrControllerTramp.class))}
            )
    })
    @GetMapping(path = "/getTrampControllers")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<PrControllerTramp>>> getTrampControllers(TrampControllerQueryVo vo) {

        try {
            QueryResultVo<List<PrControllerTramp>> res = intakeControllerSv.getTrampControllers(vo);
            if (res.itemTotal != null && res.itemTotal > 0) {
                return BaseResponseUtils.buildSuccess(res);
            } else {
                //请求成功但数据为空
                return BaseResponseUtils.buildSuccess(res);
            }
            //return BaseResponseUtils.buildSuccess(res);
        } catch (Exception e) {
            log.error("获取流浪控制器记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 添加流浪控制器
     * @param pct
     * @return
     */
    @PostMapping("addTrampController")
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> addTrampController(@RequestBody PrControllerTramp pct){
        pct.setFindDt(new Date());
        Integer rows = intakeControllerSv.addTrampController(pct);
        if (rows == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
        }
        return BaseResponseUtils.buildSuccess(true);
    }

    /**
     * 删除流浪控制器
     * @param id
     * @return
     */
    @PostMapping("deleteTrampController")
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> deleteTrampController(Long id){
        PrControllerTramp controllerInfo = intakeControllerSv.getTrampControllerInfo(id);
        if (controllerInfo==null){return BaseResponseUtils.buildFail(ProjectResultCode.NO_EXIST_TRAMP_CONTROLLER.getMessage());}

        Integer rows = intakeControllerSv.deleteTrampController(id);
        if (rows == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_TRAMP_CONTROLLER_FAIL.getMessage());
        }
        return BaseResponseUtils.buildSuccess(true);
    }
}