Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/PatrolInspectionEvent.java

@@ -58,6 +58,11 @@ public class PatrolInspectionEvent implements Serializable {
      */
     private Integer eventCategory;
 
+    /**
+     * 事件图片
+     */
+    private String eventImage;
+
     /**
      * 处置状态
      */

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionEventServiceImpl.java

@@ -43,7 +43,11 @@ public class PatrolInspectionEventServiceImpl extends AbstractCrudService<Patrol
         Integer size = requestVO.getPageSize();
         IPage<PatrolInspectionEvent> page = new Page<>(current,size);
         LambdaQueryWrapper<PatrolInspectionEvent> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(StringUtils.isNotBlank(requestVO.getDeviceId()),PatrolInspectionEvent::getDeviceId,requestVO.getDeviceId())
+        queryWrapper.eq(requestVO.getId() != null,PatrolInspectionEvent::getId,requestVO.getId())
+                .like(StringUtils.isNotBlank(requestVO.getPersonnelName()),PatrolInspectionEvent::getPersonnelName,requestVO.getPersonnelName())
+                .like(StringUtils.isNotBlank(requestVO.getEventName()),PatrolInspectionEvent::getEventName,requestVO.getEventName())
+                .eq(requestVO.getHandleStatus() != null,PatrolInspectionEvent::getHandleStatus,requestVO.getHandleStatus())
+                .eq(StringUtils.isNotBlank(requestVO.getDeviceId()),PatrolInspectionEvent::getDeviceId,requestVO.getDeviceId())
                 .eq(requestVO.getEventLevel() != null,PatrolInspectionEvent::getEventLevel,requestVO.getEventLevel())
                 .eq(PatrolInspectionEvent::getTenantId, SecurityUtils.getTenantId())
                 .orderByDesc(PatrolInspectionEvent::getId);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionPlanRequestVO.java

@@ -4,6 +4,23 @@ import lombok.Data;
 
 @Data
 public class PatrolInspectionPlanRequestVO {
+    private Integer id;
+
+    /**
+     * 巡检人名称
+     */
+    private String personnelName;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 处置状态
+     */
+    private Integer handleStatus;
+
     /**
      * 设备Id
      */

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionEventMapper.xml

@@ -11,6 +11,7 @@
         <result column="event_type" property="eventType" />
         <result column="event_level" property="eventLevel" />
         <result column="event_category" property="eventCategory" />
+        <result column="event_image" property="eventImage" />
         <result column="handle_status" property="handleStatus" />
         <result column="device_id" property="deviceId" />
         <result column="handle_name" property="handleName" />