From 9fdd262881ef10d79e75d8e91d36fef88f774073 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 31 十月 2025 11:26:29 +0800
Subject: [PATCH] 钥匙柜信息处理

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
index 2082dc5..20134ae 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkKeysServiceImpl.java
@@ -49,7 +49,7 @@
         || Objects.isNull(jkKeys.getCarId())
         || Objects.isNull(jkKeys.getRoleType())
         || StringUtils.isBlank(jkKeys.getCode())
-        || StringUtils.isBlank(jkKeys.getRfidLable())
+        || StringUtils.isBlank(jkKeys.getRfidCode())
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
@@ -65,10 +65,15 @@
         if(Objects.nonNull(carsKeys)){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠杞﹁締宸茶閽ュ寵["+carsKeys.getCode()+"]缁戝畾浣跨敤锛�");
         }
-        JkKeys rfidKeys = jkKeysMapper.selectOne(new QueryWrapper<JkKeys>().lambda().eq(JkKeys::getRfidLable,jkKeys.getRfidLable()).eq(JkKeys::getIsdeleted,Constants.ZERO).last("limit 1"));
+        JkKeys rfidKeys = jkKeysMapper.selectOne(new QueryWrapper<JkKeys>().lambda().eq(JkKeys::getRfidCode,jkKeys.getRfidCode()).eq(JkKeys::getIsdeleted,Constants.ZERO).last("limit 1"));
         if(Objects.nonNull(rfidKeys)){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠RFID鏍囩宸茶閽ュ寵["+rfidKeys.getCode()+"]浣跨敤锛�");
         }
+        String lable = Constants.getRFIDNumber(jkKeys.getRfidCode());
+        if(StringUtils.isEmpty(lable)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"RFID鏍囩璁剧疆澶辫触銆愭牸寮忎笉姝g‘銆�");
+        }
+        jkKeys.setRfidLable(lable);
         LoginUserInfo loginUserInfo = jkKeys.getLoginUserInfo();
         jkKeys.setCreateDate(new Date());
         jkKeys.setEditDate(jkKeys.getCreateDate());
@@ -114,10 +119,15 @@
                 || Objects.isNull(jkKeys.getCarId())
                 || Objects.isNull(jkKeys.getRoleType())
                 || StringUtils.isBlank(jkKeys.getCode())
-                || StringUtils.isBlank(jkKeys.getRfidLable())
+                || StringUtils.isBlank(jkKeys.getRfidCode())
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
+        String lable = Constants.getRFIDNumber(jkKeys.getRfidCode());
+        if(StringUtils.isEmpty(lable)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"RFID鏍囩璁剧疆澶辫触銆愭牸寮忎笉姝g‘銆�");
+        }
+        jkKeys.setRfidLable(lable);
         //鏌ヨ缂栧彿鏄惁閲嶅
         if(jkKeysMapper.selectCount(new QueryWrapper<JkKeys>().lambda().ne(JkKeys::getId,jkKeys.getId()).eq(JkKeys::getCode,jkKeys.getCode()).eq(JkKeys::getIsdeleted,Constants.ZERO))>Constants.ZERO){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閽ュ寵缂栧彿宸插瓨鍦紒");
@@ -134,6 +144,7 @@
         if(Objects.nonNull(rfidKeys)){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠RFID鏍囩宸茶閽ュ寵["+rfidKeys.getCode()+"]浣跨敤锛�");
         }
+
         LoginUserInfo loginUserInfo = jkKeys.getLoginUserInfo();
         jkKeys.setEditDate(new Date());
         jkKeys.setEditor(loginUserInfo.getId());

--
Gitblit v1.9.3