jiangping
2023-12-21 475b7d9a14d7ec6d2239fb77b8f039e7232c3d11
海康接口对接开发
已修改5个文件
已重命名2个文件
13 ■■■■■ 文件已修改
server/.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/openapi/src/main/java/com/doumee/api/ApiController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/openapi/src/main/java/com/doumee/api/ErpResourceController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/.gitignore
@@ -7,6 +7,7 @@
*.iws
*.iml
*.ipr
*.xml
.mvn
mvnw
mvnw.cmd
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="门禁名称")
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)
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());
server/openapi/src/main/java/com/doumee/api/ApiController.java
ÎļþÃû´Ó server/openapi/src/main/java/com/doumee/web/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;
server/openapi/src/main/java/com/doumee/api/ErpResourceController.java
ÎļþÃû´Ó server/openapi/src/main/java/com/doumee/web/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;
server/openapi/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -57,7 +57,7 @@
                .apiInfo(this.getApiInfo()).groupName("【华晟访客系统交互接口openapi】")
                .host(host)
                .select()
                .apis( basePackage("com.doumee.api.web"))
                .apis( basePackage("com.doumee.api"))
                // è®¾ç½®éœ€è¦è¢«æ‰«æçš„类,这里设置为添加了@Api注解的类
//                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
                .paths(PathSelectors.any())