数据同步问题修复

@@ -8,6 +8,7 @@ import com.skua.modules.system.datestandard.entity.SysMonitorMetricInfo;
 import com.skua.modules.system.datestandard.service.ISysMonitorMetricInfoService;
 import com.skua.modules.system.datestandard.service.ISysMonitorMetricInfoService;
 import com.skua.modules.system.service.IPgService;
 import com.skua.modules.system.service.IPgService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.quartz.Job;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,10 +36,22 @@ public class DayDataSyncJob implements Job {
 	@Autowired
 	@Autowired
 	private IReportDataService reportDataService;
 	private IReportDataService reportDataService;
 
 
+	/**
+	 * 若参数变量名修改 QuartzJobController中也需对应修改
+	 */
+	private String parameter;
+
+	public void setParameter(String parameter) {
+		this.parameter = parameter;
+	}
+
 	@Override
 	@Override
 	public void execute(JobExecutionContext jobExecutionContext) {
 	public void execute(JobExecutionContext jobExecutionContext) {
 		log.info("开始同步昨天的数据入报表");
 		log.info("开始同步昨天的数据入报表");
 		String yesterday = DateUtils.getYesterday();
 		String yesterday = DateUtils.getYesterday();
+		if(StringUtils.isNotEmpty(this.parameter)){
+			yesterday = this.parameter;
+		}
 		DecimalFormat df = new DecimalFormat("######0.0000");
 		DecimalFormat df = new DecimalFormat("######0.0000");
 		List<SysFactoryDevice> deviceList = sysFactoryDeviceService.getList();
 		List<SysFactoryDevice> deviceList = sysFactoryDeviceService.getList();
 		if(deviceList.size() > 0){
 		if(deviceList.size() > 0){
@@ -57,7 +70,12 @@ public class DayDataSyncJob implements Job {
 					}
 					}
 				}
 				}
 				if(!"".equals(fields)){
 				if(!"".equals(fields)){
-					Map<String, Object> dataMap = pgService.queryDayData(fields, deviceId, yesterday);
+					Map<String, Object> dataMap = new HashMap<>();
+					try{
+						dataMap = pgService.queryDayData(fields, deviceId, yesterday);
+					}catch (Exception e){
+						dataMap = new HashMap<>();
+					}
 					Map<String, String> data = new HashMap<>();
 					Map<String, String> data = new HashMap<>();
 					if(dataMap.size() != 0){
 					if(dataMap.size() != 0){
 						if(tagMap.get("CSLL-"+departId)!=null){
 						if(tagMap.get("CSLL-"+departId)!=null){