优化接口 删除流浪控制器，没有删除内容也显示成功 rtu增加 梅江备份config.xml文件

wuzeyu

2024-12-21 d2b83e3617bfc819b2ceb4658b24124e6146bfa3

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

@@ -1,7 +1,6 @@
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;
@@ -103,7 +102,9 @@
        prController.setIntakeId(intakeId);
        prController.setRtuAddr(prControllerTramp.getRtuAddr());
        prController.setProtocol(prControllerTramp.getProtocol());
        prController.setProtocolVersion(prControllerTramp.getProtocolVersion());
        prController.setFindDt(prControllerTramp.getFindDt());
        prController.setOrgTag(prControllerTramp.getOrgTag());
        prController.setAddWays((byte) 1);
        prController.setOperator(operator);
        Date operateTime = new Date();
@@ -188,6 +189,7 @@
        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());
@@ -282,16 +284,15 @@
    @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);
            //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(intakeControllerSv.getTrampControllers(vo));
        } catch (Exception e) {
            log.error("获取流浪控制器记录异常", e);
            return BaseResponseUtils.buildException(e.getMessage());
@@ -311,7 +312,7 @@
        pct.setFindDt(new Date());
        Integer rows = intakeControllerSv.addTrampController(pct);
        if (rows == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.ADD_TRAMP_CONTROLLER_FAIL.getMessage());
        }
        return BaseResponseUtils.buildSuccess(true);
    }
@@ -328,12 +329,30 @@
    public BaseResponse<Boolean> deleteTrampController(Long id) {
        PrControllerTramp controllerInfo = intakeControllerSv.getTrampControllerInfo(id);
        if (controllerInfo == null) {
            return BaseResponseUtils.buildFail(ProjectResultCode.NO_EXIST_TRAMP_CONTROLLER.getMessage());
            return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_EXIST_TRAMP_CONTROLLER.getMessage());
        }

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

    /**
     * 清空流浪控制器
     *
     * @param
     * @return
     */
    @PostMapping("emptyTrampController")
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> emptyTrampController() {

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