服务

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;

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

@@ -243,6 +243,9 @@ public class OperationLogAspect {
 
 
                 if ((Objects.equals(deviceType, "2") || Objects.equals(deviceType, "5")) && Objects.nonNull(operLog.getId())) {
+
+                    for (int i = 0; i < devices.size(); i++) {
+
                         DcPublishManage dcPublishManage = new DcPublishManage();
 
                         if (Objects.equals(state, "0") && Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("code")), "200")) {
@@ -266,9 +269,10 @@ public class OperationLogAspect {
                             dcPublishManage.setPublishChannels(7);
                         }
 
-                    dcPublishManage.setContentDetails(contentDetails);
+                        dcPublishManage.setContentDetails(String.valueOf(pointArgs));
                         dcPublishManageService.insertDcPublishManage(dcPublishManage);
                     }
+                }
 
 
             } else if (operUrl.contains("functions")) {

zc-business/src/main/resources/mapper/business/DcPublishManageMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDcPublishManageList" parameterType="DcPublishManage" resultMap="DcPublishManageResult">
         <include refid="selectDcPublishManageVo"/>
         <where>
-            manage.event_id is not null
+            manage.publish_channels !=7 and manage.publish_channels !=4
             <if test="eventState != null"> and event.event_state = #{eventState}</if>
             <if test="eventType != null  and eventType != ''"> and event.event_type = #{eventType}</if>
             <if test="publishStatus != null  "> and manage.publish_status = #{publishStatus}</if>