| src/main/java/com/whyc/controller/InfoContoller.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/factory/InfoFactory.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/whyc/service/BattInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/InfoContoller.java
@@ -66,7 +66,7 @@ @ApiOperation(value = "删除电池组") @GetMapping("delBatt") public Response delBatt(@RequestParam Integer stationId,@RequestParam Integer powerId,@RequestParam Integer battgroupId){ public Response delBatt(@RequestParam Integer stationId,@RequestParam Integer powerId,@RequestParam(required = false) Integer battgroupId){ return binfService.delBatt(stationId, powerId, battgroupId); }
@@ -13,23 +13,11 @@ .setPowerModel(info.getPowerModel()) .setProtocol(info.getProtocol()) .setPowerIp(info.getPowerIp()); if(info.getProvice()!=null){ pinf.setProvice(info.getProvice()); } if(info.getCity()!=null){ pinf.setCity(info.getCity()); } if(info.getCountry()!=null){ pinf.setCountry(info.getCountry()); } if(info.getStationName()!=null){ pinf.setStationName(info.getStationName()); } if(info.getStationId()!=null){ pinf.setStationId(info.getStationId()); } if(info.getPowerId()!=null){ pinf.setPowerId(info.getPowerId()); } if(info.getPowerName()!=null){ pinf.setPowerName(info.getPowerName()); } StationInf sinf=new StationInf(); sinf.setProvice(info.getProvice()) @@ -39,26 +27,63 @@ .setStationType(info.getStationType()) .setLatitude(info.getLatitude()) .setLongitude(info.getLongitude()); if(info.getProvice()!=null){ sinf.setProvice(info.getProvice()); } if(info.getCity()!=null){ sinf.setCity(info.getCity()); } if(info.getCountry()!=null){ sinf.setCountry(info.getCountry()); } if(info.getStationName()!=null){ sinf.setStationName(info.getStationName()); } if(info.getStationId()!=null){ sinf.setStationId(info.getStationId()); } pinf.setSinf(sinf); return pinf; } //将info对象转为电池组对象 public static BattInf infoToBatt(InfoDto info) { BattInf binf = new BattInf(); binf.setDevIp(info.getDevIp()) .setDevType(info.getDevType()) .setMoncapstd(info.getMoncapstd()) .setMoncount(info.getMoncount()) .setMonresstd(info.getMonresstd()) .setMonvolstd(info.getMonvolstd()) .setProduct(info.getProduct()) .setBattModel(info.getBattModel()); if(info.getDevType()!=null){ binf.setDevType(info.getDevType()); } if(info.getMoncapstd()!=null){ binf.setMoncapstd(info.getMoncapstd()); } if(info.getMoncount()!=null){ binf.setMoncount(info.getMoncount()); } if(info.getMonresstd()!=null){ binf.setMonresstd(info.getMonresstd()); } if(info.getMonvolstd()!=null){ binf.setMonvolstd(info.getMonvolstd()); } if(info.getProduct()!=null){ binf.setProduct(info.getProduct()); } if(info.getBattModel()!=null){ binf.setBattModel(info.getBattModel()); } if(info.getDevIp()!=null){ binf.setDevIp(info.getDevIp()); } if(info.getBattgroupId()!=null){ binf.setBattgroupId(info.getBattgroupId()); } if(info.getBattgroupName()!=null){ binf.setBattgroupName(info.getBattgroupName()); } if(info.getDevId()!=null){ binf.setDevId(info.getDevId()); } if(info.getDevName()!=null){ binf.setDevName(info.getDevName()); } return binf; } } src/main/java/com/whyc/service/BattInfService.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -110,24 +111,27 @@ //删除电池组 @Transactional public Response delBatt(Integer stationId, Integer powerId,Integer battgroupId) { List<BattInf> binfList=new ArrayList<>(); if(battgroupId!=null){ UpdateWrapper wrapper=new UpdateWrapper(); wrapper.eq("battgroup_id",battgroupId); mapper.delete(wrapper); //检测如果powerId下电池组删除完了,要将电源也删除掉 QueryWrapper wrapper1=new QueryWrapper(); wrapper1.eq("power_id",powerId); List<BattInf> binfList=mapper.selectList(wrapper1); if(binfList==null){ binfList=mapper.selectList(wrapper1); } if(binfList==null||binfList.size()==0){ UpdateWrapper wrapper2=new UpdateWrapper(); wrapper2.eq("power_id",powerId); pinfMapper.delete(wrapper); pinfMapper.delete(wrapper2); //删除所有包机组下的电源 bjService.delPowerInBaoji(powerId); //再检测如果机房下电源也全删除了，要将机房也删除 QueryWrapper wrapper3=new QueryWrapper(); wrapper3.eq("station_id",stationId); List<PowerInf> pinfList=pinfMapper.selectList(wrapper3); if(pinfList==null){ if(pinfList==null||pinfList.size()==0){ UpdateWrapper wrapper4=new UpdateWrapper(); wrapper4.eq("station_id",stationId); sinfMapper.delete(wrapper4); @@ -159,7 +163,7 @@ wrapper1.set("latitude",sinf.getLatitude()); } wrapper1.eq("station_id",sinf.getStationId()); sinfMapper.update((StationInf) ActionUtil.objeNull,wrapper1); //再修改电源信息 UpdateWrapper wrapper2=new UpdateWrapper(); if(pinf.getCompany()!=null){ @@ -178,7 +182,7 @@ //检测该机房下要修改的电源名是否存在 QueryWrapper queryWrapper=new QueryWrapper(); queryWrapper.eq("power_name",pinf.getPowerName()); queryWrapper.eq("station_id",pinf.getStationId()); queryWrapper.eq("station_id",sinf.getStationId()); queryWrapper.last("limit 1"); PowerInf juegep=pinfMapper.selectOne(queryWrapper); if(juegep!=null){ @@ -187,9 +191,10 @@ wrapper2.set("power_name",pinf.getPowerName()); } wrapper2.eq("power_id",pinf.getPowerId()); pinfMapper.update((PowerInf) ActionUtil.objeNull,wrapper2); //最后修改设备信息 BattInf binf=InfoFactory.infoToBatt(info); if(binf.getDevId()!=null) { UpdateWrapper wrapper3=new UpdateWrapper(); if(binf.getDevIp()!=null){ wrapper3.set("dev_ip",binf.getDevIp()); @@ -206,11 +211,10 @@ } wrapper3.set("dev_name",binf.getDevName()); } if(binf.getDevType()!=null){ /*if(binf.getDevType()!=null){ wrapper3.set("dev_type",binf.getDevType()); } }*/ wrapper3.eq("dev_id",binf.getDevId()); mapper.update((BattInf) ActionUtil.objeNull,wrapper3); //修改电池组信息 UpdateWrapper wrapper4=new UpdateWrapper(); @@ -245,8 +249,12 @@ wrapper4.set("batt_model",binf.getBattModel()); } wrapper4.eq("battgroup_id",binf.getBattgroupId()); mapper.update((BattInf) ActionUtil.objeNull,wrapper3); mapper.update((BattInf) ActionUtil.objeNull,wrapper4); return new Response().set(1,true); } sinfMapper.update((StationInf) ActionUtil.objeNull,wrapper1); pinfMapper.update((PowerInf) ActionUtil.objeNull,wrapper2); return new Response().set(1,true,"修改信息成功"); } /*//修改电池组 public Response updateBatt(BattInf binf) {
