From 76a95a64d247f75f590fab9c40f2336f08643630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Tue, 28 Oct 2025 13:43:45 +0800 Subject: [PATCH] =?UTF-8?q?QMS=E8=B4=A8=E9=87=8F=E4=BB=A3=E7=A0=81=20=20?= =?UTF-8?q?=E5=88=86=E6=89=B9=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 28 +++++++ .../java/com/heai/common/utils/Constant.java | 1 + .../java/com/heai/common/utils/DateUtils.java | 80 +++++++++++++++++++ .../java/com/heai/config/RedisConfig.java | 15 ++++ .../heai/modules/oss/entity/SysOssEntity.java | 15 +++- 5 files changed, 138 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76417a1..5d76874 100644 --- a/pom.xml +++ b/pom.xml @@ -260,6 +260,20 @@ lombok ${lombok.version} + + com.alibaba + easyexcel + 3.3.2 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.7 + + + org.springframework.boot + spring-boot-starter-mail + @@ -334,6 +348,20 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + -XDignore.symbol.file + + true + + diff --git a/src/main/java/com/heai/common/utils/Constant.java b/src/main/java/com/heai/common/utils/Constant.java index 540934b..bcc961f 100644 --- a/src/main/java/com/heai/common/utils/Constant.java +++ b/src/main/java/com/heai/common/utils/Constant.java @@ -45,6 +45,7 @@ public class Constant { /** * 菜单类型 */ + public static final Integer ONE = 1; public enum MenuType { /** * 目录 diff --git a/src/main/java/com/heai/common/utils/DateUtils.java b/src/main/java/com/heai/common/utils/DateUtils.java index be06838..4f9da0d 100644 --- a/src/main/java/com/heai/common/utils/DateUtils.java +++ b/src/main/java/com/heai/common/utils/DateUtils.java @@ -2,14 +2,19 @@ package com.heai.common.utils; +import cn.hutool.core.date.DateUtil; import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; +import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.logging.Level; +import java.util.logging.Logger; /** * 日期处理 @@ -86,6 +91,81 @@ public class DateUtils { return dateTime.plusSeconds(seconds).toDate(); } + public static String getStringDate(Date date) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + return sdf.format(date); + } + + public static String getStringNow() { + SimpleDateFormat sdf = new SimpleDateFormat(DATE_TIME_PATTERN); + return sdf.format(new Date()); + } + + public static Date getStringToDate(String time,String format) { + SimpleDateFormat sdf = new SimpleDateFormat(format); + try { + return sdf.parse(time); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + public static int differentDays (Date date1, Date date2) { + Calendar cal1 = Calendar.getInstance(); + cal1.setTime(date1); + Calendar cal2 = Calendar.getInstance(); + cal2.setTime(date2); + int day1= cal1.get(Calendar.DAY_OF_YEAR); + int day2 = cal2.get(Calendar.DAY_OF_YEAR); + + int year1 = cal1.get(Calendar.YEAR); + int year2 = cal2.get(Calendar.YEAR); + if(year1 != year2) { // 同一年 + int timeDistance = 0 ; + for(int i = year1; i < year2; i ++) { + if(i % 4 == 0 && i % 100 != 0 || i % 400 == 0) { // 闰年 + timeDistance += 366; + } else { // 不是闰年 + timeDistance += 365; + } + } + return timeDistance + (day2-day1); + } else { // 不同年 + return day2 - day1; + } + } + + /** + * 比较两个日期的大小： + * 2 发生异常 + * 1 firstDate>secondDate + * 0 firstDate==secondDate + * -1 firstDatesDate.getTime()){ + result = 1; + }else if(fDate.getTime()==sDate.getTime()){ + result = 0; + }else{ + result = -1; + } + } catch (ParseException ex) { + Logger.getLogger(DateUtil.class.getName()).log(Level.SEVERE, null, ex); + } + return result; + } + /** * 对日期的【分钟】进行加/减 * diff --git a/src/main/java/com/heai/config/RedisConfig.java b/src/main/java/com/heai/config/RedisConfig.java index 8f14cee..70af3d3 100644 --- a/src/main/java/com/heai/config/RedisConfig.java +++ b/src/main/java/com/heai/config/RedisConfig.java @@ -5,8 +5,10 @@ package com.heai.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.*; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.serializer.StringRedisSerializer; /** @@ -29,6 +31,19 @@ public class RedisConfig { redisTemplate.setConnectionFactory(factory); return redisTemplate; } + /** + * 创建Redis消息监听器 + * + * @param connectionFactory + * @return + */ + @Bean + @Primary + public RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory) { + RedisMessageListenerContainer container = new RedisMessageListenerContainer(); + container.setConnectionFactory(connectionFactory); + return container; + } @Bean public HashOperations hashOperations(RedisTemplate redisTemplate) { diff --git a/src/main/java/com/heai/modules/oss/entity/SysOssEntity.java b/src/main/java/com/heai/modules/oss/entity/SysOssEntity.java index 29efbe5..8b0304d 100644 --- a/src/main/java/com/heai/modules/oss/entity/SysOssEntity.java +++ b/src/main/java/com/heai/modules/oss/entity/SysOssEntity.java @@ -3,8 +3,10 @@ package com.heai.modules.oss.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.heai.common.utils.QueryPage; import lombok.Data; import java.io.Serializable; @@ -16,7 +18,7 @@ import java.util.Date; */ @Data @TableName("sys_oss") -public class SysOssEntity implements Serializable { +public class SysOssEntity extends QueryPage implements Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.AUTO) @@ -40,10 +42,21 @@ public class SysOssEntity implements Serializable { private String orderRef3; + private String orderRef4; + + private String orderRef5; + private String fileSuffix; private String fileTypeCode; private String businessType; + private String cAdditionalInfo; + + @TableField(exist = false) + private String documentType; + + private String conclusion; + }