wuzeyu
2024-09-20 7f9edffbafc7d4862b68278c4d5189e50b4291d2
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerCtrl.java
@@ -104,6 +104,7 @@
        prController.setRtuAddr(prControllerTramp.getRtuAddr());
        prController.setProtocol(prControllerTramp.getProtocol());
        prController.setFindDt(prControllerTramp.getFindDt());
        prController.setOrgTag(prControllerTramp.getOrgTag());
        prController.setAddWays((byte) 1);
        prController.setOperator(operator);
        Date operateTime = new Date();
@@ -113,17 +114,18 @@
        if (rec_addController == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
        }
//        if (remarks != null || remarks !=""){
//            // 修改绑定记录
//            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());
//            }
//        }
        // 修改绑定记录
        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(trampControllerId);
@@ -176,13 +178,24 @@
        Date operateTime = new Date();
        prIntakeController.setOperatedt(operateTime);
        prIntakeController.setOperatetype((byte) 2);
        prIntakeController.setRemarks("解绑");
        Integer rec = Optional.ofNullable(intakeControllerSv.addRecord(prIntakeController)).orElse(0);
        if (rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
        }
        // 删除控制器外键
        Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteIntakeId(po.getControllerId())).orElse(0);
        //添加到流浪控制器
        PrController ControllerList = controllerSv.getByControllerId(po.getControllerId());
        PrControllerTramp prControllerTramp = new PrControllerTramp();
        prControllerTramp.setRtuAddr(ControllerList.getRtuAddr());
        prControllerTramp.setProtocol(ControllerList.getProtocol());
        prControllerTramp.setFindDt(new Date());
        prControllerTramp.setOrgTag(ControllerList.getOrgTag());
        Integer rec_addControllerTramp = Optional.ofNullable(intakeControllerSv.addTrampController(prControllerTramp)).orElse(0);
        if (rec_addControllerTramp == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
        }
        // 删除控制器
        Integer rec_deleteIntakeId = Optional.ofNullable(controllerSv.deleteControllerByIdTwo(po.getControllerId())).orElse(0);
        if (rec_deleteIntakeId == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.BIND_FAIL.getMessage());
        }