Commit 98119bd5 by shenjinzhu

无用项删除

parent 3137c7a6
...@@ -20,7 +20,7 @@ public class Message implements Serializable { ...@@ -20,7 +20,7 @@ public class Message implements Serializable {
@Id @Id
private String messageId; private String messageId;
@Field @Field
private String templateName; private String tempName;
private Date createDate; private Date createDate;
private String errorMsg; private String errorMsg;
private int templateLv; private int templateLv;
...@@ -48,11 +48,11 @@ public class Message implements Serializable { ...@@ -48,11 +48,11 @@ public class Message implements Serializable {
public void setMessageId(String messageId) { public void setMessageId(String messageId) {
this.messageId = messageId; this.messageId = messageId;
} }
public String getTemplateName() { public String getTempName() {
return templateName; return tempName;
} }
public void setTemplateName(String templateName) { public void setTempName(String tempName) {
this.templateName = templateName; this.tempName = tempName;
} }
public Date getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
...@@ -101,7 +101,7 @@ public class Message implements Serializable { ...@@ -101,7 +101,7 @@ public class Message implements Serializable {
} }
@Override @Override
public String toString() { public String toString() {
return "Message [messageId=" + messageId + ", templateName=" + templateName + ", createDate=" + createDate return "Message [messageId=" + messageId + ", tempName=" + tempName + ", createDate=" + createDate
+ ", errorMsg=" + errorMsg + ", templateLv=" + templateLv + ", templateCreator=" + templateCreator + ", errorMsg=" + errorMsg + ", templateLv=" + templateLv + ", templateCreator=" + templateCreator
+ ", handle=" + handle + ", handleDate=" + handleDate + ", handler=" + handler + ", pt=" + pt + ", handle=" + handle + ", handleDate=" + handleDate + ", handler=" + handler + ", pt=" + pt
+ ", handleMsg=" + handleMsg + "]"; + ", handleMsg=" + handleMsg + "]";
......
...@@ -14,7 +14,6 @@ import org.springframework.data.mongodb.core.query.Criteria; ...@@ -14,7 +14,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mongodb.DB;
import com.mongodb.DBCollection; import com.mongodb.DBCollection;
import com.zhiwei.manage.bean.ServerBean; import com.zhiwei.manage.bean.ServerBean;
import com.zhiwei.manage.util.MongoConnect; import com.zhiwei.manage.util.MongoConnect;
......
...@@ -13,7 +13,6 @@ import org.apache.commons.logging.LogFactory; ...@@ -13,7 +13,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.zhiwei.manage.bean.NewsDelayed; import com.zhiwei.manage.bean.NewsDelayed;
import com.zhiwei.manage.bean.RunMsg;
import com.zhiwei.manage.util.Tools; import com.zhiwei.manage.util.Tools;
@Component @Component
......
...@@ -15,7 +15,6 @@ import org.apache.commons.logging.LogFactory; ...@@ -15,7 +15,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.zhiwei.manage.bean.FieldIntegerity; import com.zhiwei.manage.bean.FieldIntegerity;
import com.zhiwei.manage.bean.RunMsg;
import com.zhiwei.manage.util.Tools; import com.zhiwei.manage.util.Tools;
@Component @Component
......
...@@ -17,18 +17,15 @@ import org.springframework.stereotype.Component; ...@@ -17,18 +17,15 @@ import org.springframework.stereotype.Component;
import com.zhiwei.manage.bean.Channel; import com.zhiwei.manage.bean.Channel;
import com.zhiwei.manage.bean.CrawTemplate; import com.zhiwei.manage.bean.CrawTemplate;
import com.zhiwei.manage.bean.Data; import com.zhiwei.manage.bean.Data;
import com.zhiwei.manage.bean.FieldBean;
import com.zhiwei.manage.bean.FieldIntegerity; import com.zhiwei.manage.bean.FieldIntegerity;
import com.zhiwei.manage.bean.Message; import com.zhiwei.manage.bean.Message;
import com.zhiwei.manage.bean.NewsDelayed; import com.zhiwei.manage.bean.NewsDelayed;
import com.zhiwei.manage.bean.PingUrl; import com.zhiwei.manage.bean.PingUrl;
import com.zhiwei.manage.bean.RunMsg;
import com.zhiwei.manage.bean.Template; import com.zhiwei.manage.bean.Template;
import com.zhiwei.manage.orm.BeanFactory; import com.zhiwei.manage.orm.BeanFactory;
import com.zhiwei.manage.service.CrawTemplateServiceImpl; import com.zhiwei.manage.service.CrawTemplateServiceImpl;
import com.zhiwei.manage.service.DataServiceImpl; import com.zhiwei.manage.service.DataServiceImpl;
import com.zhiwei.manage.service.MessageServiceImpl; import com.zhiwei.manage.service.MessageServiceImpl;
import com.zhiwei.manage.service.NewsServiceImpl;
import com.zhiwei.manage.service.ServerServiceImpl; import com.zhiwei.manage.service.ServerServiceImpl;
import com.zhiwei.manage.util.TimeUtil; import com.zhiwei.manage.util.TimeUtil;
import com.zhiwei.manage.util.Tools; import com.zhiwei.manage.util.Tools;
...@@ -193,7 +190,7 @@ public class MainThread extends Thread { ...@@ -193,7 +190,7 @@ public class MainThread extends Thread {
m.setHandle(false); m.setHandle(false);
m.setCreateDate(start.getTime()); m.setCreateDate(start.getTime());
m.setTemplateLv(1); m.setTemplateLv(1);
m.setTemplateName("未定义"); m.setTempName("未定义");
m.setPt("网媒"); m.setPt("网媒");
m.setErrorMsg("未定义," + cr.getConfigName() + "," + chan.getId() + "数据为0"); m.setErrorMsg("未定义," + cr.getConfigName() + "," + chan.getId() + "数据为0");
msgService.insert(m); msgService.insert(m);
......
...@@ -15,7 +15,6 @@ import org.apache.commons.logging.LogFactory; ...@@ -15,7 +15,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.zhiwei.manage.bean.PingUrl; import com.zhiwei.manage.bean.PingUrl;
import com.zhiwei.manage.bean.RunMsg;
import com.zhiwei.manage.util.Tools; import com.zhiwei.manage.util.Tools;
@Component @Component
......
...@@ -2,25 +2,14 @@ package com.zhiwei.manage.handle; ...@@ -2,25 +2,14 @@ package com.zhiwei.manage.handle;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.zhiwei.manage.bean.FieldIntegerity; import com.zhiwei.manage.bean.FieldIntegerity;
import com.zhiwei.manage.bean.Message; import com.zhiwei.manage.bean.Message;
import com.zhiwei.manage.bean.News;
import com.zhiwei.manage.bean.NewsDelayed; import com.zhiwei.manage.bean.NewsDelayed;
import com.zhiwei.manage.bean.PingUrl; import com.zhiwei.manage.bean.PingUrl;
import com.zhiwei.manage.bean.RunMsg;
import com.zhiwei.manage.bean.Template; import com.zhiwei.manage.bean.Template;
import com.zhiwei.manage.orm.BeanFactory; import com.zhiwei.manage.orm.BeanFactory;
import com.zhiwei.manage.service.MessageService; import com.zhiwei.manage.service.MessageService;
...@@ -28,7 +17,6 @@ import com.zhiwei.manage.service.NewsService; ...@@ -28,7 +17,6 @@ import com.zhiwei.manage.service.NewsService;
public class Task implements Runnable { public class Task implements Runnable {
private RunMsg runMsg;
private NewsDelayed delayed; private NewsDelayed delayed;
private PingUrl ping; private PingUrl ping;
private FieldIntegerity field; private FieldIntegerity field;
...@@ -64,7 +52,7 @@ public class Task implements Runnable { ...@@ -64,7 +52,7 @@ public class Task implements Runnable {
msg.setErrorMsg(code == 0 ? ping.getPingUrlOne() + "访问失败,错误代码" + code : "访问超时"); msg.setErrorMsg(code == 0 ? ping.getPingUrlOne() + "访问失败,错误代码" + code : "访问超时");
msg.setHandle(false); msg.setHandle(false);
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateName(ping.getTempName()); msg.setTempName(ping.getTempName());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
messageService.insert(msg); messageService.insert(msg);
} }
...@@ -75,7 +63,7 @@ public class Task implements Runnable { ...@@ -75,7 +63,7 @@ public class Task implements Runnable {
msg.setErrorMsg("访问出错,url不可访问"); msg.setErrorMsg("访问出错,url不可访问");
msg.setHandle(false); msg.setHandle(false);
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateName(ping.getTempName()); msg.setTempName(ping.getTempName());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setPt(ping.getPt()); msg.setPt(ping.getPt());
messageService.insert(msg); messageService.insert(msg);
...@@ -94,7 +82,7 @@ public class Task implements Runnable { ...@@ -94,7 +82,7 @@ public class Task implements Runnable {
msg.setErrorMsg(code == 0 ? ping.getPingUrlOne() + "访问失败,错误代码" + code : "访问超时"); msg.setErrorMsg(code == 0 ? ping.getPingUrlOne() + "访问失败,错误代码" + code : "访问超时");
msg.setHandle(false); msg.setHandle(false);
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateName(ping.getTempName()); msg.setTempName(ping.getTempName());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setPt(ping.getPt()); msg.setPt(ping.getPt());
messageService.insert(msg); messageService.insert(msg);
...@@ -106,7 +94,7 @@ public class Task implements Runnable { ...@@ -106,7 +94,7 @@ public class Task implements Runnable {
msg.setErrorMsg("访问出错,url不可访问"); msg.setErrorMsg("访问出错,url不可访问");
msg.setHandle(false); msg.setHandle(false);
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateName(ping.getTempName()); msg.setTempName(ping.getTempName());
msg.setPt(ping.getPt()); msg.setPt(ping.getPt());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
messageService.insert(msg); messageService.insert(msg);
...@@ -125,7 +113,7 @@ public class Task implements Runnable { ...@@ -125,7 +113,7 @@ public class Task implements Runnable {
msg.setPt(field.getPt()); msg.setPt(field.getPt());
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setTemplateName(field.getTempName()); msg.setTempName(field.getTempName());
messageService.insert(msg); messageService.insert(msg);
} }
String[] fields = field.getField().split(","); String[] fields = field.getField().split(",");
...@@ -152,7 +140,7 @@ public class Task implements Runnable { ...@@ -152,7 +140,7 @@ public class Task implements Runnable {
msg.setPt(field.getPt()); msg.setPt(field.getPt());
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setTemplateName(field.getTempName()); msg.setTempName(field.getTempName());
messageService.insert(msg); messageService.insert(msg);
} }
} }
...@@ -171,7 +159,7 @@ public class Task implements Runnable { ...@@ -171,7 +159,7 @@ public class Task implements Runnable {
msg.setPt(delayed.getPt()); msg.setPt(delayed.getPt());
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setTemplateName(delayed.getTempName()); msg.setTempName(delayed.getTempName());
messageService.insert(msg); messageService.insert(msg);
} }
long top=0,top_2=0; long top=0,top_2=0;
...@@ -203,7 +191,7 @@ public class Task implements Runnable { ...@@ -203,7 +191,7 @@ public class Task implements Runnable {
msg.setPt(delayed.getPt()); msg.setPt(delayed.getPt());
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setTemplateName(delayed.getTempName()); msg.setTempName(delayed.getTempName());
messageService.insert(msg); messageService.insert(msg);
} }
} }
...@@ -217,7 +205,7 @@ public class Task implements Runnable { ...@@ -217,7 +205,7 @@ public class Task implements Runnable {
msg.setTemplateCreator(tp.getCreator()); msg.setTemplateCreator(tp.getCreator());
msg.setTemplateLv(tp.getTemplateLv()); msg.setTemplateLv(tp.getTemplateLv());
msg.setPt(delayed.getPt()); msg.setPt(delayed.getPt());
msg.setTemplateName(delayed.getTempName()); msg.setTempName(delayed.getTempName());
messageService.insert(msg); messageService.insert(msg);
} }
} }
......
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