Commit 95218239 authored by xinglei's avatar xinglei

重做计划增加修改nextGenDate字段

parent c2979340
...@@ -294,7 +294,5 @@ public class Safety3DDataSendServiceImpl implements ISafety3DDataSendService { ...@@ -294,7 +294,5 @@ public class Safety3DDataSendServiceImpl implements ISafety3DDataSendService {
remoteSpcService.pushSpcCheckResult(checkResultPushSpcRequest); remoteSpcService.pushSpcCheckResult(checkResultPushSpcRequest);
return checkResultPushSpcRequest; return checkResultPushSpcRequest;
} }
} }
...@@ -589,6 +589,20 @@ public class DateUtil { ...@@ -589,6 +589,20 @@ public class DateUtil {
return cal.getTime(); 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) { public static Date getHourBeginOfDay(int hour) {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.set(Calendar.HOUR_OF_DAY, hour); cal.set(Calendar.HOUR_OF_DAY, hour);
...@@ -596,4 +610,14 @@ public class DateUtil { ...@@ -596,4 +610,14 @@ public class DateUtil {
cal.set(Calendar.SECOND, 0); cal.set(Calendar.SECOND, 0);
return cal.getTime(); return cal.getTime();
} }
/**
* 获取当前时间
*
* @return
*/
public static Date format() {
Date date = new Date();
return date;
}
} }
...@@ -80,8 +80,6 @@ public class RemoteSecurityService { ...@@ -80,8 +80,6 @@ public class RemoteSecurityService {
} }
//登录 //登录
public Toke come() { public Toke come() {
IdPasswordAuthModel dPasswordAuthModel=new IdPasswordAuthModel(); IdPasswordAuthModel dPasswordAuthModel=new IdPasswordAuthModel();
dPasswordAuthModel.setLoginId(loginId); dPasswordAuthModel.setLoginId(loginId);
dPasswordAuthModel.setPassword(password); dPasswordAuthModel.setPassword(password);
...@@ -97,7 +95,6 @@ public class RemoteSecurityService { ...@@ -97,7 +95,6 @@ public class RemoteSecurityService {
oked.setToke(map.get("token").toString()); oked.setToke(map.get("token").toString());
oked.setProduct(productWeb); oked.setProduct(productWeb);
oked.setAppKey(appKeyWeb); oked.setAppKey(appKeyWeb);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment