重做计划增加修改nextGenDate字段

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/service/impl/Safety3DDataSendServiceImpl.java

@@ -294,7 +294,5 @@ public class Safety3DDataSendServiceImpl implements ISafety3DDataSendService {
 			remoteSpcService.pushSpcCheckResult(checkResultPushSpcRequest);
 	        return checkResultPushSpcRequest;
 	}
-
-
 }
 

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/core/util/DateUtil.java

@@ -589,6 +589,20 @@ public class DateUtil {
         return cal.getTime();
     }
 
+    public static Date getDateByWeek(Date date, Integer dayNumber) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.WEEK_OF_YEAR, dayNumber);
+        return cal.getTime();
+    }
+
+    public static Date getDateByMonth(Date date, Integer dayNumber) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.MONTH, dayNumber);
+        return cal.getTime();
+    }
+
     public static Date getHourBeginOfDay(int hour) {
     	Calendar cal = Calendar.getInstance();
     	cal.set(Calendar.HOUR_OF_DAY, hour);
@@ -596,4 +610,14 @@ public class DateUtil {
     	cal.set(Calendar.SECOND, 0);
     	return cal.getTime();
     }
+
+    /**
+     * 获取当前时间
+     *
+     * @return
+     */
+    public static Date format() {
+        Date date = new Date();
+        return date;
+    }
 }

AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/remote/RemoteSecurityService.java

@@ -80,8 +80,6 @@ public class RemoteSecurityService {
     }
     //登录 
 	public Toke come() {
-       
-    	
     	IdPasswordAuthModel  dPasswordAuthModel=new IdPasswordAuthModel();
     	dPasswordAuthModel.setLoginId(loginId);
     	dPasswordAuthModel.setPassword(password);
@@ -97,7 +95,6 @@ public class RemoteSecurityService {
             oked.setToke(map.get("token").toString());
             oked.setProduct(productWeb);
             oked.setAppKey(appKeyWeb);
-            
             }
 	    	 
 	    	 
@@ -209,7 +206,7 @@ public class RemoteSecurityService {
         if (userId == null || userId.equals("")) {
             return null;
         }
-         RequestContext.setToken(toke);
+        RequestContext.setToken(toke);
     	RequestContext.setProduct(product);
     	RequestContext.setAppKey(appKey);
     	AgencyUserModel agencyUserModel=null;