Commit f28f06dc authored by mcb's avatar mcb

commit

parent bdaa23b5
...@@ -1049,6 +1049,7 @@ public class DmpRealtimeSyncInfoServiceImpl implements DmpRealtimeSyncInfoServic ...@@ -1049,6 +1049,7 @@ public class DmpRealtimeSyncInfoServiceImpl implements DmpRealtimeSyncInfoServic
* kafka rest api 获取任务状态 * kafka rest api 获取任务状态
* */ * */
public String getExecuteKafkaStatus(String statusUrl, Map params) throws Exception { public String getExecuteKafkaStatus(String statusUrl, Map params) throws Exception {
String status = "";
String respData = HttpClientUtils.getJsonForParam(statusUrl, new HashMap<>()); String respData = HttpClientUtils.getJsonForParam(statusUrl, new HashMap<>());
if (StringUtils.isEmpty(respData)) { if (StringUtils.isEmpty(respData)) {
throw new RuntimeException("get status failed!"); throw new RuntimeException("get status failed!");
...@@ -1062,13 +1063,15 @@ public class DmpRealtimeSyncInfoServiceImpl implements DmpRealtimeSyncInfoServic ...@@ -1062,13 +1063,15 @@ public class DmpRealtimeSyncInfoServiceImpl implements DmpRealtimeSyncInfoServic
return tasksStatus; return tasksStatus;
}*/ }*/
Map connector = (Map) map.get("connector"); Map connector = (Map) map.get("connector");
if (!connector.containsKey("state")) { if (null != connector && connector.size() > 0) {
throw new RuntimeException("get status failed!"); if (!connector.containsKey("state")) {
throw new RuntimeException("get status failed!");
}
status = (String) connector.get("state");
logger.info("response connector status{}" + status);
} }
String status = (String) connector.get("state");
logger.info("response connector status{}" + status);
if (StringUtils.isNotEmpty((String) params.get("id"))) { if (StringUtils.isNotEmpty((String) params.get("id")) && StringUtils.isEmpty(status)) {
Thread thread = new Thread(new Runnable() { Thread thread = new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
......
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
left join dmp_member t3 on ddt.create_user_id=t3.user_id left join dmp_member t3 on ddt.create_user_id=t3.user_id
WHERE ddt.data_status ='1' and dnt.TYPE ='01' and dnt.IS_LEVEL ='1' WHERE ddt.data_status ='1' and dnt.TYPE ='01' and dnt.IS_LEVEL ='1'
and dnt.PROJECT_ID =#{projectId} and dnt.PROJECT_ID =#{projectId}
<if test="treeName != null and treeName != ''">dnt.NAME like concat('%',#{treeName},'%') </if> <if test="treeName != null and treeName != ''">and dnt.NAME like concat('%',#{treeName},'%') </if>
ORDER BY ddt.create_time DESC ORDER BY ddt.create_time DESC
</select> </select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment