src/main/java/com/whyc/controller/BattInfController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/InfoContoller.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/PowerInfController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/controller/StationInfController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/factory/InfoFactory.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BaojigroupService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/PowerInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/BattInfController.java
File was deleted src/main/java/com/whyc/controller/InfoContoller.java
@@ -70,12 +70,11 @@ return binfService.delBatt(stationId, powerId, battgroupId); } /*@ApiOperation(value = "编辑机房,电源,电池组信息") @ApiOperation(value = "编辑机房,电源,电池组信息") @PostMapping("updateInfo") public Response updateInfo(@RequestBody InfoDto info){ PowerInf pinf=InfoFactory.infoToPower(info); BattInf binf=InfoFactory.infoToBatt(info); }*/ return binfService.updateInfo(info); } @ApiOperation(value = "查询机房,电源,电池组信息") @PostMapping("getInfo") src/main/java/com/whyc/controller/PowerInfController.java
File was deleted src/main/java/com/whyc/controller/StationInfController.java
@@ -22,29 +22,5 @@ User uinf= ActionUtil.getUser(); return service.getLeftStation(uinf.getId()); } /* @ApiOperation(value = "添加机房") @PostMapping("addStatiaon") public Response addStatiaon(@RequestBody StationInf sinf){ return service.addStatiaon(sinf); } @ApiOperation(value = "删除机房") @GetMapping("delStatiaon") public Response delStatiaon(@RequestParam Integer stationId){ return service.delStatiaon(stationId); } @ApiOperation(value = "修改机房") @PostMapping("updateStatiaon") public Response updateStatiaon(@RequestBody StationInf sinf){ return service.updateStatiaon(sinf); } @ApiOperation(value = "查询机房") @PostMapping("getStatiaon") public Response getStatiaon(@RequestBody StationDto dto){ return service.getStatiaon(dto); }*/ } src/main/java/com/whyc/factory/InfoFactory.java
@@ -13,6 +13,24 @@ .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()); } StationInf sinf=new StationInf(); sinf.setProvice(info.getProvice()) .setCity(info.getCity()) @@ -35,6 +53,12 @@ .setMonvolstd(info.getMonvolstd()) .setProduct(info.getProduct()) .setBattModel(info.getBattModel()); if(info.getBattgroupId()!=null){ binf.setBattgroupId(info.getBattgroupId()); } if(info.getDevId()!=null){ binf.setDevId(info.getDevId()); } return binf; } } src/main/java/com/whyc/service/BaojigroupService.java
@@ -237,4 +237,11 @@ update.eq("power_id",pid); bjPowermapper.delete(update); } //删除包机组下的机房 public void delStationInBaoji(Integer sid) { UpdateWrapper<BaojigroupPower> update = Wrappers.update(); update.eq("station_id",sid); bjPowermapper.delete(update); } } src/main/java/com/whyc/service/BattInfService.java
@@ -6,8 +6,8 @@ import com.github.pagehelper.PageInfo; import com.whyc.dto.BattDto; import com.whyc.dto.InfoDto; import com.whyc.dto.PowerDto; import com.whyc.dto.Response; import com.whyc.factory.InfoFactory; import com.whyc.mapper.BattInfMapper; import com.whyc.mapper.PowerInfMapper; import com.whyc.mapper.StationInfMapper; @@ -33,6 +33,9 @@ @Autowired(required = false) private StationInfMapper sinfMapper; @Autowired(required = false) private BaojigroupService bjService; /*新建电池组(新的设备新的电池组) * @param binf @@ -118,6 +121,8 @@ UpdateWrapper wrapper2=new UpdateWrapper(); wrapper2.eq("power_id",powerId); pinfMapper.delete(wrapper); //删除所有包机组下的电源 bjService.delPowerInBaoji(powerId); //再检测如果机房下电源也全删除了,要将机房也删除 QueryWrapper wrapper3=new QueryWrapper(); wrapper3.eq("station_id",stationId); @@ -126,11 +131,124 @@ UpdateWrapper wrapper4=new UpdateWrapper(); wrapper4.eq("station_id",stationId); sinfMapper.delete(wrapper4); //删除所有包机组下的机房 bjService.delStationInBaoji(stationId); } } return new Response().set(1,true); } //修改电池组 //编辑机房,电源,电池组信息 @Transactional public Response updateInfo(InfoDto info) { //先修改机房信息 PowerInf pinf=InfoFactory.infoToPower(info); StationInf sinf=pinf.getSinf(); UpdateWrapper wrapper1=new UpdateWrapper(); if(sinf.getStationName()!=null){ wrapper1.set("station_name",sinf.getStationName()); String fullName=sinf.getProvice()+"_"+sinf.getCity()+"_"+sinf.getCountry()+"_"+sinf.getStationName(); wrapper1.set("full_name",fullName); } if(sinf.getStationType()!=null){ wrapper1.set("station_type",sinf.getStationType()); } if(sinf.getLongitude()!=null){ wrapper1.set("longitude",sinf.getLongitude()); } if(sinf.getLatitude()!=null){ 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){ wrapper2.set("company",pinf.getCompany()); } if(pinf.getPowerModel()!=null){ wrapper2.set("power_model",pinf.getPowerModel()); } if(pinf.getProtocol()!=null){ wrapper2.set("protocol",pinf.getProtocol()); } if(pinf.getPowerIp()!=null){ wrapper2.set("power_ip",pinf.getPowerIp()); } if(pinf.getPowerName()!=null){ //检测该机房下要修改的电源名是否存在 QueryWrapper queryWrapper=new QueryWrapper(); queryWrapper.eq("power_name",pinf.getPowerName()); queryWrapper.eq("station_id",pinf.getStationId()); queryWrapper.last("limit 1"); PowerInf juegep=pinfMapper.selectOne(queryWrapper); if(juegep!=null){ return new Response().set(1,false,"该机房下已存在"+pinf.getPowerName()+"的电源"); } wrapper2.set("power_name",pinf.getPowerName()); } wrapper2.eq("power_id",pinf.getPowerId()); pinfMapper.update((PowerInf) ActionUtil.objeNull,wrapper2); //最后修改设备信息 BattInf binf=InfoFactory.infoToBatt(info); UpdateWrapper wrapper3=new UpdateWrapper(); if(binf.getDevIp()!=null){ wrapper3.set("dev_ip",binf.getDevIp()); } if(binf.getDevName()!=null){ //检测该电源下修改的设备名是否存在 QueryWrapper queryWrapper1=new QueryWrapper(); queryWrapper1.eq("dev_name",binf.getDevName()); queryWrapper1.eq("power_id",pinf.getPowerId()); queryWrapper1.last("limit 1"); BattInf jueged=mapper.selectOne(queryWrapper1); if(jueged!=null){ return new Response().set(1,false,"该电源下已存在"+binf.getDevName()+"的设备"); } wrapper3.set("dev_name",binf.getDevName()); } 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(); if(binf.getBattgroupName()!=null){ //检测该机房下要修改的电源名是否粗在 QueryWrapper queryWrapper=new QueryWrapper(); queryWrapper.eq("battgroup_name",binf.getBattgroupName()); queryWrapper.eq("dev_id",binf.getDevId()); queryWrapper.last("limit 1"); BattInf juegeb=mapper.selectOne(queryWrapper); if(juegeb!=null){ return new Response().set(1,false,"该设备下已存在"+binf.getBattgroupName()+"的电池组"); } wrapper4.set("battgroup_name",binf.getBattgroupName()); } if(binf.getMonvolstd()!=null){ wrapper4.set("monvolstd",binf.getMonvolstd()); } if(binf.getMoncapstd()!=null){ wrapper4.set("moncapstd",binf.getMoncapstd()); } if(binf.getMonresstd()!=null){ wrapper4.set("monresstd",binf.getMonresstd()); } if(binf.getProduct()!=null){ wrapper4.set("product",binf.getProduct()); } if(binf.getMoncount()!=null){ wrapper4.set("moncount",binf.getMoncount()); } if(binf.getBattModel()!=null){ wrapper4.set("batt_model",binf.getBattModel()); } wrapper4.eq("battgroup_id",binf.getBattgroupId()); mapper.update((BattInf) ActionUtil.objeNull,wrapper4); return new Response().set(1,true); } /*//修改电池组 public Response updateBatt(BattInf binf) { UpdateWrapper wrapper1=new UpdateWrapper(); wrapper1.eq("dev_id",binf.getDevId()); @@ -174,7 +292,7 @@ } mapper.update((BattInf) ActionUtil.objeNull,wrapper); return new Response().set(1,true); } }*/ //查询机房,电源,电池组信息 public Response getInfo(BattDto dto) { User user= ActionUtil.getUser(); @@ -183,12 +301,6 @@ List<InfoDto> list=mapper.getInfo(dto); PageInfo pageInfo=new PageInfo(list); return new Response().setII(1,list!=null,pageInfo,"查询电池"); } //删除电源下的电池组 public void delBattInPower(Integer pid) { UpdateWrapper wrapper=new UpdateWrapper(); wrapper.eq("power_id",pid); mapper.delete(wrapper); } //获取电池品牌(下拉) @@ -218,4 +330,5 @@ List<String> list=mapper.getDevTypeByUid(uid); return new Response().setII(1,list.size()>0,list,"获取设备型号(下拉)"); } } src/main/java/com/whyc/service/PowerInfService.java
@@ -27,11 +27,6 @@ @Autowired(required = false) private StationInfMapper sinfMapper; @Autowired(required = false) private BaojigroupService bjService; @Autowired(required = false) private BattInfService binfService; /*添加电源 1.判断当前用户是否是包组用户 @@ -85,59 +80,6 @@ } addpinf.setPowerId(powerId); mapper.insert(addpinf); } //删除电源(删除包机组下记录,删除电源下的电池组设备) @Transactional public Response delPower(Integer pid) { //删除所有包机组下的电源 bjService.delPowerInBaoji(pid); //删除电源下的电池组 binfService.delBattInPower(pid); //删除电源 UpdateWrapper wrapper=new UpdateWrapper(); wrapper.eq("power_id",pid); mapper.delete(wrapper); return new Response().set(1,true); } //修改电源 public Response updatePower(PowerInf pinf) { UpdateWrapper wrapper=new UpdateWrapper(); wrapper.eq("power_id",pinf.getPowerId()); if(pinf.getPowerName()!=null){ //检测该机房下要修改的电源名是否粗在 QueryWrapper queryWrapper=new QueryWrapper(); queryWrapper.eq("power_name",pinf.getPowerName()); queryWrapper.eq("station_id",pinf.getStationId()); queryWrapper.last("limit 1"); PowerInf juegep=mapper.selectOne(queryWrapper); if(juegep!=null){ return new Response().set(1,false,"该机房下已存在"+pinf.getPowerName()+"的电源"); } wrapper.set("power_name",pinf.getPowerName()); } if(pinf.getCompany()!=null){ wrapper.set("company",pinf.getCompany()); } if(pinf.getPowerModel()!=null){ wrapper.set("power_model",pinf.getPowerModel()); } if(pinf.getProtocol()!=null){ wrapper.set("protocol",pinf.getProtocol()); } if(pinf.getPowerIp()!=null){ wrapper.set("power_ip",pinf.getPowerIp()); } mapper.update((PowerInf) ActionUtil.objeNull,wrapper); return new Response().set(1,true); } //查询电源 public Response getPower(PowerDto dto) { User user= ActionUtil.getUser(); dto.setUid(user.getId()); PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List<PowerInf> list=mapper.getPower(dto); PageInfo pageInfo=new PageInfo(list); return new Response().setII(1,list!=null,pageInfo,"查询电源"); } //获取电源品牌(下拉) public Response getCompanyByUid(Integer uid) {