From 25171b9b6f578db60af09de0672c4bc26221ad26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 9 Nov 2024 17:48:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/api/TowerCraneApiController.java | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/mkl-iot/src/main/java/com/ruoyi/iot/api/TowerCraneApiController.java b/mkl-iot/src/main/java/com/ruoyi/iot/api/TowerCraneApiController.java index 8b0cc1d..0668d30 100644 --- a/mkl-iot/src/main/java/com/ruoyi/iot/api/TowerCraneApiController.java +++ b/mkl-iot/src/main/java/com/ruoyi/iot/api/TowerCraneApiController.java @@ -2,14 +2,15 @@ package com.ruoyi.iot.api; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.iot.domain.IotDeviceInfo; -import com.ruoyi.iot.domain.IotPower; import com.ruoyi.iot.domain.TowerReqVo; import com.ruoyi.iot.enums.TowerTypeEnums; import com.ruoyi.iot.service.IIotDeviceInfoService; +import com.ruoyi.utils.HttpUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -54,7 +55,6 @@ public class TowerCraneApiController { */ @PostMapping("/v1/push") public AjaxResult pushData(@Validated @RequestBody TowerReqVo req) { - log.info("/towerCrane/v1/push...{}",JSON.toJSONString(req)); if(req.getType() == TowerTypeEnums.BASE.getCode()){ this.pushConfigData(req); }else if(req.getType() == TowerTypeEnums.RUN.getCode()){ @@ -71,26 +71,6 @@ public class TowerCraneApiController { return AjaxResult.success(); } - /** - * 塔吊监测++ - * 限流规则[60秒内最多请求10次，限流策略IP] - * @author JiangYuQi - * @date 2024-01-13 - */ - @GetMapping("/v99/pushIotPower") - public AjaxResult pushIotPower() { - IotDeviceInfo query = new IotDeviceInfo(); - query.setDeviceName("配电箱"); - query.setProjectId(229L); - query.setFactoryName("萨达"); - List list = iIotDeviceInfoService.selectIotDeviceInfoList(query); - for(IotDeviceInfo e:list){ - e.setProjectId(203L); - iIotDeviceInfoService.updateIotDeviceInfo(e); - } - return AjaxResult.success(); - } - /** * 塔机上报基本信息 * @param req @@ -100,7 +80,7 @@ public class TowerCraneApiController { Map dataContent = req.getContent().getDataContent(); //将数据同步至马卡鲁安管平台 - Map dataMap = new HashMap<>(); + JSONObject dataMap = new JSONObject(); dataMap.put("data_source",DEVSOURCE); dataMap.put("device_sn",sn); double rate = Convert.toInt(cacheMap.get("rate_"+sn),2); @@ -119,7 +99,7 @@ public class TowerCraneApiController { dataMap.put("downHeight",dataContent.get("towerSectionHeight")); dataMap.put("updateTime", DateUtils.getTime()); - HttpUtil.post(HOST+"/api/device/baseInfo",dataMap,-1); + HttpUtils.commHttpPost(HOST+"/api/device/baseInfo",dataMap); } /** @@ -131,7 +111,7 @@ public class TowerCraneApiController { Map dataContent = req.getContent().getDataContent(); // 将数据同步至马卡鲁安管平台 - Map dataMap = new HashMap<>(); + JSONObject dataMap = new JSONObject(); dataMap.put("data_source",DEVSOURCE); dataMap.put("deviceSn",sn); dataMap.put("thisTime",System.currentTimeMillis()); @@ -151,9 +131,28 @@ public class TowerCraneApiController { if(dataContent.get("warnings")!=null){ this.pushWarnData(req); } - HttpUtil.post(HOST+"/api/device/runInfo",dataMap,-1); + HttpUtils.commHttpPost(HOST+"/api/device/runInfo",dataMap); } + public static void main(String[] args) { + JSONObject dataMap = new JSONObject(); + dataMap.put("data_source","YF"); + dataMap.put("deviceSn","E03C1CB382E61812"); + dataMap.put("thisTime",System.currentTimeMillis()); + dataMap.put("weightData","0.32"); + dataMap.put("tiltData","1.6"); + dataMap.put("windSpeedData","0.0"); + String height = "48.1"; + dataMap.put("heightData",height); + dataMap.put("ampData","16.74"); + dataMap.put("torqueData","2"); + dataMap.put("angleData","127.1"); + String dingShengData = Convert.toStr("50",height); + dataMap.put("dingShengData",dingShengData); + dataMap.put("walkData","16.74"); + String str = HttpUtils.commHttpPost("https://aqzg.makalu.cc/api/device/runInfo", dataMap); + System.out.println(str); + } /** * 塔机上报循环数据 * @param req @@ -163,7 +162,7 @@ public class TowerCraneApiController { Map dataContent = req.getContent().getDataContent(); // 将数据同步至马卡鲁安管平台 - Map dataMap = new HashMap<>(); + JSONObject dataMap = new JSONObject(); dataMap.put("data_source",DEVSOURCE); dataMap.put("deviceSn",sn); dataMap.put("dataId",System.currentTimeMillis()); @@ -179,7 +178,7 @@ public class TowerCraneApiController { dataMap.put("minRotateAngle",dataContent.get("startRotation")); dataMap.put("createTime",System.currentTimeMillis()); - HttpUtil.post(HOST+"/api/device/roundInfo",dataMap,-1); + HttpUtils.commHttpPost(HOST+"/api/device/roundInfo",dataMap); } /** @@ -190,7 +189,7 @@ public class TowerCraneApiController { String sn = req.getContent().getDeviceKey(); // 将数据同步至马卡鲁安管平台 - Map dataMap = new HashMap<>(); + JSONObject dataMap = new JSONObject(); dataMap.put("data_source",DEVSOURCE); dataMap.put("deviceSn",sn); dataMap.put("warn_name","none"); @@ -202,7 +201,7 @@ public class TowerCraneApiController { dataMap.put("real_data",Convert.toStr(cacheMap.get("collisionAngleAlarm_"+sn),"0")); dataMap.put("warn_time",DateUtils.getTime()); - HttpUtil.post(HOST+"/api/device/warnRecord",dataMap,-1); + HttpUtils.commHttpPost(HOST+"/api/device/warnRecord",dataMap); } /** @@ -214,7 +213,7 @@ public class TowerCraneApiController { Map dataContent = req.getContent().getDataContent(); // 将数据同步至马卡鲁安管平台 - Map dataMap = new HashMap<>(); + JSONObject dataMap = new JSONObject(); dataMap.put("data_source",DEVSOURCE); dataMap.put("deviceSn",sn); dataMap.put("warn_name","none"); @@ -454,7 +453,7 @@ public class TowerCraneApiController { dataMap.put("warn_time",DateUtils.getTime()); if(Objects.nonNull(dataMap.get("warn_type"))){ - HttpUtil.post(HOST+"/api/device/warnRecord",dataMap,-1); + HttpUtils.commHttpPost(HOST+"/api/device/warnRecord",dataMap); } } } @@ -465,7 +464,6 @@ public class TowerCraneApiController { * @param req */ private void pushLimitData(TowerReqVo req){ - System.out.println("d3==>pushLimitData"); String sn = req.getContent().getDeviceKey(); Map dataContent = req.getContent().getDataContent();