From 1fbeb593d0e1c43fc013eb28f77676929029cc9f Mon Sep 17 00:00:00 2001 From: 25604 Date: Tue, 30 Sep 2025 13:18:34 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/DeviceInstallController.java | 4 ++-- .../java/com/mh/user/mapper/BuildingMapper.java | 3 +++ .../com/mh/user/mapper/DeviceInstallMapper.java | 4 ++-- .../com/mh/user/service/BuildingService.java | 2 ++ .../mh/user/service/DeviceInstallService.java | 2 +- .../user/service/impl/BuildingServiceImpl.java | 5 +++++ .../service/impl/DeviceInstallServiceImpl.java | 13 +++++++++---- .../src/main/resources/application-prod.yml | 16 ++++++++-------- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java b/user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java index 8a636fb..cf4f245 100644 --- a/user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java +++ b/user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java @@ -280,7 +280,7 @@ public class DeviceInstallController { uploadEntity.setBrand(deviceList.get(6));//品牌 uploadEntity.setModel(deviceList.get(7));//型号 uploadEntity.setInstaller(deviceList.get(8));//安装人员 - uploadEntity.setBuildingId(deviceList.get(9));//所属楼栋 + uploadEntity.setBuildingName(deviceList.get(9));//所属楼栋 if (deviceList.get(10).equals("是")){ uploadEntity.setIsUse(1); }else{ @@ -289,7 +289,7 @@ public class DeviceInstallController { deviceList.clear(); uploadEntityList.add(uploadEntity); - is=deviceInstallService.selectDeviceCount(uploadEntity.getDeviceAddr(),uploadEntity.getDeviceType()); + is=deviceInstallService.selectDeviceCount(uploadEntity.getBuildingName(),uploadEntity.getDeviceAddr(),uploadEntity.getDeviceType()); if (is>0){ httpResult.setMsg("通讯编号有重复！"); httpResult.setCode(500); diff --git a/user-service/src/main/java/com/mh/user/mapper/BuildingMapper.java b/user-service/src/main/java/com/mh/user/mapper/BuildingMapper.java index 5332cde..6a0da04 100644 --- a/user-service/src/main/java/com/mh/user/mapper/BuildingMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/BuildingMapper.java @@ -146,4 +146,7 @@ public interface BuildingMapper { @Select("select sum(check_in_count) from building where area_id = #{areaId} ") int queryCheckInCount(@Param("areaId") String areaId); + + @Select("select top 1 id from building where building_name = #{buildingName} ") + Integer selectBuildingIdByName(String buildingName); } diff --git a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java index 59630fd..b117611 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java @@ -166,8 +166,8 @@ public interface DeviceInstallMapper extends BaseMapper { DeviceInstallEntity selectDevice(@Param("deviceAddr") String deviceAddr,@Param("deviceType") String deviceType,@Param("buildingId") String buildingId); //查询通讯编号是否存在 - @Select("select count(*) from device_install where device_addr=#{deviceAddr} and device_type=#{deviceType} ") - int selectDeviceCount(@Param("deviceAddr") String deviceAddr,@Param("deviceType") String deviceType); + @Select("select count(*) from device_install where device_addr=#{deviceAddr} and device_type=#{deviceType} and building_name = #{buildingName} ") + int selectDeviceCount(@Param("buildingName") String buildingName, @Param("deviceAddr") String deviceAddr,@Param("deviceType") String deviceType); /** * 设备管理模块： * 根据通讯地址删除设备信息 diff --git a/user-service/src/main/java/com/mh/user/service/BuildingService.java b/user-service/src/main/java/com/mh/user/service/BuildingService.java index a51b740..dab7f22 100644 --- a/user-service/src/main/java/com/mh/user/service/BuildingService.java +++ b/user-service/src/main/java/com/mh/user/service/BuildingService.java @@ -81,4 +81,6 @@ public interface BuildingService { List queryBuildingIdListByAreaId(String areaId); int queryCheckInCount(String areaId); + + Integer selectBuildingIdByName(String buildingName); } diff --git a/user-service/src/main/java/com/mh/user/service/DeviceInstallService.java b/user-service/src/main/java/com/mh/user/service/DeviceInstallService.java index 8882281..247e8cc 100644 --- a/user-service/src/main/java/com/mh/user/service/DeviceInstallService.java +++ b/user-service/src/main/java/com/mh/user/service/DeviceInstallService.java @@ -93,7 +93,7 @@ public interface DeviceInstallService { DeviceInstallEntity selectDevice(String deviceAddr,String deviceType,String buildingId); //查询通讯编号是否存在 - int selectDeviceCount(String deviceAddr,String deviceType); + int selectDeviceCount(String buildingName, String deviceAddr,String deviceType); /** * 设备管理模块 * 根据通讯地址删除设备信息 diff --git a/user-service/src/main/java/com/mh/user/service/impl/BuildingServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/BuildingServiceImpl.java index 199be84..d33b3a7 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/BuildingServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/BuildingServiceImpl.java @@ -214,4 +214,9 @@ public class BuildingServiceImpl implements BuildingService { public int queryCheckInCount(String areaId) { return buildingMapper.queryCheckInCount(areaId); } + + @Override + public Integer selectBuildingIdByName(String buildingName) { + return buildingMapper.selectBuildingIdByName(buildingName); + } } diff --git a/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java index fcd2923..8bf258d 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DeviceInstallServiceImpl.java @@ -1,5 +1,6 @@ package com.mh.user.service.impl; +import com.github.pagehelper.util.StringUtil; import com.mh.user.entity.DeviceCodeParamEntity; import com.mh.user.entity.DeviceInstallEntity; import com.mh.user.entity.DeviceInstallTempEntity; @@ -40,8 +41,12 @@ public class DeviceInstallServiceImpl implements DeviceInstallService { @Override public int saveDevice(DeviceInstallEntity deviceInstallEntity) { - String buildingName = buildingService.selectBuildingNameById(deviceInstallEntity.getBuildingId()); - deviceInstallEntity.setBuildingName(buildingName); + if (StringUtil.isEmpty(deviceInstallEntity.getBuildingId()) && !StringUtil.isEmpty(deviceInstallEntity.getBuildingName())) { + Integer buildingId = buildingService.selectBuildingIdByName(deviceInstallEntity.getBuildingName()); + deviceInstallEntity.setBuildingId(String.valueOf(buildingId)); + } else if (StringUtil.isEmpty(deviceInstallEntity.getBuildingName()) && !StringUtil.isEmpty(deviceInstallEntity.getBuildingId())) { + deviceInstallEntity.setBuildingName(buildingService.selectBuildingNameById(deviceInstallEntity.getBuildingId())); + } if ("电表".equalsIgnoreCase(deviceInstallEntity.getDeviceType())) { // 000005500773 deviceInstallEntity.setDeviceAddr(ExchangeStringUtil.addZeroForNum(deviceInstallEntity.getDeviceAddr(), 12)); @@ -273,8 +278,8 @@ public class DeviceInstallServiceImpl implements DeviceInstallService { } @Override - public int selectDeviceCount(String deviceAddr, String deviceType) { - return deviceInstallMapper.selectDeviceCount(deviceAddr, deviceType); + public int selectDeviceCount(String buildingName, String deviceAddr, String deviceType) { + return deviceInstallMapper.selectDeviceCount(buildingName, deviceAddr, deviceType); } @Override diff --git a/user-service/src/main/resources/application-prod.yml b/user-service/src/main/resources/application-prod.yml index 47a887c..5b24c93 100644 --- a/user-service/src/main/resources/application-prod.yml +++ b/user-service/src/main/resources/application-prod.yml @@ -19,10 +19,10 @@ spring: # username: test # password: minghan123456@ # #华厦云服务器 -# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=CHWS;allowMultiQueries=true -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# username: chws -# password: minghan123456@ + url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=CHWS;allowMultiQueries=true + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + username: chws + password: minghan123456@ #创新服务器 # url: jdbc:sqlserver://106.55.173.225:57238;DatabaseName=chws_chx;allowMultiQueries=true # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver @@ -59,10 +59,10 @@ spring: # password: chws_gw@803 # 华软江门 - url: jdbc:sqlserver://127.0.0.1:57238;DatabaseName=chws_jm;allowMultiQueries=true - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - username: chws_jm - password: Mhtech@803 +# url: jdbc:sqlserver://127.0.0.1:57238;DatabaseName=chws_jm;allowMultiQueries=true +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# username: chws_jm +# password: Mhtech@803 filters: stat,wall,config max-active: 100