Merge remote-tracking branch 'origin/master'

.gitignore

@@ -12,3 +12,9 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+
+log
+.idea
+*.iml
+/target/
+/log/

csc-szls-common-utils.iml

@@ -30,9 +30,6 @@
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
@@ -105,6 +102,38 @@
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.10.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.6.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:annotations:2.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.guava:guava:11.0.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.4.26" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-jwt:1.0.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.2.RELEASE" level="project" />

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

@@ -16,13 +16,11 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 public class ProcessToBeDone {
 
-    private Integer id;
+    private String title;
 
-    private String title;//：流程名称，如 科长每2周粮情检查
+    private String usersInfo;//用户
 
-    private Integer houseId;//仓号
-
-    private Integer depotId;//公司
+//    private String timePeriod;//检查周期
 
     private Date startDate;//办理开始时间
 
@@ -30,7 +28,5 @@ public class ProcessToBeDone {
 
     private String toPage;//办理页面url
 
-    private Integer userId;//待办人员ID
-
     private String type;//流程类型
 }

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

@@ -184,29 +184,45 @@ public class DateUtil {
     }
 
     /**
-     * 获取当前日期0时0分0秒的日期
+     * 获取当前日期 0时0分0秒 的日期
      * @return
      */
     public static Date getCurrDate() {
+        return getCurrDate(0, 0, 0);
+    }
+
+    /**
+     * 获取当前日期 hour时minute分second秒 的日期
+     * @return
+     */
+    public static Date getCurrDate(int hour, int minute, int second) {
         Date date = new Date();
 
         Calendar c = Calendar.getInstance();
         c.setTime(date);
         c.setLenient(true);
 
-        c.set(Calendar.HOUR_OF_DAY, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
+        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();
     }
 
     /**
-     * 获取当前周星期一0时0分0秒的日期
+     * 获取当前周星期一 0时0分0秒 的日期
      * @return
      */
     public static Date getFirstDateOfCurrWeek() {
+        return getFirstDateOfCurrWeek(0, 0, 0);
+    }
+
+    /**
+     * 获取当前周星期一 hour时minute分second秒 的日期
+     * @return
+     */
+    public static Date getFirstDateOfCurrWeek(int hour, int minute, int second) {
         Date date = new Date();
 
         Calendar c = Calendar.getInstance();
@@ -214,19 +230,27 @@ public class DateUtil {
         c.setLenient(true);
 
         c.set(Calendar.DAY_OF_WEEK, 2);//星期一：2
-        c.set(Calendar.HOUR_OF_DAY, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
+        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();
     }
 
     /**
-     * 获取当前月第一天0时0分0秒的日期
+     * 获取当前月第一天 0时0分0秒 的日期
      * @return
      */
     public static Date getFirstDateOfCurrMonth() {
+        return getFirstDateOfCurrMonth(0, 0, 0);
+    }
+
+    /**
+     * 获取当前月第一天 hour时minute分second秒 的日期
+     * @return
+     */
+    public static Date getFirstDateOfCurrMonth(int hour, int minute, int second) {
         Date date = new Date();
 
         Calendar c = Calendar.getInstance();
@@ -234,19 +258,27 @@ public class DateUtil {
         c.setLenient(true);
 
         c.set(Calendar.DAY_OF_MONTH, 1);
-        c.set(Calendar.HOUR_OF_DAY, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
+        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();
     }
 
     /**
-     * 获取当前季度第一天0时0分0秒的日期
+     * 获取当前季度第一天 0时0分0秒 的日期
      * @return
      */
     public static Date getFirstDateOfCurrSeason() {
+        return getFirstDateOfCurrSeason(0, 0, 0);
+    }
+
+    /**
+     * 获取当前季度第一天 hour时minute分second秒 的日期
+     * @return
+     */
+    public static Date getFirstDateOfCurrSeason(int hour, int minute, int second) {
         Date date = new Date();
 
         Calendar c = Calendar.getInstance();
@@ -257,19 +289,27 @@ public class DateUtil {
         c.set(Calendar.MONTH, month / 3 * 3);
 
         c.set(Calendar.DAY_OF_MONTH, 1);
-        c.set(Calendar.HOUR_OF_DAY, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
+        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();
     }
 
     /**
-     * 获取当前年第一天0时0分0秒的日期
+     * 获取当前年第一天 0时0分0秒 的日期
      * @return
      */
     public static Date getFirstDateOfCurrYear() {
+        return getFirstDateOfCurrYear(0, 0, 0);
+    }
+
+    /**
+     * 获取当前年第一天 hour时minute分second秒 的日期
+     * @return
+     */
+    public static Date getFirstDateOfCurrYear(int hour, int minute, int second) {
         Date date = new Date();
 
         Calendar c = Calendar.getInstance();
@@ -277,9 +317,9 @@ public class DateUtil {
         c.setLenient(true);
 
         c.set(Calendar.DAY_OF_YEAR, 1);
-        c.set(Calendar.HOUR_OF_DAY, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
+        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();
@@ -296,24 +336,24 @@ public class DateUtil {
 //        System.out.println(sdf.format(getCurrHour()));
 //        System.out.println(getCurrHour());
 
-//        System.out.println(sdf.format(getCurrDate()));
-//        System.out.println(getCurrDate());
+        System.out.println(sdf.format(getCurrDate(8,0,0)));
+        System.out.println(getCurrDate());
 //
-//        System.out.println(sdf.format(getFirstDateOfCurrWeek()));
+//        System.out.println(sdf.format(getFirstDateOfCurrWeek(8,0,0)));
 //        System.out.println(getFirstDateOfCurrWeek());
 //
-//        System.out.println(sdf.format(getFirstDateOfCurrMonth()));
+//        System.out.println(sdf.format(getFirstDateOfCurrMonth(8,0,0)));
 //        System.out.println(getFirstDateOfCurrMonth());
 //
-//        System.out.println(sdf.format(getFirstDateOfCurrSeason()));
+//        System.out.println(sdf.format(getFirstDateOfCurrSeason(8,0,0)));
 //        System.out.println(getFirstDateOfCurrSeason());
 //
-//        System.out.println(sdf.format(getFirstDateOfCurrYear()));
+//        System.out.println(sdf.format(getFirstDateOfCurrYear(8,0,0)));
 //        System.out.println(getFirstDateOfCurrYear());
 //
-        System.out.println(sdf.format(aheadOfYears(new Date(), 2)));
-        System.out.println(sdf.format(aheadOfSeasons(new Date(), 1)));
-        System.out.println(sdf.format(aheadOfMonths(new Date(), 1)));
+//        System.out.println(sdf.format(aheadOfYears(new Date(), 2)));
+//        System.out.println(sdf.format(aheadOfSeasons(new Date(), 1)));
+//        System.out.println(sdf.format(aheadOfMonths(new Date(), 1)));
 
 //        System.out.println(sdf.format(aheadOfWeeks(new Date(), 2)));
 //        System.out.println(sdf.format(aheadOfDays(new Date(), 1)));