admin/src/components/business/OperaPlatformApproveTemplWindow.vue
@@ -353,6 +353,8 @@ companyName: i.companyName } }) }else{ item.objIds = [] } }) this.apprList = arr admin/src/views/business/approvalConfiguration.vue
@@ -316,6 +316,7 @@ this.apprList.forEach((item, index) => { if (i === index) { item.active = true console.log("====================",item.objIds) if (item.objIds && item.objIds.length > 0) { const objIds = item.objIds.map(i => { return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}` @@ -343,6 +344,8 @@ companyName: i.companyName } }) }else{ item.objIds = [] } }) this.apprList = arr admin/src/views/business/approvalReport.vue
@@ -330,6 +330,8 @@ companyName: i.companyName } }) }else{ item.objIds = [] } }) this.apprList = arr admin/src/views/operation/serviceCar/apprConfig.vue
@@ -349,6 +349,8 @@ companyName: i.companyName } }) }else{ item.objIds = [] } }) this.apprList = arr admin/src/views/vehicle/parks.vue
@@ -32,8 +32,8 @@ > <el-table-column prop="name" label="停车库名称" min-width="100px"></el-table-column> <el-table-column prop="parentName" label="所属停车库" min-width="100px"></el-table-column> <el-table-column prop="parkCreateDate" label="创建时间" min-width="100px"></el-table-column> <el-table-column prop="parkEditDate" label="更新时间" min-width="100px"></el-table-column> <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column> <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column> </el-table> <pagination @size-change="handleSizeChange" server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: test active: dev application: name: systemTimer # 安全配置 server/visits/admin_timer/src/main/java/com/doumee/api/HkUsersTimerController.java
@@ -38,7 +38,7 @@ public ApiResponse syncOrgData() { if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){ //如果是ERP系统同步下发 hkSyncOrgUserService.syncOrgData(); hkSyncOrgUserService.syncOrgData(null); } return ApiResponse.success("开启定时同步海康组织数据成功"); } @@ -53,7 +53,7 @@ public ApiResponse syncUserData() { if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) { //如果是ERP系统同步下发 hkSyncOrgUserService.syncUserData(); hkSyncOrgUserService.syncUserData(null); } return ApiResponse.success("开启定时同步海康人员数据成功"); } server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -2,6 +2,7 @@ import com.doumee.api.BaseController; import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.config.annotation.LoginNoRequired; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; @@ -101,19 +102,22 @@ // @PreventRepeat @ApiOperation("【海康】门禁事件订阅推送对接处理接口") @PostMapping("/push/acs") public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ @LoginNoRequired public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response ){ String result = hkSyncPushService.dealAcsEvent(param,response); return ApiResponse.success(result); } // @PreventRepeat @ApiOperation("【海康】访客事件订阅推送对接处理接口") @PostMapping("/push/visit") public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ @LoginNoRequired public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response){ String result = hkSyncPushService.dealVisitEvent(param,response); return ApiResponse.success(result); } @ApiOperation("【海康】访客ICCM事件订阅推送对接处理接口") @PostMapping("/push/visitIccm") @LoginNoRequired public ApiResponse pushVisitIccm(@RequestBody EventVisitIccmRequest param, HttpServletResponse response) { String result = hkSyncPushService.dealVisitEventIccm(param,response); return ApiResponse.success(result); @@ -121,14 +125,16 @@ // @PreventRepeat @ApiOperation("【海康】停车场事件订阅推送对接处理接口") @PostMapping("/push/parks") public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ @LoginNoRequired public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response ){ String result = hkSyncPushService.dealParkEvent(param,response); return ApiResponse.success(result); } @PreventRepeat @ApiOperation("【海康】取消订阅事件") @PostMapping("/cancelEventSub") public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ @LoginNoRequired public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response){ hkSyncPushService.cancelEventSub(); return ApiResponse.success(null); } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -488,16 +488,16 @@ * @return */ public static BaseResponse<IccmAppointmentMDJResponse> iccmAppiontmentMDJ(IccmAppointmentMDJRequest param){ log.info("【海康访客免登记预约】================开始===="+JSONObject.toJSONString(param)); log.info("【海康访客免登记预约】================iccm开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.visitAppiontmentMDJ(JSONObject.toJSONString(param)); String res = HKTools.iccmAppointmentMDJ(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<IccmAppointmentMDJResponse> >(){}; BaseResponse<IccmAppointmentMDJResponse> result = JSONObject.parseObject(res, typeReference.getType()); logResult(result,"海康访客免登记预约"); return result; }catch (Exception e){ log.error("【海康访客免登记预约】================失败====：\n"+ e.getMessage()); log.error("【海康访客免登记预约】================iccm失败====：\n"+ e.getMessage()); } return null; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -1590,7 +1590,7 @@ .eq(Member::getType,Constants.memberType.internal) .eq(Member::getStatus,Constants.ZERO) .isNotNull(Member::getHkId) .apply("to_days(lastVisitDate)+ "+days+" < to_days(now())" )); .apply("to_days(LAST_VISIT_DATE)+ "+days+" < to_days(now())" )); if(CollectionUtils.isEmpty(memberList)){ return; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
@@ -120,11 +120,17 @@ if(model !=null){ //如果已存在，则更新数据 model = initDataByHkData(model,device,date); if(allHkList.size()==1){ model.setIsDefault(Constants.ZERO); } editList.add(model); }else{ //如果不存在，则新增数据 model = new DeviceRole(); model = initDataByHkData(model,device,date); if(allHkList.size()==1){ model.setIsDefault(Constants.ZERO); } addList.add(model); } }
