jiangping
2024-01-05 2132ba97b4ce7d2dd0d90a510090122a5cc52ca6
海康接口对接开发
已添加2个文件
已修改5个文件
50 ■■■■ 文件已修改
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/start_auto.sh 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java
@@ -23,6 +23,6 @@
    @ApiModelProperty(value = "授权有效期(截止时间),为空时默认长期有效,如2023-11-24 11:39:23"  )
    private Date validEndTime;
    @ApiModelProperty(value = "停车场组唯一标识集合(访客端ID),如果为null,则清空车辆授权信息"  )
    private List<Integer> partIdList;
    private List<Integer> parkIdList;
}
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java
@@ -21,8 +21,8 @@
    private String name;
    @ApiModelProperty(value = "证件号"  ,required = true)
    private String idNo;
    @ApiModelProperty(value = "固定车辆,只能绑定一辆车" )
    private String carNo;
//    @ApiModelProperty(value = "固定车辆,只能绑定一辆车" )
//    private String carNo;
    @ApiModelProperty(value = "证件类型 0身份证 1港澳通行证 2护照 ,默认为0"  ,required = true)
    private int idType;
    @ApiModelProperty(value = "访客性别 1-男 2-女"  ,required = true)
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.java
@@ -5,5 +5,5 @@
@Data
public class EventParkInResultRequest {
        private EventParkParamRequest.EventParkRlsRequest rlsResult    ;//    æ”¾è¡Œç»“果数据    æ˜¯
        private  EventParkRlsRequest rlsResult    ;//    æ”¾è¡Œç»“果数据    æ˜¯
}
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.java
@@ -11,14 +11,4 @@
    private String   sendTime;//    P    String    äº‹ä»¶ä»ŽæŽ¥æ”¶è€…(程序处理后)发出的时间    æ˜¯    32    äº‹ä»¶å‘送时间
    private String    ability;//    P    String    äº‹ä»¶ç±»åˆ«    æ˜¯    64    æ ‡è¯†åœè½¦åœºäº‹ä»¶
    private List<EventParkInfoRequest> events;//    P    Events[]    äº‹ä»¶ä¿¡æ¯    æ˜¯    ä¸é™
    @Data
    public static class EventParkRlsRequest {
        private Integer   releaseAuth    ;//    Number    æ”¾è¡Œæƒé™    æ˜¯    64    å‚见附录A.65 æ”¾è¡Œæƒé™
        private Integer releaseReason    ;//    Number    æ”¾è¡ŒåŽŸå›     æ˜¯    64    å‚见参见附录A.67 æ”¾è¡ŒåŽŸå› 
        private Integer releaseResult    ;//    Number    æ”¾è¡Œç»“æžœ    æ˜¯    64    å‚见附录A.66 æ”¾è¡Œç»“æžœ
        private Integer releaseResultEx        ;//Number    æ–°ä½“系放行结果    æ˜¯    64    å‚见附录A.68 æ–°ä½“系放行结果
        private Integer releaseWay    ;//    Number    æ”¾è¡Œæ–¹å¼    æ˜¯    64    å‚见附录A.69 æ”¾è¡Œæ–¹å¼
    }
}
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.doumee.core.haikang.model.param.request.event.parks;
import lombok.Data;
import java.util.List;
@Data
public class EventParkRlsRequest {
        private Integer   releaseAuth    ;//    Number    æ”¾è¡Œæƒé™    æ˜¯    64    å‚见附录A.65 æ”¾è¡Œæƒé™
        private Integer releaseReason    ;//    Number    æ”¾è¡ŒåŽŸå›     æ˜¯    64    å‚见参见附录A.67 æ”¾è¡ŒåŽŸå› 
        private Integer releaseResult    ;//    Number    æ”¾è¡Œç»“æžœ    æ˜¯    64    å‚见附录A.66 æ”¾è¡Œç»“æžœ
        private Integer releaseResultEx        ;//Number    æ–°ä½“系放行结果    æ˜¯    64    å‚见附录A.68 æ–°ä½“系放行结果
        private Integer releaseWay    ;//    Number    æ”¾è¡Œæ–¹å¼    æ˜¯    64    å‚见附录A.69 æ”¾è¡Œæ–¹å¼
}
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -988,7 +988,7 @@
                .set(ParkBook::getHkStatus,Constants.ZERO)
        );
        //查询车库信息
        List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getPartIdList()));
        List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList()));
        if(CollectionUtils.isNotEmpty(parksList)){
            List<ParkBook> parkBookList = new ArrayList<>();
            for (Parks parks:parksList) {
server/start_auto.sh
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
#!/bin/bash
# è¡¨ç¤ºå»¶è¿Ÿ30秒启动
sleep 30
#停止后台接口进程
port=10018
pid=$(netstat -nlp | grep :$port | awk '{print $7}' | awk -F"/" '{ print $1 }');
if [  -n  "$pid"  ];  then
  echo $port ï¼š $pid
   kill -9 $pid
fi
#使用java的绝对路径的命令
nohup java -Xms512m -Xmx512m -Xmn512m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=10018 -jar /usr/local/jars/dmvisit/openapi.jar >/usr/local/jars/dmvisit/web.log 2>/usr/local/jars/dmvisit/err.log &