添加工具类及VO类

src/main/java/com/unissoft/dto/MessageVO.java

@@ -0,0 +1,41 @@
+package com.unissoft.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+@Data
+public class MessageVO implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    private Integer id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 接收的用户id
+     */
+    private Collection<Integer> toUserIds;
+
+    /**
+     * 是否广播
+     */
+    private boolean broadcast;
+
+    /**
+     * 类型：10注意，20完成，30警告
+     */
+    private Integer type;
+
+}

src/main/java/com/unissoft/dto/ProcessToBeDone.java

@@ -20,8 +20,6 @@ public class ProcessToBeDone {
 
     private String usersInfo;//用户
 
-//    private String timePeriod;//检查周期
-
     private Date startDate;//办理开始时间
 
     private Date endDate;//办理结束时间

src/main/java/com/unissoft/dto/SendNoticeVO.java

@@ -0,0 +1,22 @@
+package com.unissoft.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Map;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SendNoticeVO {
+
+    /**
+     * 用户信息，key为用户Id, value为用户姓名
+     */
+    private Map<Integer, String> users;
+
+    /**
+     * 通知信息
+     */
+    private SysNoticeVO sysNoticeVO;//通知信息
+
+}

src/main/java/com/unissoft/dto/SysNoticeVO.java

@@ -0,0 +1,65 @@
+package com.unissoft.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author root
+ * @since 2020-12-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SysNoticeVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 通知类型：10系统、20待办、30审批通过、40审批不通过、50警告
+     */
+    private Integer noticeType;
+
+    /**
+     * 通知时间
+     */
+    private Date noticeTime;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 通知内容
+     */
+    private String content;
+
+    /**
+     * 仓号
+     */
+    private String warehouse;
+
+    /**
+     * 公司
+     */
+    private String orgName;
+
+    /**
+     * 申请人
+     */
+    private String applyName;
+
+    /**
+     * 申请部门
+     */
+    private String applyDept;
+
+}

src/main/java/com/unissoft/dto/ToBeDoneCallbackVO.java

@@ -0,0 +1,33 @@
+package com.unissoft.dto;
+
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 流程待办回调DTO
+ *
+ * @author YangZR
+ * @date 2020年01月11日 15:34
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ToBeDoneCallbackVO {
+
+    private Integer toBeDoneId;
+
+    private Integer userId;
+
+    private String personnelName;
+
+    private Integer depotId;
+
+    private String depotName;
+
+    private Integer houseId;
+
+    private String houseName;
+
+//    private String title;
+
+}

src/main/java/com/unissoft/utils/DateUtil.java

@@ -149,40 +149,50 @@ public class DateUtil {
     }
 
     /**
-     * 获取当前时间0秒的日期
+     * 获取具体指定的时间
+     * @param date
+     * @param hour
+     * @param minute
+     * @param second
      * @return
      */
-    public static Date getCurrMinute() {
-        Date date = new Date();
-
+    public static Date getSpecificDate(Date date, Integer hour, Integer minute, Integer second) {
         Calendar c = Calendar.getInstance();
         c.setTime(date);
         c.setLenient(true);
 
-        c.set(Calendar.SECOND, 0);
+        if(null != hour) {
+            c.set(Calendar.HOUR_OF_DAY, hour);
+        }
+        if(null != minute) {
+            c.set(Calendar.MINUTE, minute);
+        }
+        if(null != second) {
+            c.set(Calendar.SECOND, second);
+        }
         c.set(Calendar.MILLISECOND, 0);
-
         return c.getTime();
     }
 
     /**
+     * 获取当前时间0秒的日期
+     * @return
+     */
+    public static Date getCurrMinute() {
+        Date date = new Date();
+        return getSpecificDate(date, null, null, 0);
+    }
+
+    /**
      * 获取当前时间0分0秒的日期
      * @return
      */
     public static Date getCurrHour() {
         Date date = new Date();
-
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        c.setLenient(true);
-
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
-        c.set(Calendar.MILLISECOND, 0);
-
-        return c.getTime();
+        return getSpecificDate(date, null, 0, 0);
     }
 
+
     /**
      * 获取当前日期 0时0分0秒 的日期
      * @return
@@ -195,19 +205,9 @@ public class DateUtil {
      * 获取当前日期 hour时minute分second秒 的日期
      * @return
      */
-    public static Date getCurrDate(int hour, int minute, int second) {
+    public static Date getCurrDate(Integer hour, Integer minute, Integer second) {
         Date date = new Date();
-
-        Calendar c = Calendar.getInstance();
-        c.setTime(date);
-        c.setLenient(true);
-
-        c.set(Calendar.HOUR_OF_DAY, hour);
-        c.set(Calendar.MINUTE, minute);
-        c.set(Calendar.SECOND, second);
-        c.set(Calendar.MILLISECOND, 0);
-
-        return c.getTime();
+        return getSpecificDate(date, hour, minute, second);
     }
 
     /**
@@ -362,6 +362,9 @@ public class DateUtil {
 
 //        Date date = evenMinuteDate(new Date());
 //        System.out.println(sdf.format(date));
+
+        String cron = getCron(new Date());
+        System.out.println(cron);
     }
 
     /**
@@ -433,4 +436,32 @@ public class DateUtil {
     public static Date aheadOfMinutes(Date date, int minutes) {
         return DateUtils.addMinutes(date, 0 - minutes);
     }
+
+
+    /**
+     * 功能描述：日期转换cron表达式
+     * @param date
+     * @param dateFormat
+     * @return
+     */
+    public static String formatDateByPattern(Date date, String dateFormat){
+        String result = null;
+        SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+        if (date != null) {
+            result = sdf.format(date);
+        }
+        return result;
+    }
+
+    /**
+     * 日期转换cron表达式
+     * @param date
+     * @return
+     */
+    public static String getCron(Date  date){
+        String dateFormat="ss mm HH dd MM ? yyyy";
+        return formatDateByPattern(date, dateFormat);
+    }
+
+
 }