Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-10-11 1a25df189f6cd3af60da56a2261d25f8d948584c

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerTrampMapper.java

@@ -24,6 +24,12 @@
    int deleteByPrimaryKey(Long id);

    /**
     * 清空流浪控制器表
     * @return
     */
    int emptyTrampController();

    /**
     * insert record to table
     * @param record the record
     * @return insert count

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml

@@ -35,6 +35,10 @@
    delete from pr_controller_tramp
    where id = #{id,jdbcType=BIGINT}
  </delete>
    <!--清空流浪控制器表-->
    <delete id="emptyTrampController">
        delete from pr_controller_tramp
    </delete>
  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
    <!--@mbg.generated-->
    insert into pr_controller_tramp (id, rtuAddr, protocol,

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

@@ -337,4 +337,22 @@
        }
        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.buildSuccess(true);
    }
}

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

@@ -98,6 +98,15 @@
        return prControllerTrampMapper.deleteByPrimaryKey(controllerId);
    }

    /**
     * 清空流浪控制器
     * @param
     * @return
     */
    public Integer emptyTrampController() {
        return prControllerTrampMapper.emptyTrampController();
    }

    //流浪控制器增
    public Integer addTrampController(PrControllerTramp record){
        return prControllerTrampMapper.insertSelective(record);