增加参数控制对定时任务的运行与否，如果是debug模式（本地开发模式），不启动。

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -83,9 +83,18 @@ public class MQTask implements InitializingBean {
 	private Object lock = new Object();
 	private Object lock1 = new Object();
 
-	public void afterPropertiesSet() throws Exception {
+	private static boolean isDebug = false;
+
+	static {
+		String debug = System.getProperty("isDebug");
+		if ("true".equalsIgnoreCase(debug)) {
+			isDebug = true;
+		}
 	}
 
+	@Override
+	public void afterPropertiesSet() throws Exception {}
+
 	//@Scheduled(cron = "*/10 * * * * ?")
 	//@Scheduled(cron = "0 0 9,11,14,16,18,20 * * ? ")//推送时间分别为每天早上九点、中午十一点、下午三点、下午六点、晚上八点
 	//@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
@@ -230,109 +239,6 @@ public class MQTask implements InitializingBean {
 		}
 	}
 
-	/**客诉系统  自动追踪发货信息**/
-//	@Scheduled(cron = "0 0/30 * * * ?")//每30分钟执行一次
-	/*@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次*/
-//	public void synchronousDelivery()throws Exception{
-//
-//
-//		/*同步维修订单*/
-//		Repair repair = new Repair();
-//		List<Repair> listRepair = repairService.listSynchronizingRepair(repair);
-//		if(listRepair.size() > 0){
-//			for(Repair re:listRepair){
-//					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRepairBackEfastOrderId());
-//					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
-//					if(efastOrder == null){
-//						return;
-//					}
-//					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
-//						re.setRepairSendName(efastOrder.getOrderAddressName());
-//						re.setRepairSendTel(efastOrder.getOrderAddressTel());
-//						//查询省市县id
-//						/*Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
-//						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
-//						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
-//						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));*/
-//						/*re.setRepairSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));*/
-//						/*re.setRepairSendAddress(efastOrder.getOrderAddress());*/
-//						re.setRepairSendLogisticsCompany(efastOrder.getOrderPostFirm());
-//						re.setRepairSendLogisticsNo(efastOrder.getOrderPostNum());
-//						/*re.setRepairSendStatus(2);*/
-//						Integer msg = repairService.updateRepairInfo(re,null,null);
-//						if(msg > 0){
-//							//发送维修发货通知短信
-//							sendSMS("<维修业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRepairBackTel());
-//						}
-//					}
-//
-//			}
-//		}
-//
-//		/*同步换货订单*/
-//		Renewed renewed = new Renewed();
-//		List<Renewed> listRenewed = renewedService.listSynchronizingRenewed(renewed);
-//		if(listRenewed.size() > 0){
-//			for(Renewed re:listRenewed){
-//					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRenewedBackEfastOrderId());
-//					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
-//					if(efastOrder == null){
-//						return;
-//					}
-//					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
-//						re.setRenewedSendName(efastOrder.getOrderAddressName());
-//						re.setRenewedSendTel(efastOrder.getOrderAddressTel());
-//						/*//查询省市县id
-//						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
-//						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
-//						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
-//						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
-//						re.setRenewedSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
-//						re.setRenewedSendAddress(efastOrder.getOrderAddress());*/
-//						re.setRenewedSendLogisticsCompany(efastOrder.getOrderPostFirm());
-//						re.setRenewedSendLogisticsNo(efastOrder.getOrderPostNum());
-//						/*re.setRenewedSendStatus(2);*/
-//						Integer msg = renewedService.updateRenewedInfo(re,null,null);
-//						if(msg > 0){
-//							//发送换货发货通知短信
-//							sendSMS("<换货业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRenewedBackTel());
-//						}
-//					}
-//			}
-//		}
-//		/*同步补发订单*/
-//		Reissue reissue = new Reissue();
-//		List<Reissue> listReissue = reissueService.listSynchronizingReissue(reissue);
-//		if(listReissue.size() > 0){
-//			for(Reissue re:listReissue){
-//					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getReissueBackEfastOrderId());
-//					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
-//					if(efastOrder == null){
-//						return;
-//					}
-//					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
-//						re.setReissueSendName(efastOrder.getOrderAddressName());
-//						re.setReissueSendTel(efastOrder.getOrderAddressTel());
-//						/*//查询省市县id
-//						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
-//						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
-//						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
-//						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
-//						re.setReissueSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
-//						re.setReissueSendAddress(efastOrder.getOrderAddress());*/
-//						re.setReissueSendLogisticsCompany(efastOrder.getOrderPostFirm());
-//						re.setReissueSendLogisticsNo(efastOrder.getOrderPostNum());
-//						/*re.setReissueSendStatus(2);*/
-//						Integer msg = reissueService.updateReissueInfo(re);
-//						if(msg > 0){
-//							//发送补发发货通知短信
-//							sendSMS("<补发业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getReissueSendTel());
-//
-//						}
-//					}
-//			}
-//		}
-//	}
 
 
 	/**
@@ -372,95 +278,15 @@ public class MQTask implements InitializingBean {
 		}
 	}
 
-	/**
-	 * 查询省市县id
-	 * @param
-	 */
-//	public Map<String,String> provincesCitiesCounties(EfastOrder efastOrder){
-//		Map<String,String> map = new HashMap<String, String>();
-//		String province = "";
-//		String city = "";
-//		String zone = "";
-//		//省
-//		if(efastOrder.getOrderProvince().substring(efastOrder.getOrderProvince().length() - 1,efastOrder.getOrderProvince().length()).equals("省")){
-//			province = efastOrder.getOrderProvince().substring(0,efastOrder.getOrderProvince().length() - 1);
-//		}else{
-//			province = efastOrder.getOrderProvince();
-//		}
-//		Province provinceinfo = new Province();
-//		provinceinfo.setProvince(province);
-//		List<Province> provinceList = addressService.listProvince(provinceinfo);
-//		if(provinceList.size() < 1){
-//			provinceinfo.setProvince(null);
-//			provinceList = addressService.listProvince(provinceinfo);
-//		}
-//		map.put("provinceId",String.valueOf(provinceList.get(0).getProvinceId()));
-//		map.put("province",provinceList.get(0).getProvince());
-//
-//
-//		//市
-//		city = efastOrder.getOrderCity().substring(0,efastOrder.getOrderCity().length() - 1);
-//		City cityInfo = new City();
-//		cityInfo.setCity(city);
-//		List<City> cityList = addressService.listCity(cityInfo);
-//		if(cityList.size() < 1){
-//			cityInfo.setCity(null);
-//			cityInfo.setProvinceId(provinceList.get(0).getProvinceId());
-//			cityList = addressService.listCity(cityInfo);
-//		}
-//		map.put("cityId",String.valueOf(cityList.get(0).getCityId()));
-//		map.put("city",cityList.get(0).getCity());
-//
-//		//区
-//		zone = efastOrder.getOrderArea().substring(0,efastOrder.getOrderArea().length() - 1);
-//		District district = new  District();
-//		district.setDistrict(zone);
-//		List<District> districtList = addressService.listDistrict(district);
-//		if(districtList.size() < 1){
-//			district.setDistrict(null);
-//			district.setCityId(cityList.get(0).getCityId());
-//			districtList = addressService.listDistrict(district);
-//		}
-//		map.put("districtId",String.valueOf(districtList.get(0).getDistrictId()));
-//		map.put("district",districtList.get(0).getDistrict());
-//		return map;
-//	}
-
-
-	/**客诉系统  自动追踪发货信息**/
-//	@Scheduled(cron = "0 0/60 * * * ?")//每60分钟执行一次
-//	@Scheduled(cron = "0 0/1 * * * ?")//每1分钟执行一次
-//	public void syncSendBackCustomer()throws Exception{
-//		CmRelation cmRelation = new CmRelation();
-//		cmRelation.setRelationBackStatus(2);
-//		List<CmRelation> cmRelationList = cmRelationService.getCmRelationList(cmRelation);
-//		for(int i=0;i<cmRelationList.size();i++){
-//			CmRelation cc = cmRelationList.get(i);
-//			if(!StringUtils.isEmpty(cc.getRelationBackLogisticsCompany()) && !StringUtils.isEmpty(cc.getRelationBackLogisticsNo())){
-//				JSONObject rst = kuaidi100.getExpressInfo(cc.getRelationBackLogisticsCompany(),cc.getRelationBackLogisticsNo());
-//				if(rst.has("state") && rst.getInt("state") == 3){	//当快递状态为已签收的时候
-//					Integer flag = 0;
-//					try{
-//						flag = cmRelationService.updateStatus(cc);
-//					}catch (RuntimeException e){
-//						logger.info("====== 客诉寄回签收报错 ：客诉id："+cc.getCustomerId()+" ======"+e.getMessage());
-//					}
-//					if(flag < 1){
-//						logger.info("====== 客诉寄回签收失败 ：客诉id："+cc.getCustomerId()+" ======");
-//					}else{
-//						logger.info("====== 客诉寄回签收成功 ：客诉id："+cc.getCustomerId()+" ======");
-//					}
-//				}
-//			}
-//		}
-//	}
-
 
 	/**客诉系统  自动追踪发货信息**/
 //	@Scheduled(cron = "0 0/2 * * * ?")//每2分钟执行一次
 	@Scheduled(cron = "0 0 9 * * ?")//每天上午午9点触发
 	public void postageRemind()throws Exception{
-
+		if (isDebug) {
+			logger.info("debug模式，无法运行正式任务");
+			return;
+		}
 		Map<Integer,Integer> map = new HashMap<Integer,Integer>();
 
 		List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
@@ -556,6 +382,10 @@ public class MQTask implements InitializingBean {
 	@Scheduled(cron = "0 50 8 * * ?")//每天上午午9点触发
 /*	@Scheduled(cron = "0 0/1 * * * ?")//每2分钟执行一次*/
 	public void detectTimeoutNotice() throws Exception {
+		if (isDebug) {
+			logger.info("debug模式，无法运行正式任务");
+			return;
+		}
 		logger.info("---------------- 询维修超时数据并短信通知开始 ---------------");
 		//待检测即将超时数据
 		List<ComplaintDetectInfo>  listMaintenanceCut = complaintDetectInfoService.listMaintenanceCutNotice();
@@ -587,12 +417,12 @@ public class MQTask implements InitializingBean {
 		logger.info("---------------- 询维修超时数据并短信通知结束 ---------------");
 	}
 
-	//@Scheduled(cron = "*/10 * * * * ?")
-	//@Scheduled(cron = "0 0 9,11,14,16,18,20 * * ? ")//推送时间分别为每天早上九点、中午十一点、下午三点、下午六点、晚上八点
-	//@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
-	/*@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次*/
 	@Scheduled(cron = "0 0/30 * * * ?")//每半个小时执行一次
 	public void orderCaseDate(){
+		if (isDebug) {
+			logger.info("debug模式，无法运行正式任务");
+			return;
+		}
 		logger.info("查询订单揽件时间");
 		List<SalesOrder> salesOrderList = salesOrderService.orderAfterCaseDate();
 		if (salesOrderList == null || salesOrderList.isEmpty()) {
@@ -628,6 +458,10 @@ public class MQTask implements InitializingBean {
 //	@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 	@Scheduled(cron = "0 0/10 * * * ?")//每十分钟执行一次
 	public void syncXytOrder(){
+		if (isDebug) {
+			logger.info("debug模式，无法运行正式任务");
+			return;
+		}
 		logger.info("-----定时拉取小亚通订单-开始----");
 		Integer num = orderSyncLogService.syncXYTOrder(1,"20",null);
 		logger.info("-----定时拉取小亚通订单,拉取订单数量："+ num +"-结束----");
@@ -639,9 +473,12 @@ public class MQTask implements InitializingBean {
 //	@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次
 	@Scheduled(fixedDelay = 3_600_000, initialDelay = 3_000)//每小时执行一次
 	public void syncXytOrderPostNum(){
+		if (isDebug) {
+			logger.info("debug模式，无法运行正式任务");
+			return;
+		}
 		logger.info("-----定时拉取拉取京东自发订单的发货状态-开始----");
 		SalesOrder salesOrder = new SalesOrder();
-//		salesOrder.setSalesStatus(4);
 		salesOrder.setSalesSendType(3);
 		List<SalesOrder> salesOrderList = salesOrderService.getSalesOrderListConcise(salesOrder);
 		for (SalesOrder so:salesOrderList) {
@@ -657,6 +494,10 @@ public class MQTask implements InitializingBean {
 	 */
 	@Scheduled(fixedDelay = 3_600_000, initialDelay = 3_000)//每小时执行一次
 	public void syncXytOrderByJd(){
+		if (isDebug) {
+			logger.info("debug模式，无法运行正式任务");
+			return;
+		}
 		logger.info("-----定时拉取拉取京东仓已发货订单-开始----");
 		Integer flag = orderSyncLogService.syncXYTOrderByJD(1);
 		logger.info("-----定时拉取拉取京东仓已发货订单-结束----");