From fad0704afaf4ed07963d267142cc6f625a09909d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 六月 2026 18:32:05 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 88528a7..993bdae 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
@@ -4,7 +4,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
-import com.doumee.core.dingTalk.DingTalkStream;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.jiandaoyun.api.arch.DeptApiClient;
@@ -765,6 +764,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){
+
+ }
+
+ }
/**
* 绠�閬撲簯娑堟伅鎺ㄩ�� 瀹氬埗
@@ -784,6 +803,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<>();
@@ -804,7 +824,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());
}
@@ -1168,6 +1188,7 @@
.selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
.selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
.selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
+ .selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
.leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
.leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
.eq(JkCabinet::getCode,dto.getCode())
@@ -1198,6 +1219,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
+ cabinetLog.setGridId(jkCabinetGrid.getId());
+ cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
+ cabinetLog.setCarId(jkCabinetGrid.getCarId());
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ cabinetLog.setType(Constants.ONE);
+ cabinetLog.setStatus(Constants.ZERO);
+ cabinetLog.setAuthType(3);
+ cabinetLog.setKeyStatus(Constants.TWO);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵涓嶅湪浣�");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}else{
if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
@@ -1206,6 +1242,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
+ cabinetLog.setGridId(jkCabinetGrid.getId());
+ cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
+ cabinetLog.setCarId(jkCabinetGrid.getCarId());
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ cabinetLog.setType(Constants.ONE);
+ cabinetLog.setStatus(Constants.ZERO);
+ cabinetLog.setAuthType(3);
+ cabinetLog.setKeyStatus(Constants.ONE);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵鍦ㄤ綅");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}
// if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
--
Gitblit v1.9.3