From 4c2fc574d8ebd9a53f28d105f02c6ea4aa5b2193 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Fri, 5 Jul 2024 16:51:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E8=AE=B0=E5=BD=95=E5=86=85=E5=AE=B9=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=A4=A9=E6=B0=94=E7=BC=93=E5=AD=98=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/controller/WeatherForecastController.java | 6 +++++- .../java/com/zc/business/interfaces/OperationLogAspect.java | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java index 54288104..7c5a0dfc 100644 --- a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java +++ b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java @@ -257,12 +257,16 @@ public class WeatherForecastController extends BaseController { JSONObject jsonResult = JSONObject.parseObject(response.body().string()); if (jsonResult.getInteger("code") == UniversalEnum.TWO_HUNDRED.getNumber()) { JSONArray data = jsonResult.getJSONArray("data"); + //data.forEach(item->{ + // + //}); if (data.size() != UniversalEnum.ZERO.getNumber()) { redisCache.deleteObject("currentWeatherAndForecastInformation" + numStake); redisCache.setCacheObject("currentWeatherAndForecastInformation" + numStake, data); return AjaxResult.success(data); } else { - return AjaxResult.success(redisCache.getCacheObject("currentWeatherAndForecastInformation" + numStake)); + JSONArray cacheObject = redisCache.getCacheObject("currentWeatherAndForecastInformation" + numStake); + return AjaxResult.success(cacheObject); } } else { return AjaxResult.error(jsonResult.getInteger("code"), UniversalEnum.REQUEST_FAILED.getValue()); diff --git a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java index 16121a00..2d97e9eb 100644 --- a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java +++ b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java @@ -208,6 +208,8 @@ public class OperationLogAspect { return; } + remark.append(deviceName); + String hashMap = Objects.equals(deviceType, UniversalEnum.FIVE.getValue()) ? UniversalEnum.RELEASE_VOICE_BROADCAST.getValue() : String.valueOf( @@ -217,7 +219,7 @@ public class OperationLogAspect { ((HashMap) (DEVICEFUNCTIONNAME.get(deviceType))) .get(functionId)); - remark.append(deviceName).append(UniversalEnum.INVOKE.getValue()).append(hashMap).append(UniversalEnum.FEATURE.getValue()); + remark.append(UniversalEnum.INVOKE.getValue()).append(hashMap).append(UniversalEnum.FEATURE.getValue()); if (i1 < functions.size() - UniversalEnum.ONE.getNumber()) { remark.append(UniversalEnum.SEMICOLON.getValue()); @@ -237,7 +239,7 @@ public class OperationLogAspect { } if (i < (devices.size() - UniversalEnum.ONE.getNumber())) { - remark.append(UniversalEnum.SEMICOLON.getValue()); + remark.append(UniversalEnum.COMMA.getValue()); } }