优化功能调用记录

zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java

@@ -142,7 +142,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")) {
+            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 {
@@ -307,8 +307,38 @@ public class OperationLogAspect {
                     operLog.setOperIp(IpUtils.getIpAddr(request));
                     operLog.setOperTime(new Date());
                     operLog.setDcDeviceType(deviceType);
-                    operLog.setJsonResult(remark.toString());
-                    dcOperLogService.addDcOperLog(operLog);
+                    operLog.setRemark(remark.toString());
+                    operLog.setJsonResult(jsonResult.toString());
+                    dcOperLogService.save(operLog);
+
+
+                    if ((Objects.equals(deviceType, "2") || Objects.equals(deviceType, "5")) && Objects.nonNull(operLog.getId())) {
+                        DcPublishManage dcPublishManage = new DcPublishManage();
+
+                        if (Objects.equals(state, "0") && Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("code")), "200")) {
+                            dcPublishManage.setPublishStatus(1);//发布状态1-成功2-失败
+                        } else {
+                            dcPublishManage.setPublishStatus(2);//发布状态1-成功2-失败
+                        }
+
+                        if (loginUser != null) {
+                            dcPublishManage.setPublisher(loginUser.getUsername());//发布人
+                        } else {
+                            dcPublishManage.setPublisher("系统定时调用");//发布人
+                        }
+                        dcPublishManage.setPublishTime(new Date());//发布时间
+                        dcPublishManage.setCreateTime(new Date());//创建时间
+
+                        dcPublishManage.setLogId(Long.valueOf(operLog.getId()));//发布的如果的情报板传对应id
+                        if (Objects.equals(deviceType, "2")) {
+                            dcPublishManage.setPublishChannels(4);
+                        } else {
+                            dcPublishManage.setPublishChannels(7);
+                        }
+
+                        dcPublishManage.setContentDetails(remark.toString());
+                        dcPublishManageService.insertDcPublishManage(dcPublishManage);
+                    }
 
                 }
             }