修改计算周期方法

cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -499,7 +499,11 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		int housTime = openTime.getHours() - 1;
 		openTime.setHours(housTime);
 		String lastOpenTime = sdf1.format(openTime);
-		Date lastOpenTimeDate = sdf1.parse(lastOpenTime + "59:59");
+		Date lastOpenTimeDate = sdf1.parse(lastOpenTime);
+		//此处直接拼接字符串“59:59”会导致分和秒丢失，所以才去set的方法设置时分秒
+		lastOpenTimeDate.setMinutes(59);
+		lastOpenTimeDate.setSeconds(59);
+		logger.info("当前开合时间减一小时的时间条件："+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(lastOpenTimeDate));
 		MouldHistoryTimeExample mExp = new MouldHistoryTimeExample();
 		mExp.setOrderByClause("open_time desc limit 1");
 		mExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo())
@@ -711,6 +715,14 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 	public static void main(String[] args) throws ParseException {
 		// UserHandler h = new UserHandler();
 		// h.timeCalibration();
+		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:");
+		Date date = new Date();
+		String lastOpenTime = sdf1.format(date);
+		System.out.println(lastOpenTime);
+		Date lastOpenTimeDate = sdf1.parse(lastOpenTime);
+		lastOpenTimeDate.setMinutes(59);
+		lastOpenTimeDate.setSeconds(59);
+		System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(lastOpenTimeDate));
 		String a = "00:25:32";
 		SimpleDateFormat s = new SimpleDateFormat("HH:mm:ss");
 		Date d = new Date();