钥匙柜信息处理

rk

7 小时以前 fbfd6f517d675558f123f755155456508f8d95d6

钥匙柜信息处理

 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";//考勤管理

 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格式：yyyy-MM-ddTHH:mm:ss+当前时区，例如北京时间：2018-07-26T15:00:00+08:00
    private String    endTime    ;//string    False    é¢„约结束时间 æŒ‰æ—¶é—´é¢„约时必填，按次预约不填 ISO8601格式：yyyy-MM-ddTHH:mm:ss+当前时区，例如北京时间：2018-07-26T15:00:00+08:00
    private List<ParkReservationAddResvRequest> resvTime;//    string    False    é¢„约方式，5:第三方预约（默认）6:访客
}

 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格式：yyyy-MM-ddTHH:mm:ss+当前时区，例如北京时间：2018-07-26T15:00:00+08:00
    private String    endTime    ;//string    False    é¢„约结束时间 æŒ‰æ—¶é—´é¢„约时必填，按次预约不填 ISO8601格式：yyyy-MM-ddTHH:mm:ss+当前时区，例如北京时间：2018-07-26T15:00:00+08:00

}

 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){

 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());

 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(), "对不起，组织类型不正确，请按要求填写~");
        }
        //查询名称不能重复

 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());