From f58ef7411907e579c1ffcf3070b412b19eb0065e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Thu, 7 Jul 2022 08:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E9=9B=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DeseCabinetController.java     | 21 ++++++++++---------
 .../repository/DeseCabinetRepository.java     | 11 +++++-----
 .../device/service/impl/DenseCabinetImpl.java |  1 +
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
index a00e72c..e4efbee 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
@@ -29,7 +29,11 @@ public class DeseCabinetController {
     @ApiOperation("新增密集架")
     @AnonymousPostMapping("create")
     public ApiResponse<Object> create(@RequestBody DeseCabinetDto deseCabinetDto) {
-        verifyDate(deseCabinetDto);
+
+        if (!StringUtils.isEmpty(deseCabinetDto.getId())) {
+            throw new BaseException("id不为空");
+        }
+        verifyValues(deseCabinetDto);
         deseCabinetService.create(deseCabinetDto);
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
@@ -37,19 +41,15 @@ public class DeseCabinetController {
     @ApiOperation("新增密集架")
     @AnonymousPutMapping("update")
     public ApiResponse<Object> update(@RequestBody DeseCabinetDto deseCabinetDto) {
-        verifyDate(deseCabinetDto);
+        if (StringUtils.isEmpty(deseCabinetDto.getId())) {
+            throw new BaseException("id不能为空");
+        }
+        verifyValues(deseCabinetDto);
         deseCabinetService.update(deseCabinetDto);
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
 
-    /**
-     * 验证数据
-     * @param deseCabinetDto
-     */
-    private void verifyDate(DeseCabinetDto deseCabinetDto) {
-        if (!StringUtils.isEmpty(deseCabinetDto.getId())) {
-            throw new BaseException("id不为空");
-        }
+    private void verifyValues(@RequestBody DeseCabinetDto deseCabinetDto) {
         if (deseCabinetDto.getAreaNo() != null
                 && deseCabinetDto.getRowNo() != null
                 && deseCabinetDto.getSumColumnNo() != null
@@ -64,4 +64,5 @@ public class DeseCabinetController {
         }
     }
 
+
 }
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java b/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java
index 788e967..42b736b 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/repository/DeseCabinetRepository.java
@@ -12,11 +12,12 @@ public interface DeseCabinetRepository extends JpaRepository<DeseCabinet, String
 
     /**
      * 区号，ip 端口号查询
-     * @param areaNo
-     * @param ip
-     * @param port
-     * @return
+     *
+     * @param areaNo 区号
+     * @param ip ip
+     * @param port 端口号
+     * @return 返回列表
      */
-    @Query(value = "SELECT * FROM dese_cabinet a JOIN device_info b ON a.device_info_id=b.id WHERE a.area_No=1? AND b.device_ip=2? AND b.device_port=3?", nativeQuery = true)
+    @Query(value = "SELECT * FROM dese_cabinet a JOIN device_info b ON a.device_info_id=b.id WHERE a.area_No=?1 AND b.device_ip=?2 AND b.device_port=?3", nativeQuery = true)
     List<DeseCabinet> findIpAndPortAndAreaNo(Integer areaNo, String ip, Integer port);
 }
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java
index 16d8148..c4ce393 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java
@@ -97,6 +97,7 @@ public class DenseCabinetImpl implements DeseCabinetService {
         if (ObjectUtils.isEmpty(deseCabinet2)) {
             throw new BaseException("数据不存在");
         }
+
         deseCabinet2.getDeviceInfo().setDeviceName(deseCabinetDto.getDeviceInfo().getDeviceName());
         deseCabinet2.getDeviceInfo().setDeviceIp(deseCabinetDto.getDeviceInfo().getDeviceIp());
         deseCabinet2.getDeviceInfo().setDevicePort(deseCabinetDto.getDeviceInfo().getDevicePort());