From 89e890d195b6728c81afae6f64857f1bd08bbde5 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 22 一月 2026 14:11:41 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 88 ++++++++++++++--------------
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncCabinetDTO.java | 22 +++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetGrid.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetGridService.java | 10 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncGridDTO.java | 24 ++++++++
5 files changed, 98 insertions(+), 49 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncCabinetDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncCabinetDTO.java
new file mode 100644
index 0000000..fb40151
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncCabinetDTO.java
@@ -0,0 +1,22 @@
+package com.doumee.dao.business.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2026/1/22 14:09
+ */
+@Data
+public class SyncCabinetDTO {
+
+ @ApiModelProperty(value = "閽ュ寵鏌滅紪鍙�")
+ private String code;
+
+ @ApiModelProperty(value = "鏌滄牸淇℃伅")
+ private List<SyncGridDTO> gridDTOList;
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncGridDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncGridDTO.java
new file mode 100644
index 0000000..aa45d13
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/dto/SyncGridDTO.java
@@ -0,0 +1,24 @@
+package com.doumee.dao.business.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2026/1/22 14:08
+ */
+@Data
+public class SyncGridDTO {
+
+ @ApiModelProperty(value = "鏉垮彿")
+ private String boardCode;
+
+ @ApiModelProperty(value = "閫氶亾鍙�")
+ private String channelCode;
+
+ @ApiModelProperty(value = "瀹為檯閽ュ寵缂栫爜")
+ private String actualLable;
+}
+
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetGrid.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetGrid.java
index 84cb250..7010db3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetGrid.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCabinetGrid.java
@@ -110,4 +110,7 @@
@TableField(exist = false)
private Integer keyStatus;
+ @ApiModelProperty(value = "瀹為檯閽ュ寵缂栫爜锛堝锛�7B7A092F 锛�")
+ @ExcelColumn(name="瀹為檯閽ュ寵缂栫爜锛堝锛�7B7A092F 锛�")
+ private String actualLable;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetGridService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetGridService.java
index e2a91f0..0f61ba2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetGridService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetGridService.java
@@ -148,10 +148,10 @@
-// /**
-// * 鍚屾鏌滄牸瀹為檯閽ュ寵缂栧彿
-// * @param dto
-// */
-// void syncGridData(SyncCabinetDTO dto);
+ /**
+ * 鍚屾鏌滄牸瀹為檯閽ュ寵缂栧彿
+ * @param dto
+ */
+ void syncGridData(SyncCabinetDTO dto);
}
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 2f75c23..3b6c579 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
@@ -1144,50 +1144,50 @@
-// @Override
-// public void syncGridData(SyncCabinetDTO dto){
-// if(Objects.isNull(dto)
-// ||StringUtils.isBlank(dto.getCode())
-// || CollectionUtils.isEmpty(dto.getGridDTOList())){
-// return;
-// }
-// List<JkCabinetGrid> jkCabinetGridList =
-// jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class, new MPJLambdaWrapper<JkCabinetGrid>()
-// .selectAll(JkCabinetGrid.class)
-// .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
-// .selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
-// .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
-// .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
-// .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
-// .eq(JkCabinet::getCode,dto.getCode())
-// .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
-// .isNotNull(JkCabinetGrid::getBoardCode)
-// .isNotNull(JkCabinetGrid::getChannelCode)
-// .orderByAsc(JkCabinetGrid::getCode)
-// );
-// if(CollectionUtils.isEmpty(jkCabinetGridList)){
-// return;
-// }
-// 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())
-// && 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())
-// );
-// }
-// }
-// }
+ @Override
+ public void syncGridData(SyncCabinetDTO dto){
+ if(Objects.isNull(dto)
+ ||StringUtils.isBlank(dto.getCode())
+ || CollectionUtils.isEmpty(dto.getGridDTOList())){
+ return;
+ }
+ List<JkCabinetGrid> jkCabinetGridList =
+ jkCabinetGridMapper.selectJoinList(JkCabinetGrid.class, new MPJLambdaWrapper<JkCabinetGrid>()
+ .selectAll(JkCabinetGrid.class)
+ .selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
+ .selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
+ .selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
+ .leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
+ .leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
+ .eq(JkCabinet::getCode,dto.getCode())
+ .eq(JkCabinetGrid::getIsdeleted,Constants.ZERO)
+ .isNotNull(JkCabinetGrid::getBoardCode)
+ .isNotNull(JkCabinetGrid::getChannelCode)
+ .orderByAsc(JkCabinetGrid::getCode)
+ );
+ if(CollectionUtils.isEmpty(jkCabinetGridList)){
+ return;
+ }
+ 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())
+ && 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())
+ );
+ }
+ }
+ }
--
Gitblit v1.9.3