From fbfd6f517d675558f123f755155456508f8d95d6 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 11 十一月 2025 16:33:58 +0800
Subject: [PATCH] 钥匙柜信息处理
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java | 3 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 11 +++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 11 +++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 6 ++++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddResvRequest.java | 13 +++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 5 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2 +-
7 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 78ab9c1..a985132 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -288,9 +288,11 @@
* 3銆佽兘绠′腑蹇冿細ngzx
*/
public interface MenuPageId{
- String[] componentIds = new String[]{"Infovision iPark Platform","dfe","cems"};
- String afzx = "afzx";//瀹夐槻涓績
+ String[] componentIds = new String[]{"vms","dfe","cems"};
+// String[] componentIds = new String[]{"Infovision iPark Platform","dfe","cems"};
+ String afzx = "010100";//瀹夐槻涓績
String xkzx = "xkzx";//娑堟帶涓績
+
String ngzx = "ngzx";//鑳界涓績
String jsc = "jsc";//鐗╀笟鍚庡嫟
String kqgzt = "attendance_workstand";//鑰冨嫟绠＄悊
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java
index a0cf691..b8db161 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddRequest.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.util.List;
+
@Data
public class ParkReservationAddRequest {
@@ -14,4 +16,5 @@
private String resvWay;// string False 棰勭害鏂瑰紡锛�5:绗笁鏂归绾︼紙榛樿锛�6:璁垮
private String startTime ;//string False 棰勭害寮�濮嬫椂闂� 鎸夋椂闂撮绾︽椂蹇呭～锛屾寜娆￠绾︿笉濉� ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
private String endTime ;//string False 棰勭害缁撴潫鏃堕棿 鎸夋椂闂撮绾︽椂蹇呭～锛屾寜娆￠绾︿笉濉� ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
+ private List<ParkReservationAddResvRequest> resvTime;// string False 棰勭害鏂瑰紡锛�5:绗笁鏂归绾︼紙榛樿锛�6:璁垮
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddResvRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddResvRequest.java
new file mode 100644
index 0000000..f9bce26
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/ParkReservationAddResvRequest.java
@@ -0,0 +1,13 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ParkReservationAddResvRequest {
+
+ private String startTime ;//string False 棰勭害寮�濮嬫椂闂� 鎸夋椂闂撮绾︽椂蹇呭～锛屾寜娆￠绾︿笉濉� ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
+ private String endTime ;//string False 棰勭害缁撴潫鏃堕棿 鎸夋椂闂撮绾︽椂蹇呭～锛屾寜娆￠绾︿笉濉� ISO8601鏍煎紡锛歽yyy-MM-ddTHH:mm:ss+褰撳墠鏃跺尯锛屼緥濡傚寳浜椂闂达細2018-07-26T15:00:00+08:00
+
+}
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 246722c..69a42c6 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
@@ -1191,7 +1191,7 @@
String menuId = HKConstants.MenuPageId.afzx;
if(Constants.equalsInteger(type,Constants.ONE)){
menuId = HKConstants.MenuPageId.xkzx;
- }else if(Constants.equalsInteger(type,Constants.TWO)){
+ }/*else if(Constants.equalsInteger(type,Constants.TWO)){
menuId = HKConstants.MenuPageId.ngzx;
}else if(Constants.equalsInteger(type,Constants.THREE)){
menuId = HKConstants.MenuPageId.jsc;
@@ -1206,10 +1206,11 @@
// return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token;
}else if(Constants.equalsInteger(type,7)){
menuId = HKConstants.MenuPageId.hqzx;
- }
+ }*/
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
///xauthplus-plugin/thirdLogin?type=third&componentId=${componentId}&componentMenuId=${menuId}&token=${token}
+ ///xauthplus-plugin/thirdLogin?type=third&componentld=vms&componentMenuld=010100
String res = HKTools.getMenuUrl(componentId,menuId,token);
return res;
}catch (Exception e){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 5f3fdf0..b2ba175 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -8,6 +8,7 @@
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
+import com.doumee.core.haikang.model.param.request.ParkReservationAddResvRequest;
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.service.business.third.model.PageData;
@@ -1808,8 +1809,14 @@
request.setOwner(visits.getName());
request.setAllowTimes(Constants.ONE+"");
request.setIsCharge(Constants.ONE+"");
- request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
- request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+// request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
+// request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+ List<ParkReservationAddResvRequest> resvTime = new ArrayList<>();
+ ParkReservationAddResvRequest resvRequest = new ParkReservationAddResvRequest();
+ resvRequest.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
+ resvRequest.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+ resvTime.add(resvRequest);
+ request.setResvTime(resvTime);
BaseResponse response = HKService.parkReservationAddition(request);
visitPark.setHkDate(new Date());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 575f5a3..b331f6c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -292,7 +292,7 @@
if(company.getId() == null|| StringUtils.isBlank(company.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(company.getType()!=null && !(company.getType() ==0 || company.getType() ==1)){
+ if(company.getType()!=null && !(company.getType() ==0 || company.getType() ==1 || company.getType() ==-1)){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~");
}
//鏌ヨ鍚嶇О涓嶈兘閲嶅
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 6debdc9..43fb38a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -8,6 +8,7 @@
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
+import com.doumee.core.haikang.model.param.request.ParkReservationAddResvRequest;
import com.doumee.core.haikang.model.param.request.ParkReservationDelRequest;
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
@@ -1113,8 +1114,14 @@
request.setOwner(platformJob.getDriverName());
request.setAllowTimes(Constants.ONE+"");
request.setIsCharge(Constants.ONE+"");
- request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
- request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+// request.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
+// request.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+ List<ParkReservationAddResvRequest> resvTime = new ArrayList<>();
+ ParkReservationAddResvRequest resvRequest = new ParkReservationAddResvRequest();
+ resvRequest.setStartTime(Objects.isNull(visitPark.getStartTime())?DateUtil.getISO8601Timestamp2(new Date()):DateUtil.getISO8601Timestamp2(visitPark.getStartTime()));
+ resvRequest.setEndTime(Objects.isNull(visitPark.getEndTime())?"2999-12-31T00:00:00+08:00":DateUtil.getISO8601Timestamp2(visitPark.getEndTime()));
+ resvTime.add(resvRequest);
+ request.setResvTime(resvTime);
BaseResponse response = HKService.parkReservationAddition(request);
visitPark.setHkDate(new Date());
--
Gitblit v1.9.3