Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java

@@ -119,7 +119,7 @@

                        //先删除原有的在场人员(普通访客）
                        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                                .eq(Retention::getType,Constants.memberType.visitor)
                                .eq(Retention::getType,Constants.RetentionMemberType.fk)
                                .eq(Retention::getMemberId,c.getMemberId()));
                    }
                }
@@ -137,7 +137,7 @@
                        visitsMapper.updateById(update);
                        //先删除原有的在场人员(普通访客）
                        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                                .eq(Retention::getType,Constants.memberType.visitor)
                                .eq(Retention::getType,Constants.RetentionMemberType.fk)
                                .eq(Retention::getMemberId,c.getMemberId()));
                        //再插入最新的在厂人员
                        retentionMapper.insert(getRetentionModelByVisitRequest(c,update.getInDate()));
@@ -206,7 +206,7 @@

                        //先删除原有的在场人员(普通访客）
                        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                                .eq(Retention::getType,Constants.memberType.visitor)
                                .eq(Retention::getType,Constants.RetentionMemberType.fk)
                                .eq(Retention::getMemberId,c.getMemberId()));
                    }
                }
@@ -224,7 +224,7 @@
                        visitsMapper.updateById(update);
                        //先删除原有的在场人员(普通访客）
                        retentionMapper.delete(new UpdateWrapper<Retention>().lambda()
                                .eq(Retention::getType,Constants.memberType.visitor)
                                .eq(Retention::getType,Constants.RetentionMemberType.fk)
                                .eq(Retention::getMemberId,c.getMemberId()));
                        //再插入最新的在厂人员
                        retentionMapper.insert(getRetentionModelByVisitRequest(c,update.getInDate()));
@@ -323,7 +323,6 @@
                if(StringUtils.isNotBlank(c.getOpenid()) && Constants.equalsInteger(c.getStatus(),Constants.VisitStatus.xfFail)){
                    wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
                            wxNoticeConfigMapper,c, WxPlatConstants.visitContent.visitApplyHkFail,
                            systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                            Arrays.asList(c.getOpenid().split(","))
                    );
                }
@@ -371,6 +370,7 @@
    private void getUpdateModelByResponse(  Visits c,Date date, List<DeviceRole> roleList,String path ) {
        String code = null;
        String id = null;
        String recordid = null;
        String qrcode = null;
        String reson = "";
        //发起海康预约接口
@@ -412,6 +412,7 @@
            code =response!=null ?response.getCode():null;
            if(response!=null && response.getData()!=null){
                id = response.getData().getOrderId();
                recordid = response.getData().getAppointRecordId();
                qrcode =response.getData().getQRCode();
            }
            reson = response!=null?JSONObject.toJSONString(response):"";
@@ -419,6 +420,7 @@
        if (code!= null && id!=null) {
            //海康下发成功
            c.setHkId( id);//预约标识
            c.setHkRecordId(recordid);//访客预约记录标识（用户取消预约）
            c.setQrcode(qrcode);
            c.setRemark("下发海康成功！");
            c.setStatus(Constants.VisitStatus.xfSuccess);//下发海康成功
@@ -433,6 +435,7 @@
    public static void getUpdateModelByResponseIccm(  Visits c,Date date, List<DeviceRole> roleList,String path ) {
        String code = null;
        String id = null;
        String recordId = null;
        String qrcode = null;
        String reson = "";
        //发起海康预约接口
@@ -454,6 +457,7 @@
                    && response.getData().getAppointmentInfoList() !=null
                    && response.getData().getAppointmentInfoList().size()>0)){
                id =response.getData().getOrderId();
                recordId = response.getData().getAppointRecordId();
//                qrcode =response.getData().getAppointmentInfoList().get(0).getQRCode();
                qrcode =response.getData().getAppointmentInfoList().get(0).getVerificationCode();
            }
@@ -474,6 +478,7 @@
            code =response!=null ?response.getCode():null;
            if(response!=null && response.getData()!=null){
                id = response.getData().getOrderId();
                recordId = response.getData().getAppointRecordId();
                qrcode =response.getData().getQRCode();
            }
            reson = response!=null?JSONObject.toJSONString(response):"";
@@ -481,6 +486,7 @@
        if (code!= null && id!=null) {
            //海康下发成功
            c.setHkId( id);//预约标识
            c.setHkRecordId(recordId);
            c.setQrcode(qrcode);
            c.setRemark("下发海康成功！");
            c.setStatus(Constants.VisitStatus.xfSuccess);//下发海康成功
@@ -672,7 +678,10 @@
        }
        info.setPhoneNo(c.getPhone());
        info.setPlateNo(c.getCarNos());
        info.setGender(c.getSex()+"");
        info.setGender( "1" );
        if(Constants.equalsInteger(c.getSex(),Constants.ONE) ||Constants.equalsInteger(c.getSex(),Constants.TWO)  ){
            info.setGender( c.getSex()+"");
        }
        if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
            info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
            info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
@@ -720,7 +729,10 @@
        }
        info.setPhoneNo(c.getPhone());
        info.setPlateNo(c.getCarNos());
        info.setGender(c.getSex()+"");
        info.setGender( "1");
        if(Constants.equalsInteger(c.getSex(),Constants.ONE) ||Constants.equalsInteger(c.getSex(),Constants.TWO)  ){
            info.setGender( c.getSex()+"");
        }
        if(Constants.equalsInteger(c.getIdcardType(),Constants.ZERO)){
            info.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
            info.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));