From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 21 十月 2024 20:39:32 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 62 ++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java index e3b57d9..00bda8d 100644 --- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java +++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java @@ -5,6 +5,7 @@ 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.BaseResponse; import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest; import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest; @@ -18,11 +19,14 @@ import com.doumee.core.utils.Constants; import com.doumee.core.utils.DESUtil; import com.doumee.dao.business.model.Device; +import com.doumee.service.business.DeviceService; import com.doumee.service.business.impl.hksync.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -30,12 +34,19 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.BufferedReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @author 姹熻箘韫� * @date 2023/11/30 15:33 */ @Api(tags = "娴峰悍鏁版嵁鍚屾鎺ュ彛") @RestController +@Slf4j @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/hksync") public class HkSyncCloudController extends BaseController { @@ -54,6 +65,8 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired + private DeviceService deviceService; @Autowired private RedisTemplate<String,Object> redisTemplate; @@ -139,6 +152,22 @@ String result = hkSyncPushService.dealVisitEventIccm(param,response); return ApiResponse.success(result); } + @ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�") + @PostMapping("/testLed") + @LoginNoRequired + public ApiResponse<BaseResponse> testLed(@RequestBody TransparentChannelBodyRequest request, HttpServletResponse response) { + TransparentChannelHeadRequest head = new TransparentChannelHeadRequest(); + head.setAbility("cld");//鍥哄畾鍊� + head.setTreatyType("haixuan_led_net");//鍥哄畾鍊� + head.setDeviceIndexCode("6a5498e9df924befbb9530e467e5e809"); + return ApiResponse.success(HKService.transparentchannel(head,request)); + } + @ApiOperation("銆愭捣搴枫�戞祴璇曞箍鎾挱鎶�") + @PostMapping("/testBroadcast") + @LoginNoRequired + public ApiResponse<BaseResponse> testBroadcast(@RequestBody CustomBroadcastRequest request, HttpServletResponse response) { + return ApiResponse.success( HKService.customBroadcast(request)); + } // @PreventRepeat @ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�") @PostMapping("/push/parks") @@ -160,6 +189,31 @@ public ApiResponse pushPlatformCarStatus(@RequestBody EventPlatformCarsRequest param, HttpServletResponse response ){ String result = hkSyncPushService.dealPlatformCarsEvent(param,response); return ApiResponse.success(result); + } + @ApiOperation("銆愭捣搴穞est銆戞湀鍙拌溅杈嗙姸鎬佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�") + @PostMapping("/push/platform/carstatusTest") + @LoginNoRequired + public ApiResponse pushPlatformCarStatus(HttpServletRequest request, HttpServletResponse response ){ + doPringParam(request,"銆愭捣搴穞est銆戞湀鍙拌溅杈嗙姸鎬佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�:\n"); + return ApiResponse.success(null); + } + public void doPringParam(HttpServletRequest request,String name) { + try { + StringBuilder data =new StringBuilder(); + String line; + BufferedReader reader =request.getReader(); + while(null !=(line = reader.readLine())) { + data.append(line); + } + if(StringUtils.isNotBlank( data.toString())){ + log.info(name+"=================鍙傛暟锛�"+ data.toString()); + }else { + log.info(name+"=================锛氬弬鏁颁负绌�"); + } + }catch (Exception e){ + + log.info(name+"================= 鍙傛暟寮傚父锛�"+e.getMessage()); + } } @PreventRepeat @ApiOperation("銆愭捣搴枫�戝彇娑堣闃呬簨浠�") @@ -187,8 +241,14 @@ String url = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() + systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode() + HKService.getMenuUrl(type,hkToken); - return ApiResponse.success( url); } + @ApiOperation("銆愭捣搴枫�戣缃甃ED灞忔枃妗�") + @PostMapping("/setLedContent") + public ApiResponse<List<Map<String,Object>>> setLedContent(@RequestBody TransparentChannelSingleRequest body , HttpServletResponse response) { + deviceService.setLedContent(body); + return ApiResponse.success(null); + } + } -- Gitblit v1.9.3