优化操作记录表

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

@@ -14,8 +14,11 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import com.zc.business.domain.DcDevice;
 import com.zc.business.domain.DcOperLog;
+import com.zc.business.domain.DcPublishManage;
 import com.zc.business.service.IDcDeviceService;
 import com.zc.business.service.IDcOperLogService;
+import com.zc.business.service.IDcPublishInfoService;
+import com.zc.business.service.IDcPublishManageService;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
@@ -108,6 +111,7 @@ public class OperationLogAspect {
         ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class);
         IDcOperLogService dcOperLogService = SpringUtils.getBean(IDcOperLogService.class);
         IDcDeviceService dcDeviceService = SpringUtils.getBean(IDcDeviceService.class);
+        IDcPublishManageService dcPublishManageService = SpringUtils.getBean(IDcPublishManageService.class);
 
         try {
             DcOperLog operLog = new DcOperLog();
@@ -177,6 +181,7 @@ public class OperationLogAspect {
 
                         deviceType = dcDevice.getDeviceType();
 
+
                         deviceIds.add(String.valueOf(deviceId));
                         deviceNames.add(deviceName);
 
@@ -190,7 +195,10 @@ public class OperationLogAspect {
                                     "发布语音广播" :
                                     String.valueOf(
                                             ((HashMap<String, Object>) (DEVICEFUNCTIONNAME.get(deviceType)))
-                                                    .get(function.getString("functionId")));
+                                                    .get(function.getString("functionId")) == null ?
+                                                    "未知方法" :
+                                                    ((HashMap<String, Object>) (DEVICEFUNCTIONNAME.get(deviceType)))
+                                                            .get(function.getString("functionId")));
 
                             remark.append("调用").append(hashMap).append("功能").append(sta);
 
@@ -227,7 +235,38 @@ public class OperationLogAspect {
                 operLog.setDcDeviceType(deviceType);
                 operLog.setRemark(remark.toString());
                 operLog.setJsonResult(jsonResult.toString());
-                dcOperLogService.addDcOperLog(operLog);
+                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());//创建时间
+
+                    if (Objects.equals(deviceType, "2")) {
+                        dcPublishManage.setLogId(Long.valueOf(operLog.getId()));//发布的如果的情报板传对应id
+                        dcPublishManage.setPublishChannels(4);
+                    } else {
+                        dcPublishManage.setVoiceId(Long.valueOf(operLog.getId()));//发布的如果是语音传对应id
+                        dcPublishManage.setPublishChannels(7);
+                    }
+
+                    dcPublishManage.setContentDetails(remark.toString());
+                    dcPublishManageService.insertDcPublishManage(dcPublishManage);
+                }
+
 
             } else if (operUrl.contains("functions")) {