From 638fe30c57a2f7aecbad4e9bf1e8f5c6e80397a0 Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期一, 19 五月 2025 10:06:48 +0800 Subject: [PATCH] 编辑机房电源,电池组信息时判断机房名 --- src/main/java/com/whyc/service/BattInfService.java | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java index 364764b..638431a 100644 --- a/src/main/java/com/whyc/service/BattInfService.java +++ b/src/main/java/com/whyc/service/BattInfService.java @@ -170,17 +170,24 @@ 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(); - //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁瀛樺湪 - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.eq("full_name",fullName); - queryWrapper.last("limit 1"); - StationInf jueges=sinfMapper.selectOne(queryWrapper); - if(jueges!=null){ - return new Response().set(1,false,"宸插瓨鍦�"+fullName+"鐨勬満鎴�"); + //鍏堟煡鐪嬫満鎴垮悕鍜宻tationid鏄笉鏄尮閰嶇殑 + QueryWrapper wrapper2=new QueryWrapper(); + wrapper2.eq("station_id",sinf.getStationId()); + wrapper2.last("limit 1"); + StationInf s=sinfMapper.selectOne(wrapper2); + if(!s.getStationName().equalsIgnoreCase(sinf.getStationName())){ + wrapper1.set("station_name",sinf.getStationName()); + String fullName=sinf.getProvice()+"_"+sinf.getCity()+"_"+sinf.getCountry()+"_"+sinf.getStationName(); + //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁瀛樺湪 + QueryWrapper queryWrapper=new QueryWrapper(); + queryWrapper.eq("full_name",fullName); + queryWrapper.last("limit 1"); + StationInf jueges=sinfMapper.selectOne(queryWrapper); + if(jueges!=null){ + return new Response().set(1,false,"宸插瓨鍦�"+fullName+"鐨勬満鎴�"); + } + wrapper1.set("full_name",fullName); } - wrapper1.set("full_name",fullName); } if(sinf.getStationType()!=null){ wrapper1.set("station_type",sinf.getStationType()); -- Gitblit v1.9.1