定时任务BUG修复

@@ -98,12 +98,12 @@ public class DayDataSyncJob implements Job {
 						data.put("departId", departId);
 						data.put("departId", departId);
 						data.put("reportId", ReportConstant.view2119);
 						data.put("reportId", ReportConstant.view2119);
 						data.put("time",yesterday);
 						data.put("time",yesterday);
-						//reportDataService.insertOrUpdateReportData(departId, yesterday, data, ReportConstant.view2119);
-						log.info("========="+departId+"数据同步完成"+data);
+						reportDataService.insertOrUpdateReportData(departId, yesterday, data, ReportConstant.view2119);
+//						log.info("========="+departId+"数据同步完成"+data);
 					}
 					}
 				}
 				}
 			}
 			}
-			log.info("同步昨天的数据入报表完成");
+			log.info("同步"+yesterday+"的数据入报表完成");
 		}else {
 		}else {
 			log.info("没有需要同步数据的水厂");
 			log.info("没有需要同步数据的水厂");
 		}
 		}
@@ -124,7 +124,11 @@ public class DayDataSyncJob implements Job {
 												   Map<String, String> tagMap, Map<String, Object> dataMap) {
 												   Map<String, String> tagMap, Map<String, Object> dataMap) {
 		if(tagMap.get(tagCode+"-"+departId)!=null){
 		if(tagMap.get(tagCode+"-"+departId)!=null){
 			if(dataMap.get(tagMap.get(tagCode+"-"+departId)) != null){
 			if(dataMap.get(tagMap.get(tagCode+"-"+departId)) != null){
-				data.put(itemCode, df.format(24*Double.parseDouble(dataMap.get(tagMap.get(tagCode+"-"+departId)).toString())));
+				if("CSLL".equals(tagCode)||"JSLL".equals(tagCode)){
+					data.put(itemCode, df.format(24*Double.parseDouble(dataMap.get(tagMap.get(tagCode+"-"+departId)).toString())));
+				}else{
+					data.put(itemCode, dataMap.get(tagMap.get(tagCode+"-"+departId)).toString());
+				}
 			}else{
 			}else{
 				data.put(itemCode, "");
 				data.put(itemCode, "");
 			}
 			}

@@ -66,11 +66,11 @@ public class NFDataSyncJob implements Job {
 					data.put("reportId", ReportConstant.view2119);
 					data.put("reportId", ReportConstant.view2119);
 					reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view2119);
 					reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view2119);
 				}else if("hyrb".equals(itemType)){
 				}else if("hyrb".equals(itemType)){
-					if(wsFields.indexOf(itemCode) > 0){
+					if(wsFields.contains(itemCode)){
 						data.put(itemCode+"HY", itemValue);
 						data.put(itemCode+"HY", itemValue);
 						data.put("reportId", ReportConstant.view9bff);
 						data.put("reportId", ReportConstant.view9bff);
 						reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view9bff);
 						reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view9bff);
-					}else if(gsFields.indexOf(itemCode) > 0){
+					}else if(gsFields.contains(itemCode)){
 						data.put(itemCode, itemValue);
 						data.put(itemCode, itemValue);
 						data.put("reportId", ReportConstant.view6643);
 						data.put("reportId", ReportConstant.view6643);
 						reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view6643);
 						reportDataService.insertOrUpdateReportData(departId, time, data, ReportConstant.view6643);

@@ -203,11 +203,13 @@ public class SysRoleController {
 			queryWrapper.notLike("role_code","admin");
 			queryWrapper.notLike("role_code","admin");
 		}
 		}
 		if(StringUtils.isNotEmpty(BaseContextHandler.getDeparts())){
 		if(StringUtils.isNotEmpty(BaseContextHandler.getDeparts())){
-			SysDepart sysDepart = sysDepartService.getById(BaseContextHandler.getDeparts());
+			SysDepart sysDepart = sysDepartService.getById(BaseContextHandler.getRealDepartId());
 			if(sysDepart!=null){
 			if(sysDepart!=null){
 				if(!"A01".equals(sysDepart.getOrgCode())){
 				if(!"A01".equals(sysDepart.getOrgCode())){
 					queryWrapper.notLike("role_type","group");
 					queryWrapper.notLike("role_type","group");
 				}
 				}
+			}else{
+				queryWrapper.notLike("role_type","group");
 			}
 			}
 		}
 		}
 		queryWrapper.orderByDesc("create_time");
 		queryWrapper.orderByDesc("create_time");

@@ -72,6 +72,12 @@ public class SysFactoryInfoVO {
 	 */
 	 */
 	@ApiModelProperty(value = "水厂类型")
 	@ApiModelProperty(value = "水厂类型")
 	private String factoryType;
 	private String factoryType;
+
+	/**
+	 * 星标厂区
+	 */
+	@ApiModelProperty(value = "星标厂区")
+	private String factoryStar;
 	/**
 	/**
 	 * 邮编
 	 * 邮编
 	 */
 	 */