包机组下添加电源的验证修改

whyclxw

8 小时以前 cae57767c58673966d05a4d5d5855216fa3f07d4

包机组下添加电源的验证修改

 src/main/java/com/whyc/controller/BaojiGroupController.java

@@ -71,8 +71,8 @@

    @PostMapping("updateStationList")
    @ApiOperation(value = "包机组添加机房和电源|移除机房和电源",notes = "operationFlag为1,添加;-1,移除")
    public Response updateStationAndLockList(@RequestBody List<BaojigroupPower> baoJiGroupLockList, @RequestParam int operationFlag){
        return service.updateStationAndLockList(baoJiGroupLockList,operationFlag);
    public Response updateStationList(@RequestBody List<BaojigroupPower> baoJiGroupLockList, @RequestParam int operationFlag){
        return service.updateStationList(baoJiGroupLockList,operationFlag);
    }



 src/main/java/com/whyc/service/BaojigroupService.java

@@ -121,7 +121,7 @@
    //包机组添加机房和电源|移除机房和电源
    //②)将电源添加到班组包机组中时需检查该电源是否在其他包机组中存在,若存在则提示当前电源已在其他班组(可提示存在的班组名称)中存在，若不存在则执行添加逻辑。
    @Transactional
    public Response updateStationAndLockList(List<BaojigroupPower> BaojigroupPowerList, int operationFlag) {
    public Response updateStationList(List<BaojigroupPower> BaojigroupPowerList, int operationFlag) {
        if(operationFlag==1){
            List<BaojigroupPower> addList=new ArrayList<>();
            List<BaojigroupPower> unaddList=new ArrayList<>();
@@ -130,12 +130,17 @@
                int flag=checkPowerIsInBanzu(bjp.getPowerId());
                if(flag==1){
                    unaddList.add(bjp);
                    return new Response().setII(1,false,unaddList,"存在电源已添加过班组");

                }else{
                    addList.add(bjp);
                }
            }
            bjPowermapper.insertBatchSomeColumn(addList);
            return new Response().set(1, true,"添加成功");

            if(unaddList.size()>0){
                return new Response().setII(1,false,unaddList,"存在电源已添加过班组");
            }else{
                bjPowermapper.insertBatchSomeColumn(addList);
                return new Response().set(1, true,"添加成功");
            }
        }else{
            bjPowermapper.deleteStationAndLockList(BaojigroupPowerList);
            return new Response().set(1,true,"移除成功");