From 03e0d5e2263c037401acdd225c03edb739b1fe31 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 26 三月 2025 13:50:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 8 +++++---
admin/src/views/platform/index.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 1 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 23 ++++++++++++++++++++---
4 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/platform/index.vue b/admin/src/views/platform/index.vue
index ba7ef07..2e55a8a 100644
--- a/admin/src/views/platform/index.vue
+++ b/admin/src/views/platform/index.vue
@@ -420,7 +420,7 @@
@import "@/assets/style/variables.scss";
.platform_list {
- width: 100%;
+ width: calc(100% - 20px);
.item {
/* padding: 16px 24px; */
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index faaa2e5..ab3c0f5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -1,9 +1,13 @@
package com.doumee.core.haikang.model;
import com.alibaba.fastjson.JSONObject;
+import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.CarPictureRequest;
import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
+import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
import com.doumee.core.haikang.service.HKService;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.InterfaceLogService;
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
@@ -34,6 +38,19 @@
ArtemisConfig.appKey = "23154099";
ArtemisConfig.appSecret = "88wFsg3xfn7o8QMsWEO2";
HKConstants.https = "https://";
+
+ ParkReservationAddRequest request = new ParkReservationAddRequest();
+ request.setPlateNo("鐨朅90LL0");
+ request.setParkSyscode("1c4cdb8b66ed4c23bacb385c3fb6c46b");
+ request.setPhoneNo("15345690849");
+ request.setOwner("鏂芥棴杈�");
+ request.setAllowTimes(Constants.ONE+"");
+ request.setIsCharge(Constants.ONE+"");
+ request.setStartTime( DateUtil.getISO8601Timestamp2(new Date()) );
+ request.setEndTime( "2025-03-27T00:00:00+08:00" );
+ String response = parkAddition(JSONObject.toJSONString(request));
+ System.out.println(response);
+
/* CarPictureRequest param = new CarPictureRequest();
param.setPicUri( "HKIMG=/pic?0dd400=4c40ip-feo831-933*9o4=3=2109*2l0001893117*0t7=6*2ps==014b*=787d*069d70361-95754d-9*l108od0b192=001");
param.setAswSyscode("3fa3e5e3-db3e-41ba-97fc-39c948778dfe");
@@ -55,9 +72,9 @@
throw new RuntimeException(e);
}*/
- FacePictureCheckRequest param = new FacePictureCheckRequest();
- param.setFacePicUrl("http://10.50.250.253:8088/file/member/20241016/d0cded86-a55d-43be-bc01-4f628a1400cf.jpg");
- System.out.println(facePictureCheck(JSONObject.toJSONString(param)));
+// FacePictureCheckRequest param = new FacePictureCheckRequest();
+// param.setFacePicUrl("http://10.50.250.253:8088/file/member/20241016/d0cded86-a55d-43be-bc01-4f628a1400cf.jpg");
+// System.out.println(facePictureCheck(JSONObject.toJSONString(param)));
}
public static InterfaceLogService interfaceLogService = null;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 4e2ad4a..211ee60 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -11,6 +11,7 @@
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -19,12 +20,11 @@
import java.io.InputStream;
import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Slf4j
public class HKService {
+ private static String[] args;
private Logger logger = LoggerFactory.getLogger(HKService.class);
/**
* 鑾峰彇鏍圭粍缁囨暟鎹�
@@ -361,6 +361,8 @@
}
return null;
}
+
+
/**
*杞︿綅棰勭害
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 91309e2..f4eca70 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1044,6 +1044,7 @@
problemLog.setUserId(member.getId());
problemLog.setPhone(member.getPhone());
problemLog.setLogId(visits.getId());
+ problemLog.setCompanyName(visits.getCompanyName());
problemLogMapper.updateById(problemLog);
}
}
--
Gitblit v1.9.3