tangpy test

src/main/java/com/steerinfo/ems/emsetiming/service/impl/EmsETimingServiceImpl.java

@@ -241,7 +241,7 @@ public class EmsETimingServiceImpl extends BaseServiceImpl<EmsETiming, String> i
 			}
 		}
 		try {
-		// 1小时30分钟后，更新前一小时表数据(采集器有延时)
+		// 1小时12分钟后，更新前一小时表数据(采集器有延时)
 		Calendar cal = Calendar.getInstance();
 		int minute = cal.get(Calendar.MINUTE);
 		if(minute>=13 && minute < 25){

src/main/java/com/steerinfo/ems/trmbalancevalue/service/impl/TRmBalanceValueServiceImpl.java

@@ -84,7 +84,7 @@ public class TRmBalanceValueServiceImpl extends BaseServiceImpl<TRmBalanceValue,
 				this.restatData(tRmActItem.getItemid(), clockd, "DAY");
 			}
 		}
-		// 每月前3天生成上月数据
+		// 每月前1天生成上月数据
 		if(c.get(Calendar.DAY_OF_MONTH) == 1){
 			for (TRmActItem tRmActItem : bs) {
 				if(TimegranidUtils.getTimegranidList(tRmActItem.getMintimegranid()).contains("MONTH")){
@@ -92,7 +92,7 @@ public class TRmBalanceValueServiceImpl extends BaseServiceImpl<TRmBalanceValue,
 				}
 			}
 		}
-		// 每年前3天生成去年数据
+		// 每年前1天生成去年数据
 		if(c.get(Calendar.DAY_OF_YEAR) == 1){
 			for (TRmActItem tRmActItem : bs) {
 				this.restatData(tRmActItem.getItemid(), clocky, "YEAR");

src/main/java/com/steerinfo/ems/trmindexitem/controller/TRmIndexItemController.java

@@ -275,7 +275,7 @@ public class TRmIndexItemController extends BaseRESTfulController {
 		Formula formula = new Formula();
 		formula.setClock(DateUtils.getCurrentTime("yyyyMM"));
 		formula.setCode(itemid);
-		formula.setDescription(trmfactoryName+trmworkprocName+trmenergyName+yongtu+indexName);
+            formula.setDescription(trmfactoryName+trmworkprocName+trmenergyName+yongtu+indexName);
 		formula.setSourcecode("R(T_RM_INDEX_VALUE," + itemid + ")");
 		formula.setIsavailable("1");
 		formula.setRevisetime(DateUtils.getCurrentTime("yyyy-MM-dd HH:mm:ss"));