From 14773a2179f505e6707aab2b5ed41dbff12241ca Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 22 一月 2026 14:06:52 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 48 ++++++++++++++++++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java | 21 ++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java | 8 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetGridService.java | 6 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java | 1
5 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
index cc05592..a9d0f91 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/cabinet/CabinetController.java
@@ -219,4 +219,25 @@
}
+
+ @LoginNoRequired
+ @ApiOperation("閽ュ寵鏌滃績璺虫帴鍙�")
+ @GetMapping("/heartbeat")
+ public ApiResponse heartbeat(@RequestParam String code) {
+ jkCabinetService.updHeartbeat(code);
+ return ApiResponse.success("閾炬帴鎴愬姛");
+ }
+
+
+// @LoginNoRequired
+// @ApiOperation("鍚屾鏌滄牸瀹為檯閽ュ寵鏁版嵁")
+// @PostMapping("/syncGridData")
+// public ApiResponse syncGridData(@RequestBody SyncCabinetDTO dto) {
+// jkCabinetGridService.syncGridData(dto);
+// this.saveInterfaceLog(JSONObject.toJSONString(dto), null,"syncGridData","鍚屾鏌滄牸瀹為檯閽ュ寵鏁版嵁");
+// return ApiResponse.success("鎿嶄綔鎴愬姛");
+// }
+
+
+
}
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 294a59d..e2a91f0 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,6 +148,10 @@
-
+// /**
+// * 鍚屾鏌滄牸瀹為檯閽ュ寵缂栧彿
+// * @param dto
+// */
+// void syncGridData(SyncCabinetDTO dto);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java
index b66caf3..7e57a2d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/JkCabinetService.java
@@ -132,4 +132,5 @@
void updateRunStatusById(Integer id);
+ void updHeartbeat(String code);
}
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 939f95e..2f75c23 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,5 +1144,53 @@
+// @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())
+// );
+// }
+// }
+// }
+
+
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
index bf05a2f..98d9ae1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetServiceImpl.java
@@ -671,5 +671,11 @@
.eq(JkCabinet::getId,id));
}
-
+ @Override
+ public void updHeartbeat(String code){
+ jkCabinetMapper.update(null,new UpdateWrapper<JkCabinet>()
+ .lambda()
+ .set(JkCabinet::getHaertTime, DateUtil.getCurrDateTime())
+ .eq(JkCabinet::getCode,code));
+ }
}
--
Gitblit v1.9.3