From 2132ba97b4ce7d2dd0d90a510090122a5cc52ca6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:13 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java | 4 ++--
server/start_auto.sh | 15 +++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.java | 10 ----------
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.java | 15 +++++++++++++++
7 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java
index a5442d6..f88a05c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarAuthorRequest.java
+++ b/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锛�,濡傛灉涓簄ull锛屽垯娓呯┖杞﹁締鎺堟潈淇℃伅" )
- private List<Integer> partIdList;
+ private List<Integer> parkIdList;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java
index 95297ee..c641cd1 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/UserUpdateRequest.java
+++ b/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)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.java
index 4880c10..723c017 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkInResultRequest.java
+++ b/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 ;// 鏀捐缁撴灉鏁版嵁 鏄�
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.java
index 2ebd21d..5bf59bc 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkParamRequest.java
+++ b/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 鏀捐鏂瑰紡
-
- }
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkRlsRequest.java
new file mode 100644
index 0000000..3ba0ca1
--- /dev/null
+++ b/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 鏀捐鏂瑰紡
+
+}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 5a7f8e4..5d18f99 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/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) {
diff --git a/server/start_auto.sh b/server/start_auto.sh
new file mode 100644
index 0000000..873570d
--- /dev/null
+++ b/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 &
+
\ No newline at end of file
--
Gitblit v1.9.3