diff --git a/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java b/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java index 1faced4b..56cc54a2 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcPublishManage.java @@ -122,6 +122,7 @@ public class DcPublishManage extends BaseEntity private Long logId; + //位置 @Excel(name = "位置/设备") private String position; 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 bfd79d80..d4071155 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 @@ -243,31 +243,35 @@ public class OperationLogAspect { 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-失败 - } + for (int i = 0; i < devices.size(); i++) { - if (loginUser != null) { - dcPublishManage.setPublisher(loginUser.getUsername());//发布人 - } else { - dcPublishManage.setPublisher("系统定时调用");//发布人 - } - dcPublishManage.setPublishTime(new Date());//发布时间 - dcPublishManage.setCreateTime(new Date());//创建时间 + DcPublishManage dcPublishManage = new DcPublishManage(); - dcPublishManage.setLogId(Long.valueOf(operLog.getId()));//发布的如果的情报板传对应id - if (Objects.equals(deviceType, "2")) { - dcPublishManage.setPublishChannels(4); - } else { - dcPublishManage.setPublishChannels(7); - } + 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(contentDetails); - dcPublishManageService.insertDcPublishManage(dcPublishManage); + dcPublishManage.setContentDetails(String.valueOf(pointArgs)); + dcPublishManageService.insertDcPublishManage(dcPublishManage); + } } diff --git a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml index 17026d47..1624000e 100644 --- a/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml @@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"