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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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 859b669..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
@@ -718,7 +718,7 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ddUserIdList)){
for (String ddUserId:ddUserIdList) {
this.getJDYData(warningEvent,ddUserId,
- systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.ENTRY_ID).getCode()
+ systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_ENTRY_ID).getCode()
);
}
}
@@ -765,11 +765,11 @@
public void getJDYData(WarningEvent warningEvent,String ddUserId , String entryId) {
try {
log.error("绠�閬撲簯鍙戦�侀�氱煡杩斿洖淇℃伅寮�濮�" );
- FormDataApiClient apiClient = new FormDataApiClient(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.API_KEY).getCode()
+ FormDataApiClient apiClient = new FormDataApiClient(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_KEY).getCode()
,systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_API_HOST).getCode());
FormDataCreateParam param =new FormDataCreateParam();
param.setData(this.getJdyChildData(warningEvent,ddUserId));
- param.setApp_id(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.APPID).getCode());
+ param.setApp_id(systemDictDataBiz.queryByCode(Constants.JDY_CONFIG, Constants.JDY_APPID).getCode());
param.setEntry_id(entryId);
param.setIs_start_trigger(false);
param.setIs_start_trigger(true);
@@ -1116,7 +1116,7 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ddUserIdList)){
for (String ddUserId:ddUserIdList) {
this.getJDYData(warningEvent,ddUserId,
- systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.ENTRY_ID).getCode()
+ systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.JDY_ENTRY_ID).getCode()
);
}
@@ -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())
+// );
+// }
+// }
+// }
+
+
+
+
}
--
Gitblit v1.9.3