Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

dsk-admin/src/main/java/com/dsk/web/schedule/PushTask.java

@@ -6,7 +6,9 @@ import com.dsk.common.constant.PushConstants;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.system.domain.SysConfig;
 import com.dsk.system.domain.SysPush;
+import com.dsk.system.domain.SysPushRecord;
 import com.dsk.system.domain.SysStatutoryHoliday;
+import com.dsk.system.mapper.SysPushRecordMapper;
 import com.dsk.system.mapper.SysStatutoryHolidayMapper;
 import com.dsk.system.service.ISysConfigService;
 import com.dsk.system.service.ISysPushService;
@@ -20,10 +22,7 @@ import org.springframework.util.ObjectUtils;
 import javax.annotation.Resource;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 推送相关定时任务
@@ -45,6 +44,9 @@ public class PushTask {
     @Resource
     private SysStatutoryHolidayMapper statutoryHolidayMapper;
 
+    @Resource
+    private SysPushRecordMapper pushRecordMapper;
+
     /**
      * 供应商不良推送(每分钟)
      */
@@ -54,15 +56,22 @@ public class PushTask {
         if (!isPush()) return;
         //2.推送数据（当前时段是否存在数据）
 
+        List<SysPushRecord> records = new ArrayList<>();
         //3.推送人员
         List<SysPush> list = pushService.list(Wrappers.<SysPush>lambdaQuery().eq(SysPush::getStatus, 0));
         if (CollectionUtils.isNotEmpty(list)) {
+            SysPushRecord record = new SysPushRecord();
+
             list.parallelStream().forEach(item -> {
                 Map<String, Object> param = new HashMap<>();
                 param.put("name", item.getName());
 
             });
+
+            records.add(record);
         }
+        //4.添加推送记录
+        records.forEach(item -> pushRecordMapper.insert(item));
     }
 
     //是否推送

dsk-admin/src/main/resources/application.yml

@@ -163,6 +163,7 @@ tenant:
     - sys_user_file_record
     - sys_oss_config
     - sys_region
+    - sys_push_record
     - d_customer
     - d_project
     - d_subcontract
@@ -181,6 +182,7 @@ tenant:
     - d_customer_qualification_certificate
     - d_customer_safety_certificate
     - d_customer_tax_certificate
+    - f_supplier_limited
 
 
 # MyBatisPlus配置

dsk-system/src/main/java/com/dsk/system/domain/SysPush.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
@@ -13,6 +14,7 @@ import lombok.Data;
  * @since 2023-12-14 10:09:24
  */
 @Data
+@TableName("sys_push")
 public class SysPush implements Serializable {
 
     private static final long serialVersionUID = 1L;

dsk-system/src/main/java/com/dsk/system/domain/SysPushRecord.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 推送记录
+ *
+ * @Author lcl
+ * @Data 2024/1/2 17:02
+ */
+@Data
+@TableName("sys_push_record")
+public class SysPushRecord implements Serializable {
+
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 数据id
+     */
+    private String dataId;
+    /**
+     * 推送类型code
+     */
+    private String push_type_code;
+    /**
+     * 推送时间
+     */
+    private Date pushTime;
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/SysPushRecordMapper.java

+package com.dsk.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.SysPush;
+import com.dsk.system.domain.SysPushRecord;
+
+/**
+ * 系统推送记录(SysPushRecord)表数据库访问层
+ *
+ * @author lcl
+ * @since 2023-12-14 10:09:24
+ */
+public interface SysPushRecordMapper extends BaseMapper<SysPushRecord> {
+
+}
+