From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:11:07 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
index 143183d..9c4fba9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -421,7 +421,7 @@
         c.setHkStatus(Constants.ONE);
         c.setHkDate(date);
     }
-    private void getUpdateModelByResponseIccm(  Visits c,Date date, List<DeviceRole> roleList,String path ) {
+    public static void getUpdateModelByResponseIccm(  Visits c,Date date, List<DeviceRole> roleList,String path ) {
         String code = null;
         String id = null;
         String qrcode = null;
@@ -511,7 +511,7 @@
         request.setVisitorPermissionSet(getVisitPermissonRequest(roleList,c));
         return  request;
     }
-    private IccmAppointmentMDJRequest getHkMDJRequestParamIccm(Visits c,List<DeviceRole> roleList,String path) {
+    public static IccmAppointmentMDJRequest getHkMDJRequestParamIccm(Visits c,List<DeviceRole> roleList,String path) {
         IccmAppointmentMDJRequest request = new IccmAppointmentMDJRequest();
         IccmAppointmentVistorRequest info =getRequestInfoByVisitIccm(c,path);
         if(info == null ){
@@ -521,7 +521,7 @@
         request.setVisitStartTime(DateUtil.getISO8601Timestamp2(c.getStarttime()));
         request.setVisitEndTime(DateUtil.getISO8601Timestamp2(c.getEndtime()));
         request.setReceptionistId(c.getReceptMemberHkId());//琚浜烘捣搴风紪鐮�
-        if(StringUtils.isNotBlank(c.getReason())){
+       /* if(StringUtils.isNotBlank(c.getReason())){
             char[] charArray = c.getReason().toCharArray();
             int length = charArray.length;
             if(length>32){
@@ -529,7 +529,7 @@
             }else{
                 request.setVisitPurpose(c.getReason());
             }
-        }
+        }*/
         request.setVisitorInfo(info);
         request.setVisitorPermissionSet(getVisitPermissonRequestIccm(roleList,c));
         return  request;
@@ -555,7 +555,7 @@
         }
         return  p;
     }
-    private IccmPermissionSetRequest getVisitPermissonRequestIccm(List<DeviceRole> roleList, Visits c) {
+    public static IccmPermissionSetRequest getVisitPermissonRequestIccm(List<DeviceRole> roleList, Visits c) {
         IccmPermissionSetRequest p = new IccmPermissionSetRequest();
         //鑾峰彇鏉冮檺缁勯泦鍚�
         String[] roles = getHkRoles(c.getDoors(),roleList);
@@ -598,7 +598,7 @@
         request.setVisitorInfoList(infolist);
         return  request;
     }
-    private IccmAppointmentRequest getHkRequestParaIccm(Visits c,List<DeviceRole> roleList,String path ) {
+    public static  IccmAppointmentRequest getHkRequestParaIccm(Visits c,List<DeviceRole> roleList,String path ) {
         IccmAppointmentRequest request = new IccmAppointmentRequest();
         //鐢宠浜轰俊鎭�
         IccmAppointmentVistorRequest info =getRequestInfoByVisitIccm(c,path);
@@ -606,11 +606,11 @@
             //浜鸿劯涓虹┖锛屼笉鑳借繘琛屾帹閫�
             return  null;
         }
-        request.setVisitStartTime(DateUtil.getISO8601Timestamp(c.getStarttime()));
-        request.setVisitEndTime(DateUtil.getISO8601Timestamp(c.getEndtime()));
+        request.setVisitStartTime(DateUtil.getISO8601Timestamp2(c.getStarttime()));
+        request.setVisitEndTime(DateUtil.getISO8601Timestamp2(c.getEndtime()));
         request.setReceptionistId(c.getReceptMemberHkId());//琚浜烘捣搴风紪鐮�
 
-        if(StringUtils.isNotBlank(c.getReason())){
+      /*  if(StringUtils.isNotBlank(c.getReason())){
             char[] charArray = c.getReason().toCharArray();
             int length = charArray.length;
             if(length>32){
@@ -618,7 +618,7 @@
             }else{
                 request.setVisitPurpose(c.getReason());
             }
-        }
+        }*/
         //鑾峰彇鏉冮檺缁勯泦鍚�
         request.setVisitorPermissionSet(getVisitPermissonRequestIccm(roleList,c));
         List<IccmAppointmentVistorRequest> infolist = new ArrayList<>();
@@ -673,7 +673,7 @@
 
         return info;
     }
-    private IccmAppointmentVistorRequest getRequestInfoByVisitIccm(Visits c,String path) {
+    public static IccmAppointmentVistorRequest getRequestInfoByVisitIccm(Visits c,String path) {
         IccmAppointmentVistorRequest info = new IccmAppointmentVistorRequest();
         //浜鸿劯鏁版嵁
         if(StringUtils.isBlank(c.getName())
@@ -720,7 +720,7 @@
         return info;
     }
 
-    private String[] getHkRoles(String doors, List<DeviceRole> roleList) {
+    public static String[] getHkRoles(String doors, List<DeviceRole> roleList) {
         if(StringUtils.isBlank(doors) || roleList.size()==0|| roleList.size()==0){
             return null;
         }

--
Gitblit v1.9.3