Merge remote-tracking branch 'origin/matser' into matser

ibps-basic-root/modules/basic-response/src/main/resources/config/application-common.yml

@@ -124,5 +124,8 @@ cache:
   for-update: ${CACHE_FOR_UPDATE:false}
 
 runqian:
-  server: ${RUNQIAN_SERVER:https://www.szjyxt.com}
+  server: ${RUNQIAN_SERVER:http://dev1.local}
   base-path: ${RUNQIAN_BASE_PATH:/demo}
+
+revoke:
+  index-url: ${INDEX_URL:/ibps/business/v3/sys/CronNotify/data}

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/cloud/timer/job/RevokeServiceJob.java

@@ -1,8 +1,15 @@
 package com.lc.ibps.cloud.timer.job;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.lc.ibps.api.base.constants.StateEnum;
+import com.lc.ibps.base.core.exception.BaseException;
+import com.lc.ibps.base.core.util.AppUtil;
+import com.lc.ibps.base.core.util.EnvUtil;
+import com.lc.ibps.base.core.util.JacksonUtil;
+import com.lc.ibps.base.core.util.string.StringUtil;
+import com.lc.ibps.base.saas.token.ITenantTokenService;
+import com.lc.ibps.cloud.constants.ParameterKey;
+import com.lc.ibps.cloud.entity.APIResult;
+import com.lc.ibps.components.httpclient.http.ApacheHttpClient;
 import com.lc.ibps.components.quartz.BaseJob2;
 import org.apache.http.Header;
 import org.apache.http.NameValuePair;
@@ -13,21 +20,13 @@ import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.lc.ibps.api.base.constants.StateEnum;
-import com.lc.ibps.base.core.exception.BaseException;
-import com.lc.ibps.base.core.util.AppUtil;
-import com.lc.ibps.base.core.util.JacksonUtil;
-import com.lc.ibps.base.core.util.string.StringUtil;
-import com.lc.ibps.base.saas.token.ITenantTokenService;
-import com.lc.ibps.cloud.constants.ParameterKey;
-import com.lc.ibps.cloud.entity.APIResult;
-import com.lc.ibps.components.httpclient.http.ApacheHttpClient;
-import com.lc.ibps.components.quartz.BaseJob;
+import java.util.ArrayList;
+import java.util.List;
 
 public class RevokeServiceJob extends BaseJob2 {
 
 	private static final Logger logger = LoggerFactory.getLogger(RevokeServiceJob.class);
-	public static final String SERVICE_URL = "service-url";
+	public static final String SERVICE_CODE = "service-code";
 
 	private ITenantTokenService tenantTokenService = AppUtil.getBean(ITenantTokenService.class);
 
@@ -44,12 +43,13 @@ public class RevokeServiceJob extends BaseJob2 {
 		}
 
 		// revoke service
-		String url = dataMap.getString(SERVICE_URL);
-		if(StringUtil.isBlank(url))
-		{
+		String serverCode = dataMap.getString(SERVICE_CODE);
+		String url = EnvUtil.getProperty(serverCode, "");
+		if(StringUtil.isBlank(url)){
 			throw new RuntimeException("service url is empty.");
 		}
-
+		String runqianServer = EnvUtil.getProperty("runqian.server", "");
+		url = runqianServer + url;
 		// 获取token
 		// 这里获取的是平台库的admin用户token
 		// saas模式下切换库之后租户库中查询不到admin用户，所以找不到用户，导致null exception

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/EquipmentMaintenancePlanJob.java

@@ -144,6 +144,7 @@ public class EquipmentMaintenancePlanJob  extends AbstractJob {
     }
 
     private void startSbjdjzjlFlow(){
+        // 关联 task-1716-设备校准功能改进
         // 配置校准计划（t_mjsbjdxzjh、子表t_mjsbjdxzjhzb）后，按复校日期发提醒（默认--该日期提前一个月）
         // 开流程推送到负责人（设备档案卡t_sbdj中的保管人guan_li_ren_）
         // 根据主表流程结束的数据查询子表   当前日期加30天==子表计划日期即开启检定校准记录流程