4/2

PAS/pom.xml

@@ -25,7 +25,7 @@
         <okhttps.version>3.1.1</okhttps.version>
         <poi.version>4.1.2</poi.version>
         <poi-tl.version>1.10.3</poi-tl.version>
-        <druid.version>1.1.10</druid.version>
+        <druid.version>1.1.20</druid.version>
         <fastjson.version>2.0.12</fastjson.version>
         <sa-token.version>1.29.0</sa-token.version>
         <springdoc.version>1.6.6</springdoc.version>

PAS/src/main/java/cn/cslg/pas/common/model/dto/EventAddNewDTO.java

@@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,7 +36,7 @@ public class EventAddNewDTO implements Serializable {
      */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime eventDate;
+    private Date eventDate;
     /**
      * 专题库id
      */

PAS/src/main/java/cn/cslg/pas/domain/Event.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -46,12 +48,15 @@ public class Event implements Serializable {
     /**
      * 应用场景(Integer集合形式)
      */
+    @TableField(exist = false)
     private List<Integer> applicationScenarios;
     /**
      * 时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "event_date")
-    private LocalDateTime eventDate;
+    private Date eventDate;
     /**
      * 专题库id
      */
@@ -70,12 +75,16 @@ public class Event implements Serializable {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
     /**
      * 最后修改时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value = "modified_time")
-    private LocalDateTime modifiedTime;
+    private Date modifiedTime;
 
 }

PAS/src/main/java/cn/cslg/pas/service/impl/EventServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service.impl;
 
+import cn.cslg.pas.common.JsonPage;
 import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.model.dto.EventAddNewDTO;
 import cn.cslg.pas.common.model.dto.EventQueryPageDTO;
@@ -15,6 +16,8 @@ import cn.cslg.pas.service.ProjectService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -105,10 +108,11 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         if (projectId != null) {
             queryWrapper.eq(Event::getProjectId, projectId);
         }
+
         if (current != null && size != null) {
-            return Response.success(this.page(new Page<>(current, size), queryWrapper.orderByDesc(Event::getCreateTime)));
+            PageHelper.startPage(current, size);
         }
-        List<Event> events = eventMapper.selectList(queryWrapper);
+        List<Event> events = eventMapper.selectList(queryWrapper.orderByDesc(Event::getCreateTime));
         for (Event event : events) {
             String applicationScenario = event.getApplicationScenario();
             if (applicationScenario != null && !applicationScenario.equals("")) {
@@ -116,7 +120,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
                 event.setApplicationScenarios(applicationScenarios);
             }
         }
-        return Response.success(events);
+        return Response.success(JsonPage.restPage(new PageInfo(events)));
     }