From 95525f5d546f618a6222f89fe5ec6b739da579ea 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: Sun, 10 Nov 2024 11:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/api/TowerCraneApiController.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 e3b0e77..a3ce5f1 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 @@ -37,11 +37,7 @@ public class TowerCraneApiController { private final String HOST = "https://aqzg.makalu.cc"; private final String DEVSOURCE = "YF"; - private Map cacheMap; - - { - cacheMap = new HashMap<>(); - } + private Map cacheMap = new HashMap<>(); @Autowired private IIotDeviceInfoService iIotDeviceInfoService; @@ -87,8 +83,8 @@ public class TowerCraneApiController { dataMap.put("base",rate); dataMap.put("coordX",dataContent.get("coordinateX")); dataMap.put("coordY",dataContent.get("coordinateY")); - dataMap.put("foreArmLength",dataContent.get("frontBrachium")); - dataMap.put("postArmLength",dataContent.get("afterBrachium")); + dataMap.put("foreArmLength",Convert.toStr(dataContent.get("frontBrachium"),"60")); + dataMap.put("postArmLength",Convert.toStr(dataContent.get("afterBrachium"),"12")); dataMap.put("hatHeight",dataContent.get("towerCapHeight")); double remotePullRod = Convert.toDouble(cacheMap.get("remotePullRod_"+sn),0.00); double nearPullRod = Convert.toDouble(cacheMap.get("nearPullRod_"+sn),0.00); @@ -99,7 +95,8 @@ public class TowerCraneApiController { dataMap.put("downHeight",dataContent.get("towerSectionHeight")); dataMap.put("updateTime", DateUtils.getTime()); - HttpUtils.commHttpPost(HOST+"/api/device/baseInfo",dataMap); + String res = HttpUtils.commHttpPost(HOST+"/api/device/baseInfo",dataMap); + log.info("/api/device/baseInfo...{}...{}",res,dataMap); } /** @@ -178,7 +175,8 @@ public class TowerCraneApiController { dataMap.put("minRotateAngle",dataContent.get("startRotation")); dataMap.put("createTime",System.currentTimeMillis()); - HttpUtils.commHttpPost(HOST+"/api/device/roundInfo",dataMap); + String res = HttpUtils.commHttpPost(HOST+"/api/device/roundInfo",dataMap); + log.info("/api/device/roundInfo...{}...{}",res,dataMap); } /** @@ -201,7 +199,8 @@ public class TowerCraneApiController { dataMap.put("real_data",Convert.toStr(cacheMap.get("collisionAngleAlarm_"+sn),"0")); dataMap.put("warn_time",DateUtils.getTime()); - HttpUtils.commHttpPost(HOST+"/api/device/warnRecord",dataMap); + String res = HttpUtils.commHttpPost(HOST+"/api/device/warnRecord",dataMap); + log.info("/api/device/warnRecord...{}...{}",res,dataMap); } /** @@ -453,7 +452,8 @@ public class TowerCraneApiController { dataMap.put("warn_time",DateUtils.getTime()); if(Objects.nonNull(dataMap.get("warn_type"))){ - HttpUtils.commHttpPost(HOST+"/api/device/warnRecord",dataMap); + String res = HttpUtils.commHttpPost(HOST+"/api/device/warnRecord",dataMap); + log.info("/api/device/warnRecord...{}...{}",res,dataMap); } } }