Commit 846fad2b by [zhangzhiwei]

删除平台预警功能

parent aacea318
...@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; ...@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
@Component @Component
@Document(collection = "Data") @Document(collection = "Data")
public class Data implements Serializable { public class Data implements Serializable {
private static final long serialVersionUID = 1L;
@Id @Id
// @Indexed(unique = true) // @Indexed(unique = true)
private String dataId; private String dataId;
......
...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; ...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class EasyNews implements Serializable { public class EasyNews implements Serializable {
private static final long serialVersionUID = -8314035021075562220L;
private String spyderInfoId; private String spyderInfoId;
private String title; private String title;
private String source; private String source;
......
...@@ -12,6 +12,8 @@ import org.springframework.data.mongodb.core.mapping.Document; ...@@ -12,6 +12,8 @@ import org.springframework.data.mongodb.core.mapping.Document;
*/ */
@Document(collection="Field") @Document(collection="Field")
public class FieldBean implements Serializable { public class FieldBean implements Serializable {
private static final long serialVersionUID = 3693077530412674407L;
private String id; private String id;
private int fieldSize; private int fieldSize;
private String field; private String field;
......
...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; ...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class FieldIntegerity implements Serializable { public class FieldIntegerity implements Serializable {
private static final long serialVersionUID = -4686741015083824543L;
private String templateId; private String templateId;
private String tempName;// 模板名 private String tempName;// 模板名
private String field;// 检测的字段 private String field;// 检测的字段
......
...@@ -17,6 +17,7 @@ import org.springframework.data.mongodb.core.mapping.Field; ...@@ -17,6 +17,7 @@ import org.springframework.data.mongodb.core.mapping.Field;
@Document(collection = "Message") @Document(collection = "Message")
public class Message implements Serializable { public class Message implements Serializable {
private static final long serialVersionUID = 2280160284418432008L;
@Indexed @Indexed
@Id @Id
private String messageId; private String messageId;
......
package com.zhiwei.manage.bean; package com.zhiwei.manage.bean;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 信息类 * 信息类
* @author Administrator * @author Administrator
......
...@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component; ...@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
*/ */
@Component @Component
public class News implements Serializable { public class News implements Serializable {
private static final long serialVersionUID = 7858511648802999854L;
@Id @Id
private String id; private String id;
private String url; private String url;
......
...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; ...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class NewsDelayed implements Serializable { public class NewsDelayed implements Serializable {
private static final long serialVersionUID = 6883830786863119090L;
private String templateId; private String templateId;
private String tempName;// 模板名 private String tempName;// 模板名
private double newsDelayed;// 平均延时达标时间 private double newsDelayed;// 平均延时达标时间
......
...@@ -14,9 +14,10 @@ import org.springframework.stereotype.Component; ...@@ -14,9 +14,10 @@ import org.springframework.stereotype.Component;
@Component @Component
public class PageEty implements Serializable { public class PageEty implements Serializable {
private static final long serialVersionUID = -1967822678864168577L;
private int pageNo; private int pageNo;
private int pageSize; private int pageSize;
private List data; private List<?> data;
private int dataCount; private int dataCount;
private int pageCount; private int pageCount;
...@@ -44,11 +45,11 @@ public class PageEty implements Serializable { ...@@ -44,11 +45,11 @@ public class PageEty implements Serializable {
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public List getData() { public List<?> getData() {
return data; return data;
} }
public void setData(List data) { public void setData(List<?> data) {
this.data = data; this.data = data;
} }
......
...@@ -17,6 +17,7 @@ import org.springframework.data.mongodb.core.mapping.Field; ...@@ -17,6 +17,7 @@ import org.springframework.data.mongodb.core.mapping.Field;
@Document(collection = "Person") @Document(collection = "Person")
public class Person implements Serializable { public class Person implements Serializable {
private static final long serialVersionUID = 1033547341815914116L;
@Indexed @Indexed
@Id @Id
private String personId; private String personId;
......
...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; ...@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class PingUrl implements Serializable { public class PingUrl implements Serializable {
private static final long serialVersionUID = 6649286346021852166L;
private String templateId; private String templateId;
private String tempName;// 模板名 private String tempName;// 模板名
private int pingInterval;// 连通性测试间隔 private int pingInterval;// 连通性测试间隔
......
...@@ -15,6 +15,7 @@ import org.springframework.stereotype.Component; ...@@ -15,6 +15,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class RunMsg implements Serializable { public class RunMsg implements Serializable {
private static final long serialVersionUID = 6123479183870011019L;
private String templateId; private String templateId;
private String templateName; private String templateName;
private String runType;// 运行类型 private String runType;// 运行类型
......
...@@ -3,7 +3,6 @@ package com.zhiwei.manage.bean; ...@@ -3,7 +3,6 @@ package com.zhiwei.manage.bean;
import java.io.Serializable; import java.io.Serializable;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
/** /**
...@@ -15,6 +14,7 @@ import org.springframework.data.mongodb.core.mapping.Document; ...@@ -15,6 +14,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
@Document(collection = "DbTable") @Document(collection = "DbTable")
public class ServerBean implements Serializable { public class ServerBean implements Serializable {
private static final long serialVersionUID = -5548582868100310015L;
@Id @Id
private String id; private String id;
private String dbUsername; private String dbUsername;
......
...@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component; ...@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
@Document(collection = "Template") @Document(collection = "Template")
public class Template implements Serializable { public class Template implements Serializable {
private static final long serialVersionUID = -1556274587661119568L;
/** /**
* *
*/ */
......
...@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; ...@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
*/ */
@Component @Component
public class Weibo implements Serializable { public class Weibo implements Serializable {
private static final long serialVersionUID = -1239465727956599189L;
@Id @Id
private String id; private String id;
private String time; private String time;
......
...@@ -31,10 +31,7 @@ import com.zhiwei.manage.service.CrawTemplateServiceImpl; ...@@ -31,10 +31,7 @@ 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.ServerServiceImpl; import com.zhiwei.manage.service.ServerServiceImpl;
import com.zhiwei.manage.service.TemplateServiceImpl;
import com.zhiwei.manage.util.Config;
import com.zhiwei.manage.util.ESUtil; import com.zhiwei.manage.util.ESUtil;
import com.zhiwei.manage.util.SendMailUtil;
import com.zhiwei.manage.util.TimeUtil; import com.zhiwei.manage.util.TimeUtil;
/** /**
...@@ -175,7 +172,6 @@ public class MainThread extends Thread { ...@@ -175,7 +172,6 @@ public class MainThread extends Thread {
DataServiceImpl dataService = BeanFactory.getBean(DataServiceImpl.class); DataServiceImpl dataService = BeanFactory.getBean(DataServiceImpl.class);
ServerServiceImpl serverService = BeanFactory.getBean(ServerServiceImpl.class); ServerServiceImpl serverService = BeanFactory.getBean(ServerServiceImpl.class);
MessageServiceImpl messageService = BeanFactory.getBean(MessageServiceImpl.class); MessageServiceImpl messageService = BeanFactory.getBean(MessageServiceImpl.class);
TemplateServiceImpl templateService = BeanFactory.getBean(TemplateServiceImpl.class);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH");
List<Channel> channel = serverService.findDisChannel(); List<Channel> channel = serverService.findDisChannel();
/**初始化模版列表***/ /**初始化模版列表***/
...@@ -218,9 +214,9 @@ public class MainThread extends Thread { ...@@ -218,9 +214,9 @@ public class MainThread extends Thread {
m.setTitle("渠道低数据量预警{" + chan.getPt() + "}"); m.setTitle("渠道低数据量预警{" + chan.getPt() + "}");
m.setContent("1小时内的数据量为:" + count); m.setContent("1小时内的数据量为:" + count);
m.setDate(sdf.format(start.getTime())); m.setDate(sdf.format(start.getTime()));
for (String mail : Config.getVal("count_mail").split(",")) { // for (String mail : Config.getVal("count_mail").split(",")) {
SendMailUtil.sendMessage(mail, m); // SendMailUtil.sendMessage(mail, m);
} // }
} }
} catch (Exception e) { } catch (Exception e) {
log.error(chan.getPt() + "入库出错,错误信息{}", e); log.error(chan.getPt() + "入库出错,错误信息{}", e);
......
...@@ -66,6 +66,7 @@ public class FieldController { ...@@ -66,6 +66,7 @@ public class FieldController {
@RequestMapping(value = "/deleteFields", produces = "application/json;charset=utf-8") @RequestMapping(value = "/deleteFields", produces = "application/json;charset=utf-8")
@ResponseBody @ResponseBody
public String deleteFields(@RequestBody Map<String, Object> map) { public String deleteFields(@RequestBody Map<String, Object> map) {
@SuppressWarnings("unchecked")
List<String> id = (List<String>) map.get("id"); List<String> id = (List<String>) map.get("id");
System.out.println(id); System.out.println(id);
boolean b = fs.delete(id); boolean b = fs.delete(id);
......
...@@ -82,6 +82,7 @@ public class MessageConteoller { ...@@ -82,6 +82,7 @@ public class MessageConteoller {
@RequestMapping(value = "/deleteMsg", produces = "application/json;charset=utf-8") @RequestMapping(value = "/deleteMsg", produces = "application/json;charset=utf-8")
@ResponseBody @ResponseBody
public String delete(@RequestBody Map<String, Object> map) { public String delete(@RequestBody Map<String, Object> map) {
@SuppressWarnings("unchecked")
List<String> messageId = (List<String>) map.get("messageId"); List<String> messageId = (List<String>) map.get("messageId");
msgService.delete(messageId); msgService.delete(messageId);
JsonResult result = new JsonResult(true, 200, "删除成功", ""); JsonResult result = new JsonResult(true, 200, "删除成功", "");
......
...@@ -162,6 +162,7 @@ public class PersonController { ...@@ -162,6 +162,7 @@ public class PersonController {
@RequestMapping(value = "/deletePerson", produces = "application/json;charset=utf-8") @RequestMapping(value = "/deletePerson", produces = "application/json;charset=utf-8")
@ResponseBody @ResponseBody
public String deletePerson(@RequestBody Map<String, Object> map) { public String deletePerson(@RequestBody Map<String, Object> map) {
@SuppressWarnings("unchecked")
List<String> deleteList = (List<String>) map.get("personId"); List<String> deleteList = (List<String>) map.get("personId");
boolean b = personService.delete(deleteList); boolean b = personService.delete(deleteList);
JsonResult result = new JsonResult(b ? true : false, 200, b ? "操作成功" : "操作失败"); JsonResult result = new JsonResult(b ? true : false, 200, b ? "操作成功" : "操作失败");
......
...@@ -69,6 +69,7 @@ public class ServerController { ...@@ -69,6 +69,7 @@ public class ServerController {
@RequestMapping(value = "/deleteServer", produces = "application/json;charset=utf-8") @RequestMapping(value = "/deleteServer", produces = "application/json;charset=utf-8")
@ResponseBody @ResponseBody
public String deleteServer(@RequestBody Map<String, Object> map) { public String deleteServer(@RequestBody Map<String, Object> map) {
@SuppressWarnings("unchecked")
List<String> serverid = (List<String>) map.get("serverid"); List<String> serverid = (List<String>) map.get("serverid");
boolean b = ss.delete(serverid); boolean b = ss.delete(serverid);
JsonResult result = new JsonResult(true, 200, serverid + (b ? "删除成功" : "删除失败")); JsonResult result = new JsonResult(true, 200, serverid + (b ? "删除成功" : "删除失败"));
...@@ -154,6 +155,7 @@ public class ServerController { ...@@ -154,6 +155,7 @@ public class ServerController {
@RequestMapping(value = "/deleteChannel", produces = "application/json;charset=utf-8") @RequestMapping(value = "/deleteChannel", produces = "application/json;charset=utf-8")
@ResponseBody @ResponseBody
public String deleteChannel(@RequestBody Map<String, Object> map) { public String deleteChannel(@RequestBody Map<String, Object> map) {
@SuppressWarnings("unchecked")
List<String> id = (List<String>) map.get("id"); List<String> id = (List<String>) map.get("id");
boolean b = ss.deleteChannel(id); boolean b = ss.deleteChannel(id);
JsonResult result = new JsonResult(b, 200, id + (b ? "删除成功" : "删除失败")); JsonResult result = new JsonResult(b, 200, id + (b ? "删除成功" : "删除失败"));
......
...@@ -5,7 +5,6 @@ import java.util.Map; ...@@ -5,7 +5,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -30,7 +29,6 @@ import com.zhiwei.manage.service.TemplateService; ...@@ -30,7 +29,6 @@ import com.zhiwei.manage.service.TemplateService;
@Controller @Controller
public class TemplateController { public class TemplateController {
private static final Log log = org.apache.commons.logging.LogFactory.getLog(TemplateController.class);
@Autowired @Autowired
private TemplateService ts; private TemplateService ts;
@Autowired @Autowired
...@@ -116,6 +114,7 @@ public class TemplateController { ...@@ -116,6 +114,7 @@ public class TemplateController {
@RequestMapping(value = "/deleteTmp", produces = "application/json;charset=utf-8") @RequestMapping(value = "/deleteTmp", produces = "application/json;charset=utf-8")
@ResponseBody @ResponseBody
public String deleteTmp(@RequestBody Map<String, Object> map) { public String deleteTmp(@RequestBody Map<String, Object> map) {
@SuppressWarnings("unchecked")
List<String> templateId = (List<String>) map.get("templateId"); List<String> templateId = (List<String>) map.get("templateId");
String pt = (String) map.get("pt"); String pt = (String) map.get("pt");
boolean isDelete = false; boolean isDelete = false;
......
...@@ -42,7 +42,6 @@ public class AESUtils { ...@@ -42,7 +42,6 @@ public class AESUtils {
} }
public static void main(String[] args) { public static void main(String[] args) {
AESUtils ac = new AESUtils();
String jsm = AESUtils.encrypt("wechat", "shenjinzhu"); String jsm = AESUtils.encrypt("wechat", "shenjinzhu");
System.out.println(jsm); System.out.println(jsm);
String jm = AESUtils.decrypt("wechat", jsm); String jm = AESUtils.decrypt("wechat", jsm);
......
...@@ -9,9 +9,6 @@ import java.util.Date; ...@@ -9,9 +9,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.zhiwei.manage.bean.Data; import com.zhiwei.manage.bean.Data;
import com.zhiwei.manage.bean.EasyNews; import com.zhiwei.manage.bean.EasyNews;
...@@ -40,7 +37,7 @@ public class Change { ...@@ -40,7 +37,7 @@ public class Change {
* @param map * @param map
* @return * @return
*/ */
public static <T> T toBean(Class<T> clazz, Map map) { public static <T> T toBean(Class<T> clazz, Map<?,?> map) {
T obj = null; T obj = null;
try { try {
BeanInfo beanInfo = Introspector.getBeanInfo(clazz); BeanInfo beanInfo = Introspector.getBeanInfo(clazz);
......
...@@ -6,10 +6,6 @@ import java.util.Date; ...@@ -6,10 +6,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import com.mongodb.DB; import com.mongodb.DB;
import com.mongodb.DBCollection; import com.mongodb.DBCollection;
...@@ -27,12 +23,11 @@ import com.mongodb.ServerAddress; ...@@ -27,12 +23,11 @@ import com.mongodb.ServerAddress;
* *
*/ */
public class MongoConnect { public class MongoConnect {
private static final Logger log = LoggerFactory.getLogger(MongoConnect.class);
private static MongoClient mongoClient = null; private static MongoClient mongoClient = null;
private static String dbName; private static String dbName;
public MongoConnect(String host, int port, String username, String password, String dbName) { public MongoConnect(String host, int port, String username, String password, String dbname) {
this.dbName = dbName; dbName = dbname;
if (mongoClient == null) { if (mongoClient == null) {
MongoClientOptions.Builder optionsBuilder = new MongoClientOptions.Builder(); MongoClientOptions.Builder optionsBuilder = new MongoClientOptions.Builder();
optionsBuilder.connectionsPerHost(100); // 与目标数据库可创建的最大连接数 optionsBuilder.connectionsPerHost(100); // 与目标数据库可创建的最大连接数
...@@ -62,8 +57,8 @@ public class MongoConnect { ...@@ -62,8 +57,8 @@ public class MongoConnect {
} }
public MongoConnect(String host, int port, String dbName) { public MongoConnect(String host, int port, String dbame) {
this.dbName = dbName; dbName = dbame;
if (mongoClient == null) { if (mongoClient == null) {
MongoClientOptions.Builder optionsBuilder = new MongoClientOptions.Builder(); MongoClientOptions.Builder optionsBuilder = new MongoClientOptions.Builder();
optionsBuilder.connectionsPerHost(100); // 与目标数据库可创建的最大连接数 optionsBuilder.connectionsPerHost(100); // 与目标数据库可创建的最大连接数
...@@ -87,6 +82,7 @@ public class MongoConnect { ...@@ -87,6 +82,7 @@ public class MongoConnect {
} }
} }
@SuppressWarnings("unchecked")
public List<Map<String,Object>> getData(Date date,String collection){ public List<Map<String,Object>> getData(Date date,String collection){
List<Map<String,Object>> list=new ArrayList<Map<String,Object>>(); List<Map<String,Object>> list=new ArrayList<Map<String,Object>>();
DB db = mongoClient.getDB(dbName); DB db = mongoClient.getDB(dbName);
......
...@@ -3,9 +3,6 @@ package com.zhiwei.manage.util; ...@@ -3,9 +3,6 @@ package com.zhiwei.manage.util;
import java.sql.DriverManager; import java.sql.DriverManager;
import java.sql.SQLException; import java.sql.SQLException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.mysql.jdbc.Connection; import com.mysql.jdbc.Connection;
/** /**
...@@ -16,7 +13,6 @@ import com.mysql.jdbc.Connection; ...@@ -16,7 +13,6 @@ import com.mysql.jdbc.Connection;
*/ */
public class MysqlConnection { public class MysqlConnection {
private static final Log log = LogFactory.getLog(MysqlConnection.class);
private String host; private String host;
private int port; private int port;
private String dbName; private String dbName;
......
...@@ -12,8 +12,6 @@ import javax.mail.internet.MimeBodyPart; ...@@ -12,8 +12,6 @@ import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeMultipart;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.zhiwei.manage.bean.Messages; import com.zhiwei.manage.bean.Messages;
......
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