Merge remote-tracking branch 'origin/develop' into develop

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<String> content = parameters.stream().map(item->((JSONObject)item).getString("CONTENT")).collect(Collectors.toList());
+                                List<String> 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);
+                saveOperLog(jsonResult, operLog, pointArgs, request, deviceIds, deviceNames, deviceType, remark);
-
-                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);
 
 
                 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);
+                    saveOperLog(jsonResult, operLog, pointArgs, request, deviceIds, deviceNames, deviceType, remark);
-
-                    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);
 
 
                     //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<String> deviceIds, ArrayList<String> 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);
+    }
 }