From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 13 八月 2024 13:38:19 +0800 Subject: [PATCH] 修复bug --- server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 57 ++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java index 6dfa1e4..e9628de 100644 --- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java +++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java @@ -1,6 +1,7 @@ package com.doumee.api.business; import com.doumee.api.BaseController; +import com.doumee.config.DataSyncConfig; import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest; import com.doumee.core.haikang.model.param.request.EventSubRequest; @@ -8,14 +9,20 @@ import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; +import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmDataRequest; +import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest; import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest; import com.doumee.core.model.ApiResponse; +import com.doumee.core.utils.Constants; +import com.doumee.dao.business.model.Member; import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl; import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl; import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl; import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl; +import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -35,6 +42,8 @@ public class HkSyncController extends BaseController { @Autowired + private HkSyncOrgUserToHKServiceImpl hkSyncOrgUserService; + @Autowired private HkSyncDeviceServiceImpl hkSyncDeviceService; @Autowired private HkSyncParkServiceImpl hkSyncParkService; @@ -43,10 +52,27 @@ @Autowired private HkSyncPushServiceImpl hkSyncPushService; + + /** + * 鏄惁寮�鍙戣�� + */ + @Autowired + private DataSyncConfig dataSyncConfig; + + @ApiOperation("绔嬪嵆鍚屾寰呬笅鍙戜汉鍛樻暟鎹�") + @PostMapping("/syncUserData") + @RequiresPermissions("business:member:syncdata") + public ApiResponse syncUserData(@RequestBody Member member) { + if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp) { + //濡傛灉鏄疎RP绯荤粺鍚屾涓嬪彂 + hkSyncOrgUserService.syncUserData(); + } + return ApiResponse.success(null); + } @PreventRepeat @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�") @PostMapping("/syncDevices") -// @RequiresPermissions("business:hksync:device") + @RequiresPermissions("business:hksync:device") public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) { String result = hkSyncDeviceService.syncHkDevices(param); return ApiResponse.success(result); @@ -54,7 +80,7 @@ @PreventRepeat @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛") @PostMapping("/syncParks") -// @RequiresPermissions("business:hksync:park") + @RequiresPermissions("business:hksync:park") public ApiResponse syncHkParks(@RequestBody ParkListRequest param) { String result = hkSyncParkService.syncHkParks(param); return ApiResponse.success(result); @@ -62,39 +88,32 @@ @PreventRepeat @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛") @PostMapping("/syncPrivilege") -// @RequiresPermissions("business:hksync:privilege") + @RequiresPermissions("business:hksync:privilege") public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) { String result = hkSyncPrivilegeService.syncPrivilege(param); return ApiResponse.success(result); } - @PreventRepeat +// @PreventRepeat @ApiOperation("銆愭捣搴枫�戦棬绂佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�") @PostMapping("/push/acs") public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response) { - try { - BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),"UTF-8")); - String line = null; - StringBuffer sb = new StringBuffer(); - while (true) { - if (!((line = br.readLine()) != null)) break; - - sb.append(line); - } - System.out.println(sb.toString()); - } catch (IOException e) { - throw new RuntimeException(e); - } String result = hkSyncPushService.dealAcsEvent(param,response); return ApiResponse.success(result); } - @PreventRepeat +// @PreventRepeat @ApiOperation("銆愭捣搴枫�戣瀹簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�") @PostMapping("/push/visit") public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response) { String result = hkSyncPushService.dealVisitEvent(param,response); return ApiResponse.success(result); } - @PreventRepeat + @ApiOperation("銆愭捣搴枫�戣瀹CCM浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�") + @PostMapping("/push/visitIccm") + public ApiResponse pushVisitIccm(@RequestBody EventVisitIccmRequest param, HttpServletResponse response) { + String result = hkSyncPushService.dealVisitEventIccm(param,response); + return ApiResponse.success(result); + } +// @PreventRepeat @ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�") @PostMapping("/push/parks") public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response) { -- Gitblit v1.9.3