From a78e347159960f5c90e3307cceeaddf56cbc273f Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Thu, 23 May 2024 18:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E6=8E=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AE=9A=E6=97=B6=E6=93=8D=E4=BD=9C=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E7=AD=89=E4=BF=A1=E6=81=AF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/OperationLogAspect.java | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) 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 be5d0d17..bfd79d80 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 @@ -109,7 +109,6 @@ public class OperationLogAspect { public void around(ProceedingJoinPoint joinPoint, OperationLog operationLog, String state, Object jsonResult, Exception exception) throws Throwable { ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class); - IDcOperLogService dcOperLogService = SpringUtils.getBean(IDcOperLogService.class); IDcDeviceService dcDeviceService = SpringUtils.getBean(IDcDeviceService.class); IDcPublishManageService dcPublishManageService = SpringUtils.getBean(IDcPublishManageService.class); @@ -142,7 +141,7 @@ public class OperationLogAspect { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String date = df.format(new Date()); String sta = ""; - if (Objects.equals(state, "0") && Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("code")), "200") && !Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("msg")), "500") ) { + if (Objects.equals(state, "0") && Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("code")), "200") && !Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("msg")), "500")) { operLog.setStatus(0); sta = "成功"; } else { @@ -207,15 +206,14 @@ public class OperationLogAspect { } - - if (Objects.equals(function.getString("functionId"), "13")&&Objects.equals(deviceType,"2")){ + if (Objects.equals(function.getString("functionId"), "13") && Objects.equals(deviceType, "2")) { JSONArray parameters = function.getJSONObject("params").getJSONArray("parameters"); - List content = parameters.stream().map(item->((JSONObject)item).getString("CONTENT")).collect(Collectors.toList()); + List content = parameters.stream().map(item -> ((JSONObject) item).getString("CONTENT")).collect(Collectors.toList()); contentDetails = content.toString().replace("[", "").replace("]", ""); } - if (Objects.equals(deviceType,"5")){ + if (Objects.equals(deviceType, "5")) { contentDetails = function.getJSONObject("params").getString("text"); } } @@ -235,20 +233,13 @@ public class OperationLogAspect { operLog.setOperLocation(loginUser.getLoginLocation()); operLog.setOperType("2"); } else { + operLog.setOperName("服务器"); + operLog.setDeptName("服务器"); + operLog.setOperLocation("服务器"); operLog.setOperType("1"); } - JSONArray jsonArray = (JSONArray) JSON.toJSON(pointArgs); - - operLog.setOperParam(String.valueOf(jsonArray)); - operLog.setDcDeviceId(deviceIds.toString()); - operLog.setDcDeviceName(deviceNames.toString()); - operLog.setOperIp(IpUtils.getIpAddr(request)); - operLog.setOperTime(new Date()); - operLog.setDcDeviceType(deviceType); - operLog.setRemark(remark.toString()); - operLog.setJsonResult(jsonResult.toString()); - dcOperLogService.save(operLog); + saveOperLog(jsonResult, operLog, pointArgs, request, deviceIds, deviceNames, deviceType, remark); if ((Objects.equals(deviceType, "2") || Objects.equals(deviceType, "5")) && Objects.nonNull(operLog.getId())) { @@ -312,17 +303,7 @@ public class OperationLogAspect { operLog.setOperType("1"); } - JSONArray jsonArray = (JSONArray) JSON.toJSON(pointArgs); - - operLog.setOperParam(String.valueOf(jsonArray)); - operLog.setDcDeviceId(deviceIds.toString()); - operLog.setDcDeviceName(deviceNames.toString()); - operLog.setOperIp(IpUtils.getIpAddr(request)); - operLog.setOperTime(new Date()); - operLog.setDcDeviceType(deviceType); - operLog.setRemark(remark.toString()); - operLog.setJsonResult(jsonResult.toString()); - dcOperLogService.save(operLog); + saveOperLog(jsonResult, operLog, pointArgs, request, deviceIds, deviceNames, deviceType, remark); //if ((Objects.equals(deviceType, "2") || Objects.equals(deviceType, "5")) && Objects.nonNull(operLog.getId())) { @@ -360,4 +341,19 @@ public class OperationLogAspect { throw e; } } + + private void saveOperLog(Object jsonResult, DcOperLog operLog, Object[] pointArgs, HttpServletRequest request, ArrayList deviceIds, ArrayList deviceNames, String deviceType, StringBuilder remark) { + IDcOperLogService dcOperLogService = SpringUtils.getBean(IDcOperLogService.class); + JSONArray jsonArray = (JSONArray) JSON.toJSON(pointArgs); + + operLog.setOperParam(String.valueOf(jsonArray)); + operLog.setDcDeviceId(deviceIds.toString()); + operLog.setDcDeviceName(deviceNames.toString()); + operLog.setOperIp(IpUtils.getIpAddr(request)); + operLog.setOperTime(new Date()); + operLog.setDcDeviceType(deviceType); + operLog.setRemark(remark.toString()); + operLog.setJsonResult(jsonResult.toString()); + dcOperLogService.save(operLog); + } }