服务

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,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")) {
+                    for (int i = 0; i < devices.size(); i++) {
-                        dcPublishManage.setPublishStatus(1);//发布状态1-成功2-失败
-                    } else {
-                        dcPublishManage.setPublishStatus(2);//发布状态1-成功2-失败
-                    }
 
-                    if (loginUser != null) {
+                        DcPublishManage dcPublishManage = new DcPublishManage();
-                        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(state, "0") && Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("code")), "200")) {
-                    if (Objects.equals(deviceType, "2")) {
+                            dcPublishManage.setPublishStatus(1);//发布状态1-成功2-失败
-                        dcPublishManage.setPublishChannels(4);
+                        } else {
-                    } else {
+                            dcPublishManage.setPublishStatus(2);//发布状态1-成功2-失败
-                        dcPublishManage.setPublishChannels(7);
+                        }
-                    }
+
+                        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);
+                        dcPublishManage.setContentDetails(String.valueOf(pointArgs));
-                    dcPublishManageService.insertDcPublishManage(dcPublishManage);
+                        dcPublishManageService.insertDcPublishManage(dcPublishManage);
+                    }
                 }
 
 

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>
@@ -230,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN (
             SELECT publish_channels ,dc_event.event_type eventType,  COUNT(*)AS number
             FROM dc_publish_manage
-                     LEFT JOIN dc_event on dc_publish_manage.event_id=dc_event.id
+            LEFT JOIN dc_event on dc_publish_manage.event_id=dc_event.id
             where event_id is not NULL AND DATE(publish_time) = CURDATE()
             GROUP BY eventType
         ) AS m ON h.eventType = m.eventType