改ReportQueryVo,改报表标签关系实体类

adc-da-report/src/main/java/com/adc/da/report/eo/ReportLabelEntity.java

@@ -1,5 +1,6 @@
 package com.adc.da.report.eo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -20,14 +21,20 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class ReportLabelEntity implements Serializable {
+
     /**
-     * 
+     *
+     */
+    @TableId(value = "id",type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 报告id
      */
-    @TableId
     private String reportId;
 
     /**
-     * 
+     * 标签id
      */
     private String labelId;
 

adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java

@@ -19,6 +19,7 @@ import com.adc.da.util.utils.UUID;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Resource;
@@ -45,7 +46,8 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class IReportServiceImpl implements IReportService {
+public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
+        implements IReportService {
 
     @Resource
     private StringRedisTemplate stringRedisTemplate;
@@ -107,7 +109,7 @@ public class IReportServiceImpl implements IReportService {
 
             //插入报表标签关系表
             labelList.forEach((label) -> {
-                ReportLabelEntity reportLabelEntity = new ReportLabelEntity(entity.getId(), label);
+                ReportLabelEntity reportLabelEntity = new ReportLabelEntity(UUID.randomUUID10(), entity.getId(), label);
                 reportLabelDao.insert(reportLabelEntity);
             });
 
@@ -145,7 +147,7 @@ public class IReportServiceImpl implements IReportService {
             reportLabelDao.deleteById(entity.getId());
             //插入报表标签关系表
             labelList.forEach((label) -> {
-                ReportLabelEntity reportLabelEntity = new ReportLabelEntity(entity.getId(), label);
+                ReportLabelEntity reportLabelEntity = new ReportLabelEntity(UUID.randomUUID10(), entity.getId(), label);
                 reportLabelDao.insert(reportLabelEntity);
             });
 

adc-da-report/src/main/java/com/adc/da/report/vo/ReportQueryVo.java

@@ -22,24 +22,14 @@ public class ReportQueryVo {
     private int pageSize;
 
     /**
-     * 搜索内容
+     * 全文模糊检索的关键词
      */
     private String keyContent;
 
     /**
-     * 标签1
+     * 标签集合
      */
-    private List<String> labelOneId;
-
-    /**
-     * 标签2
-     */
-    private List<String> labelTwoId;
-
-    /**
-     * 标签3
-     */
-    private List<String> labelThreeId;
+    private List<String> labelId;
 
     /**
      *  年