Commit e4aea5cf by shenjinzhu

修复停止修改未生效

parent 39c06e73
...@@ -117,7 +117,6 @@ public class MainThread extends Thread { ...@@ -117,7 +117,6 @@ public class MainThread extends Thread {
*/ */
public static boolean removeMap(String templateId) { public static boolean removeMap(String templateId) {
try { try {
// Template template = allTmp.get(templateId);
if (DelayedThread.runMap.get(templateId) != null) if (DelayedThread.runMap.get(templateId) != null)
DelayedThread.runMap.remove(templateId); DelayedThread.runMap.remove(templateId);
if (PingThread.runMap.get(templateId) != null) if (PingThread.runMap.get(templateId) != null)
...@@ -126,6 +125,8 @@ public class MainThread extends Thread { ...@@ -126,6 +125,8 @@ public class MainThread extends Thread {
FieldThread.runMap.remove(templateId); FieldThread.runMap.remove(templateId);
if (mainMap.get(templateId) != null) if (mainMap.get(templateId) != null)
mainMap.remove(templateId); mainMap.remove(templateId);
if (allTmp.get(templateId) != null)
allTmp.remove(templateId);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -175,8 +176,8 @@ public class MainThread extends Thread { ...@@ -175,8 +176,8 @@ public class MainThread extends Thread {
// 每日的数据量入库(对应模板) // 每日的数据量入库(对应模板)
System.out.println(list.size()); System.out.println(list.size());
for (CrawTemplate cr : list) { for (CrawTemplate cr : list) {
count = (int) dataService.finCountByDayData(start.getTime(), end.getTime(), count = (int) dataService.finCountByDayData(start.getTime(), end.getTime(), cr.getPt(),
cr.getPt(), cr.getId()); cr.getId());
Data data = new Data(); Data data = new Data();
data.setCount(count); data.setCount(count);
data.setTempName(cr.getConfigName()); data.setTempName(cr.getConfigName());
......
...@@ -202,7 +202,7 @@ public class Task implements Runnable { ...@@ -202,7 +202,7 @@ public class Task implements Runnable {
Template tp = MainThread.mainMap.get(delayed.getTemplateId()); Template tp = MainThread.mainMap.get(delayed.getTemplateId());
Message msg = new Message(); Message msg = new Message();
msg.setCreateDate(new Date()); msg.setCreateDate(new Date());
msg.setErrorMsg("延时过高,延时检测为" + (sum / 1.0 / 1000 / 60/cutSize) + "分"); msg.setErrorMsg("延时过高,延时检测为" + sum / 1.0 / 1000 / 60/cutSize + "分");
msg.setHandle(false); msg.setHandle(false);
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
......
...@@ -96,7 +96,6 @@ public class DataController { ...@@ -96,7 +96,6 @@ public class DataController {
List<EasyNews> newsList = new ArrayList<>(); List<EasyNews> newsList = new ArrayList<>();
if(method.equals("type")){ if(method.equals("type")){
source=(String) map.get("type"); source=(String) map.get("type");
System.out.println(source);
newsList=dataService.findByAccurateType(startd.getTime(), endTime.getTime(), source); newsList=dataService.findByAccurateType(startd.getTime(), endTime.getTime(), source);
}else{ }else{
if (method.equals("source")) { if (method.equals("source")) {
......
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