Merge remote-tracking branch 'origin/event_new' into event_new

src/main/java/com/zzsn/event/controller/PlatEventManageController.java

 package com.zzsn.event.controller;
 
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.clb.common.model.task.dto.titr.KeyWordsDTO;
@@ -16,6 +18,7 @@ import com.zzsn.event.util.user.UserVo;
 import com.zzsn.event.vo.*;
 import com.zzsn.event.xxljob.entity.XxlJobInfo;
 import com.zzsn.event.xxljob.service.IXxlJobInfoService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.core.KafkaTemplate;
@@ -24,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -241,4 +245,55 @@ public class PlatEventManageController {
             }
         });
     }
+
+
+    /**
+     * @param event 条件封装
+     * @描述 查询事件列表
+     * @作者 hejinyu
+     * @创建时间 2024/12/26
+     **/
+    @PostMapping("/listAll")
+    public Result<?> listAll(@RequestBody Event event) {
+        LambdaQueryWrapper<Event> queryWrapper = Wrappers.lambdaQuery();
+        setListAllQueryWrapper(event, queryWrapper);
+        List<Event> list = eventService.list(queryWrapper);
+        return Result.OK(list);
+    }
+
+    /**
+     * @param event    条件封装
+     * @param pageNo
+     * @param pageSize
+     * @描述 查询事件列表（分页，产业链关联事件时查询用）
+     * @作者 hejinyu
+     * @创建时间 2024/12/26
+     **/
+    @PostMapping("/pageListAll")
+    public Result<?> pageListAll(@RequestBody Event event, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        LambdaQueryWrapper<Event> queryWrapper = Wrappers.lambdaQuery();
+        setListAllQueryWrapper(event, queryWrapper);
+        Page<Event> page = new Page<>(pageNo, pageSize);
+        IPage<Event> pageList = eventService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+    private void setListAllQueryWrapper(@RequestBody Event event, LambdaQueryWrapper<Event> queryWrapper) {
+        String eventType = event.getEventType();
+        String startDate = event.getStartDate();
+        String endDate = event.getEndDate();
+        String keyword = event.getKeyword();
+        queryWrapper.eq(StringUtils.isNotEmpty(eventType), Event::getEventType, eventType);
+        if (StringUtils.isNotEmpty(startDate)) {
+            queryWrapper.ge(Event::getCreateTime, startDate);
+        }
+        if (StringUtils.isNotEmpty(endDate)) {
+            queryWrapper.le(Event::getCreateTime, endDate);
+        }
+        if (StringUtils.isNotEmpty(keyword)) {
+            queryWrapper.and(q -> {
+                q.eq(Event::getEventType, keyword).or().like(Event::getEventName, keyword).or().eq(Event::getEventDescribe, keyword);
+            });
+        }
+    }
 }

src/main/java/com/zzsn/event/entity/Event.java

@@ -176,4 +176,6 @@ public class Event {
 	private String extractLocationTag;
 	@TableField(exist = false)
 	private String extractTimeTag;
+	@TableField(exist = false)
+	private String keyword;
 }