From 926aac10d3306a78aaf19ced841633edb0e4a2b5 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 23 一月 2026 16:16:57 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index d410fc4..88528a7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -1182,21 +1182,41 @@
List<SyncGridDTO> gridDTOList = dto.getGridDTOList();
for (JkCabinetGrid jkCabinetGrid:jkCabinetGridList) {
List<SyncGridDTO> gridSyncList = gridDTOList.stream().filter(i->StringUtils.isNotBlank(i.getBoardCode())&&
- StringUtils.isNotBlank(i.getChannelCode())&&StringUtils.isNotBlank(i.getActualLable())&&i.getBoardCode().equals(jkCabinetGrid.getBoardCode())
+ StringUtils.isNotBlank(i.getChannelCode())&&i.getBoardCode().equals(jkCabinetGrid.getBoardCode())
&& i.getChannelCode().equals(jkCabinetGrid.getChannelCode())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(gridSyncList)){
continue;
}
SyncGridDTO syncGridDTO = gridSyncList.get(Constants.ZERO);
- if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
- || (!jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
- && !jkCabinetGrid.getActualLable().equals(syncGridDTO.getActualLable()))){
- //鏇存柊鏁版嵁 鏍囪瀵瑰簲code
- jkCabinetGridMapper.update(null,new UpdateWrapper<JkCabinetGrid>().lambda()
- .set(JkCabinetGrid::getActualLable,syncGridDTO.getActualLable())
- .eq(JkCabinetGrid::getId,jkCabinetGrid.getId())
- );
+ //涓虹┖鐨勬儏鍐� 鎴� 閽ュ寵涓庢煖鏍奸挜鍖欎笉涓�鑷� 鏍囪閽ュ寵涓嶅湪浣�
+ if(StringUtils.isBlank(syncGridDTO.getActualLable())
+ || !jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
+ ){
+ if(Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
+ jkKeysMapper.update(null,new UpdateWrapper<JkKeys>().lambda()
+ .set(JkKeys::getStatus,Constants.TWO)
+ .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
+ );
+ log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ }
+ }else{
+ if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
+ jkKeysMapper.update(null,new UpdateWrapper<JkKeys>().lambda()
+ .set(JkKeys::getStatus,Constants.ONE)
+ .eq(JkKeys::getId,jkCabinetGrid.getKeyId())
+ );
+ log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ }
}
+// if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
+// || (!jkCabinetGrid.getKeyCode().equals(syncGridDTO.getActualLable())
+// && !jkCabinetGrid.getActualLable().equals(syncGridDTO.getActualLable()))){
+// //鏇存柊鏁版嵁 鏍囪瀵瑰簲code
+// jkCabinetGridMapper.update(null,new UpdateWrapper<JkCabinetGrid>().lambda()
+// .set(JkCabinetGrid::getActualLable,syncGridDTO.getActualLable())
+// .eq(JkCabinetGrid::getId,jkCabinetGrid.getId())
+// );
+// }
}
}
--
Gitblit v1.9.3