add

src/main/java/com/zfire/jiasm/syncdata/download/order/DetailDownloadInstallTask.java

@@ -66,10 +66,10 @@ public class DetailDownloadInstallTask {
 			for (Map<String, Object> downloadType : types) {
 				int topDownloadTaskType = (Integer) downloadType.get("download_task_type");
 				// 关联任务表提取相应的数据
-				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
+				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstall(topDownloadTaskType);
 
 				// 测试用
-				// List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
+				List<Map<String, Object>> result = detailDownloadService.getTaskDataInstallTest(topDownloadTaskType);
 
 				for (Map<String, Object> row : result) {
 					// ID

src/main/java/com/zfire/jiasm/syncdata/sendmessage/MarketingSMSSelfTask.java

@@ -1,6 +1,7 @@
 package com.zfire.jiasm.syncdata.sendmessage;
 
 
+import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.service.SMSService;
 import com.zfire.jiasm.syncdata.utils.SMSSelfManager;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +23,8 @@ import java.util.Map;
 @Component
 @Slf4j
 public class MarketingSMSSelfTask {
+	@Value("${SMSSelf_marketing_Ratec}")
+	private String SMSSelf_marketing_Ratec = "";
 	@Autowired
 	private SMSSelfManager smsSelfManager;
 	@Autowired
@@ -31,6 +34,10 @@ public class MarketingSMSSelfTask {
 
 	@Scheduled(fixedRateString = "${SMSSelf_marketing_Rate}")
 	private void process() {
+		if (SMSSelf_marketing_Ratec.equals(TaskConfigEnum.FALSE.getCode())){
+			return;
+		}
+
 		try {
 			log.info("营销短信发送.....................开始");
 			List<String> mobiles = new ArrayList<>();

src/main/java/com/zfire/jiasm/syncdata/service/impl/DetailDownloadServiceImpl.java

@@ -146,7 +146,7 @@ public class DetailDownloadServiceImpl implements DetailDownloadService {
 				+ " c.download_task_type_name "
 				+ " FROM itf_gree_to_fa_download_task_list a,itf_gree_to_fa_download_task_type c "
 				+ " where a.download_task_type=c.download_task_type "
-				+ " and a.id=63085 and a.download_status=0 and download_times = 6");
+				+ " and a.id=14042 and a.download_status=0 and download_times = 6");
 		return result;
 	}
 	

src/main/resources/bootstrap-dev.properties

@@ -299,6 +299,7 @@ qmsgsend=5000
 zwgmsgsend=5000
 pgmsgsend=5000
 greesms=10000
+SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
@@ -417,6 +418,7 @@ qmsgsendc=FALSE
 zwgmsgsendc=FALSE
 pgmsgsendc=FALSE
 greesmsc=FALSE
+SMSSelf_marketing_Ratec=FALSE
 #######################安装与维修工单控制参数(从总部与从工单获取互斥)###############################
 #安装、维修工单总部下载
 installdownc=FALSE

src/main/resources/bootstrap-prd.properties

@@ -290,6 +290,7 @@ qmsgsend=5000
 zwgmsgsend=5000
 pgmsgsend=5000
 greesms=10000
+SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=TRUE
@@ -409,6 +410,7 @@ qmsgsendc=FALSE
 zwgmsgsendc=TRUE
 pgmsgsendc=TRUE
 greesmsc=TRUE
+SMSSelf_marketing_Ratec=TRUE
 #######################安装与维修工单控制参数(从总部与从工单获取互斥)###############################
 #安装、维修工单总部下载
 installdownc=FALSE

src/main/resources/bootstrap-prdt.properties

@@ -291,6 +291,7 @@ qmsgsend=5000
 zwgmsgsend=5000
 pgmsgsend=5000
 greesms=10000
+SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
@@ -409,6 +410,7 @@ qmsgsendc=FALSE
 zwgmsgsendc=FALSE
 pgmsgsendc=FALSE
 greesmsc=FALSE
+SMSSelf_marketing_Ratec=FALSE
 #######################安装与维修工单控制参数(从总部与从工单获取互斥)###############################
 #安装、维修工单总部下载
 installdownc=FALSE

src/main/resources/bootstrap-test.properties

@@ -298,6 +298,7 @@ qmsgsend=5000
 zwgmsgsend=5000
 pgmsgsend=5000
 greesms=10000
+SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=TRUE
@@ -416,6 +417,7 @@ qmsgsendc=FALSE
 zwgmsgsendc=FALSE
 pgmsgsendc=FALSE
 greesmsc=FALSE
+SMSSelf_marketing_Ratec=FALSE
 #######################安装与维修工单控制参数(从总部与从工单获取互斥)###############################
 #安装、维修工单总部下载
 installdownc=FALSE

src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=prd
+spring.profiles.active=prdt
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略