Merge remote-tracking branch 'git-pipIrr/master'

liurunyu

2024-05-16 6d31770c150bcaf17a5814bc2aff8b9754f89525

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

@@ -42,7 +42,7 @@
@Slf4j
@Tag(name = "取水口/控制器关联管理", description = "取水口/控制器关联操作")
@RestController
@RequestMapping(path="intake_controller")
@RequestMapping(path = "intake_controller")
@RequiredArgsConstructor
public class IntakeControllerCtrl {
    private final IntakeControllerSv intakeControllerSv;
@@ -53,9 +53,10 @@
     * 取水口绑定控制器
     * 1. 接收取水口ID及流浪控制器ID，并验证取水口和控制器是否存在
     * 2. 判断该控制器是否存在未解绑记录，如果存在提示用户该控制器存在未解绑记录
     * 3. 组装控制器对象插入控制器表中
     * 4. 添加绑定记录
     * 3. 组装控制器对象插入控制器表中（及添加绑定记录）
     * 4. 修改绑定记录设置备注
     * 5. 删除流浪控制器（物理删除）
     *
     * @param po
     * @param bindingResult
     * @return
@@ -74,26 +75,26 @@
    @SsoAop()
    public BaseResponse<Boolean> bind(@RequestBody @Valid DtoIntakeController po, BindingResult bindingResult) throws ParseException {
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        if(bindingResult != null && bindingResult.hasErrors()){
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }
        // 接收参数
        Long intakeId = po.getIntakeId();
        Long controllerId = po.getControllerId();
        Long trampControllerId = po.getControllerId();
        String remarks = po.getRemarks();
        Long operator = po.getOperator();

        // 根据编号分别获取取水口记录数、流浪控制器信息，判断取水口及控制器是否存在
        Integer recIntke = Optional.ofNullable(intakeSv.getRecordCountOfIntake(intakeId)).orElse(0);
        PrControllerTramp prControllerTramp = intakeControllerSv.getTrampControllerInfo(controllerId);
        PrControllerTramp prControllerTramp = intakeControllerSv.getTrampControllerInfo(trampControllerId);
        //Map map_TrampController = Optional.ofNullable(intakeControllerSv.getTrampControllerInfo(controllerId)).orElse(new HashMap());
        if(recIntke == 0 || prControllerTramp == null) {
        if (recIntke == 0 || prControllerTramp == null) {
            return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_OR_CONTROLLER_NO_EXIST.getMessage());
        }

        // 根据控制器编号判断该控制器是否存在未解绑记录
        Integer recBinded = Optional.ofNullable(controllerSv.getBindedCount(controllerId)).orElse(0);
        if(recBinded > 0) {
        Integer recBinded = Optional.ofNullable(controllerSv.getBindedCount(trampControllerId)).orElse(0);
        if (recBinded > 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_BINDED.getMessage());
        }

@@ -103,29 +104,31 @@
        prController.setRtuAddr(prControllerTramp.getRtuAddr());
        prController.setProtocol(prControllerTramp.getProtocol());
        prController.setFindDt(prControllerTramp.getFindDt());
        prController.setAddWays((byte)1);
        prController.setAddWays((byte) 1);
        prController.setOperator(operator);
        Date operateTime = new Date();
        prController.setOperateDt(operateTime);
        prController.setDeleted((byte)0);
        prController.setDeleted((byte) 0);
        Integer rec_addController = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
        if(rec_addController == 0) {
        if (rec_addController == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
        }

        // 添加绑定记录
        PrIntakeController prIntakeController = DtoToPojo.INSTANCT.po2vo(po);
        prIntakeController.setOperatedt(operateTime);
        prIntakeController.setOperatetype((byte)1);
        Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
        if(rec == 0) {

        // 修改绑定记录
        PrIntakeController prIntakeController = new PrIntakeController();
        prIntakeController.setRemarks(remarks);
        prIntakeController.setIntakeid(intakeId);

        Integer rec = Optional.ofNullable(intakeControllerSv.updateBindRecord(prIntakeController)).orElse(0);
        if (rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
        }

        // 根据流浪控制器编号删除流浪控制器记录
        intakeControllerSv.deleteTrampController(controllerId);
        intakeControllerSv.deleteTrampController(trampControllerId);

        return BaseResponseUtils.buildSuccess(true) ;
        return BaseResponseUtils.buildSuccess(true);
    }

    /**
@@ -133,6 +136,7 @@
     * 1. 接收取水口ID及流浪控制器ID，并验证取水口和控制器是否存在
     * 2. 添加解绑记录
     * 3. 删除控制器外键
     *
     * @param po
     * @param bindingResult
     * @return
@@ -149,15 +153,15 @@
    @PostMapping(path = "unbind", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> unbind(@RequestBody @Valid DtoIntakeController po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
    public BaseResponse<Boolean> unbind(@RequestBody @Valid DtoIntakeController po, BindingResult bindingResult) {
        if (bindingResult != null && bindingResult.hasErrors()) {
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        // 根据编号分别获取取水口、控制器未删除记录数
        Integer recIntke = Optional.ofNullable(intakeSv.getRecordCountOfIntake(po.getIntakeId())).orElse(0);
        Integer recController = Optional.ofNullable(controllerSv.getRecordCountOfController(po.getControllerId())).orElse(0);
        if(recIntke == 0 || recController == 0) {
        if (recIntke == 0 || recController == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_OR_CONTROLLER_NO_EXIST.getMessage());
        }

@@ -171,23 +175,24 @@
        PrIntakeController prIntakeController = DtoToPojo.INSTANCT.po2vo(po);
        Date operateTime = new Date();
        prIntakeController.setOperatedt(operateTime);
        prIntakeController.setOperatetype((byte)2);
        prIntakeController.setOperatetype((byte) 2);
        Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
        if(rec == 0) {
        if (rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
        }

        // 删除控制器外键
        Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteIntakeId(po.getControllerId())).orElse(0);
        if(rec_deleteIntakeId == 0) {
        if (rec_deleteIntakeId == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
        }

        return BaseResponseUtils.buildSuccess(true) ;
        return BaseResponseUtils.buildSuccess(true);
    }

    /**
     * 根据取水口编号获取绑定记录列表
     *
     * @param intakeId 取水口编号
     * @return 取水口下控制器的绑定、解绑记录
     */
@@ -202,22 +207,23 @@
    })
    @GetMapping(path = "intake_binds")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByIntakeId(Long intakeId){
    public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByIntakeId(Long intakeId) {
        try {
            List<Map<String, Object>> list = Optional.ofNullable(intakeControllerSv.getBindsByIntakeId(intakeId)).orElse(new ArrayList<>());
            if(list.size() <= 0) {
            if (list.size() <= 0) {
                //无绑定记录也返回成功 但数据为空
                return BaseResponseUtils.buildSuccess(list);
            }//成功返回绑定记录数据
            return BaseResponseUtils.buildSuccess(list);
        } catch (Exception e) {
            log.error("查询农户异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
            log.error("查询异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

    /**
     * 根据控制器编号获取绑定记录列表
     *
     * @param controllerId 控制器编号
     * @return 与该控制器相关的绑定、解绑记录
     */
@@ -232,16 +238,17 @@
    })
    @GetMapping(path = "controller_binds")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByControllerId(Long controllerId){
    public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getBindsByControllerId(Long controllerId) {
        try {
            List<Map<String, Object>> list = Optional.ofNullable(intakeControllerSv.getBindsByControllerId(controllerId)).orElse(new ArrayList<>());
            if(list.size() <= 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_NO_RECORDS.getMessage());
            if (list.size() <= 0) {
                //无绑定记录也返回成功 但数据为空
                return BaseResponseUtils.buildSuccess(list);
            }
            return BaseResponseUtils.buildSuccess(list);
        } catch (Exception e) {
            log.error("查询农户异常", e);
            return BaseResponseUtils.buildException(e.getMessage()) ;
            log.error("查询异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
        }
    }

@@ -282,13 +289,14 @@

    /**
     * 添加流浪控制器
     *
     * @param pct
     * @return
     */
    @PostMapping("addTrampController")
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> addTrampController(@RequestBody PrControllerTramp pct){
    public BaseResponse<Boolean> addTrampController(@RequestBody PrControllerTramp pct) {
        pct.setFindDt(new Date());
        Integer rows = intakeControllerSv.addTrampController(pct);
        if (rows == 0) {
@@ -299,15 +307,18 @@

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

        Integer rows = intakeControllerSv.deleteTrampController(id);
        if (rows == 0) {