QMS质量代码 分批提交1

pom.xml

@@ -260,6 +260,20 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -334,6 +348,20 @@
                 </configuration>
                 <!-- 运行命令 mvn clean package docker:build 打包并生成docker镜像 -->
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <compilerArgs>
+                        <arg>-XDignore.symbol.file</arg>
+                    </compilerArgs>
+                    <fork>true</fork>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

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 {
         /**
          * 目录

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 firstDate<secondDate
+     * @param format
+     * @param firstDate
+     * @param secondDate
+     * @return
+     */
+    public static int compareDate(String format,String firstDate, String secondDate){
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        int result = 2;
+        try {
+            Date fDate = sdf.parse(firstDate);
+            Date sDate = sdf.parse(secondDate);
+
+            if(fDate.getTime()>sDate.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;
+    }
+
     /**
      * 对日期的【分钟】进行加/减
      *

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<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {

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;
+
 }