From 3c9e375697f758e43beeaba61c78d4c303d1f2d3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 30 一月 2026 13:56:37 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 72 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 10 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 3b6c579..1afb5ca 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
@@ -145,6 +145,7 @@
//鏇存柊閽ュ寵鏌滀俊鎭�
jkCabinetGridMapper.update(new UpdateWrapper<JkCabinetGrid>().lambda()
.set(JkCabinetGrid::getKeyId,jkCabinetGrid.getKeyId())
+ .set(JkCabinetGrid::getActualLable,keysModel.getRfidLable())
.set(JkCabinetGrid::getEditor,loginUserInfo.getId())
.set(JkCabinetGrid::getEditDate,DateUtil.getCurrDateTime())
.set(JkCabinetGrid::getEditDate, DateUtil.getCurrDateTime())
@@ -259,6 +260,7 @@
//鏇存柊閽ュ寵鏌滀俊鎭�
jkCabinetGridMapper.update(new UpdateWrapper<JkCabinetGrid>().lambda()
.set(JkCabinetGrid::getKeyId,null)
+ .set(JkCabinetGrid::getActualLable,null)
.set(JkCabinetGrid::getEditDate, DateUtil.getCurrDateTime())
.eq(JkCabinetGrid::getId,model.getId()));
JkKeys keysModel = jkKeysMapper.selectById(model.getKeyId());
@@ -277,6 +279,7 @@
if(CollectionUtils.isNotEmpty(jkCabinetGridList)){
jkCabinetGridMapper.update(new UpdateWrapper<JkCabinetGrid>().lambda()
.set(JkCabinetGrid::getKeyId,null)
+ .set(JkCabinetGrid::getActualLable,null)
.set(JkCabinetGrid::getEditDate, DateUtil.getCurrDateTime())
.in(JkCabinetGrid::getId,jkCabinetGridList.stream().map(i->i.getId()).collect(Collectors.toList())));
List<Integer> keyIdList = jkCabinetGridList.stream().filter(i->Objects.nonNull(i.getKeyId())).map(i->i.getKeyId()).collect(Collectors.toList());
@@ -488,6 +491,14 @@
.set(JkKeys::getStatus,dto.getKeyStatus())
.eq(JkKeys::getId,jkKeys.getId())
);
+ if(Constants.equalsInteger(dto.getKeyStatus(),Constants.ONE)&&
+ (StringUtils.isBlank(jkCabinetGrid.getActualLable())||!StringUtils.equals(jkCabinetGrid.getActualLable(),jkKeys.getRfidLable()))){
+ //鏇存柊閽ュ寵瀹為檯缂栫爜
+ jkCabinetGridMapper.update(null,new UpdateWrapper<JkCabinetGrid>().lambda()
+ .set(JkCabinetGrid::getActualLable,jkKeys.getRfidLable())
+ .eq(JkCabinetGrid::getId,jkCabinetGrid.getId())
+ );
+ }
}
}
}
@@ -754,6 +765,26 @@
}
}
+ public static void main(String[] args) {
+ try {
+ JkCabinetGridServiceImpl temp = new JkCabinetGridServiceImpl();
+ FormDataApiClient apiClient = new FormDataApiClient("B4eyPmjtnvnameAKq5lbDLdRZi18VQ3p" ,"https://lcdp.ahyc.com.cn:30443/api/");
+ FormDataCreateParam param =new FormDataCreateParam();
+ WarningEvent warningEvent = new WarningEvent();
+ warningEvent.setTitle("璺ㄨ秺鐢熶骇绾�(娴嬭瘯锛�");
+ warningEvent.setContent("璺ㄨ秺鐢熶骇绾�-鑺滄箹鍖楀洿澧欒繃閬撲笢-鏋紙璺ㄨ秺锛�");
+ param.setData( temp.getJdyChildData(warningEvent,"gaoyf_b"));
+ param.setApp_id("6954aca3cdf8fb470ca1aabd");
+ param.setEntry_id("6954aca6ff1c406a1d7b9afa");
+ param.setIs_start_trigger(false);
+ param.setIs_start_trigger(true);
+ Map<String, Object> response = apiClient.singleDataCreate(param,apiClient.getDefaultVersion());
+ log.error(JSONObject.toJSONString(response));
+ }catch (Exception e){
+
+ }
+
+ }
/**
* 绠�閬撲簯娑堟伅鎺ㄩ�� 瀹氬埗
@@ -773,6 +804,7 @@
param.setEntry_id(entryId);
param.setIs_start_trigger(false);
param.setIs_start_trigger(true);
+ log.error("绠�閬撲簯鍙戦�侀�氱煡[getJDYData]璇锋眰鍏ュ弬====>" + JSONObject.toJSONString(param) );
Map<String, Object> response = apiClient.singleDataCreate(param,apiClient.getDefaultVersion());
/*
Map<String,Object> map = new HashMap<>();
@@ -793,7 +825,7 @@
.addHeader("Content-Type", "application/json")
.build();
Response response = client.newCall(request).execute();*/
- log.error("绠�閬撲簯鍙戦�侀�氱煡杩斿洖淇℃伅" + JSONObject.toJSONString(response));
+ log.error("绠�閬撲簯鍙戦�侀�氱煡[getJDYData]杩斿洖淇℃伅" + JSONObject.toJSONString(response));
}catch (Exception e){
log.error("绠�閬撲簯鍙戦�侀�氱煡杩斿洖淇℃伅寮傚父锛�" + e.getMessage());
}
@@ -1171,21 +1203,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