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()); } }