From 475b7d9a14d7ec6d2239fb77b8f039e7232c3d11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:08:56 +0800
Subject: [PATCH] 海康接口对接开发
---
server/openapi/src/main/java/com/doumee/api/ApiController.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 3 +++
server/openapi/src/main/java/com/doumee/api/ErpResourceController.java | 2 +-
server/.gitignore | 1 +
server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 1 +
7 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/.gitignore b/server/.gitignore
index 5003e5f..f0188b1 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -7,6 +7,7 @@
*.iws
*.iml
*.ipr
+*.xml
.mvn
mvnw
mvnw.cmd
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 18331da..7bfc9df 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -71,6 +71,9 @@
@ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
@ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
private String srcIndex;
+ @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ @ExcelColumn(name="鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+ private String srcParentIndex;
@ApiModelProperty(value = "闂ㄧ鍚嶇О")
@ExcelColumn(name="闂ㄧ鍚嶇О")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index 3d380a9..aeb6008 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -74,7 +74,7 @@
private Date cancelDate;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
- private String cANCElInfo;
+ private String cancelInfo;
@ApiModelProperty(value = "鎵�灞炲叕鍙哥紪鐮�")
@TableField(exist = false)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 8cc098b..ae82319 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -158,6 +158,7 @@
event.setSrcType(request.getSrcType());
event.setSrcName(request.getSrcName());
event.setSrcIndex(request.getSrcIndex());
+ event.setSrcParentIndex(request.getSrcParentIndex());
event.setSeq(request.getData().getSeq());
event.setTimeout(request.getTimeout());
event.setExtEventType(request.getData().getExtEventType());
diff --git a/server/openapi/src/main/java/com/doumee/web/ApiController.java b/server/openapi/src/main/java/com/doumee/api/ApiController.java
similarity index 96%
rename from server/openapi/src/main/java/com/doumee/web/ApiController.java
rename to server/openapi/src/main/java/com/doumee/api/ApiController.java
index 304d00f..47fb9f8 100644
--- a/server/openapi/src/main/java/com/doumee/web/ApiController.java
+++ b/server/openapi/src/main/java/com/doumee/api/ApiController.java
@@ -1,4 +1,4 @@
-package com.doumee.web;
+package com.doumee.api;
import com.doumee.config.Jwt.JwtTokenUtil;
import lombok.extern.slf4j.Slf4j;
diff --git a/server/openapi/src/main/java/com/doumee/web/ErpResourceController.java b/server/openapi/src/main/java/com/doumee/api/ErpResourceController.java
similarity index 98%
rename from server/openapi/src/main/java/com/doumee/web/ErpResourceController.java
rename to server/openapi/src/main/java/com/doumee/api/ErpResourceController.java
index 1258ff0..ea6c65a 100644
--- a/server/openapi/src/main/java/com/doumee/web/ErpResourceController.java
+++ b/server/openapi/src/main/java/com/doumee/api/ErpResourceController.java
@@ -1,4 +1,4 @@
-package com.doumee.web;
+package com.doumee.api;
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.haikang.model.param.respose.OrgListResponse;
diff --git a/server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index 24ac538..aeed82c 100644
--- a/server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -57,7 +57,7 @@
.apiInfo(this.getApiInfo()).groupName("銆愬崕鏅熻瀹㈢郴缁熶氦浜掓帴鍙penapi銆�")
.host(host)
.select()
- .apis( basePackage("com.doumee.api.web"))
+ .apis( basePackage("com.doumee.api"))
// 璁剧疆闇�瑕佽鎵弿鐨勭被锛岃繖閲岃缃负娣诲姞浜咢Api娉ㄨВ鐨勭被
// .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
.paths(PathSelectors.any())
--
Gitblit v1.9.3