Skip to content

D
datamanage
Commit be7b80eb by shenjinzhu
Options

更新接受数据方式

parent 5b360970
Showing with 341 additions and 290 deletions
src/main/java/com/zhiwei/manage/dao/CrawTemplateDao.java
......@@ -8,4 +8,6 @@ public interface CrawTemplateDao {
public List<CrawTemplate> findAll();
public String getSpIdByConfigName(String tempName);
}
src/main/java/com/zhiwei/manage/dao/CrawTemplateDaoImpl.java
......@@ -5,6 +5,8 @@ import java.util.List;
import javax.annotation.Resource;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
import com.zhiwei.manage.bean.CrawTemplate;
......@@ -19,4 +21,9 @@ public class CrawTemplateDaoImpl implements CrawTemplateDao{
return mongo.findAll(CrawTemplate.class);
}
@Override
public String getSpIdByConfigName(String tempName) {
return mongo.findOne(Query.query(Criteria.where("configName").is(tempName)), CrawTemplate.class).getId();
}
}
src/main/java/com/zhiwei/manage/dao/DataDao.java
......@@ -21,7 +21,7 @@ public interface DataDao {
public List<EasyNews> findBySourceFromLibrary(Date startTime, Date endTime, String source);
public List<EasyNews> findBySpId(Date startTime, Date endTime, String syId);
/**
* 根据数据来源来搜索数据
* @param startTime
......@@ -43,6 +43,8 @@ public interface DataDao {
*/
public List<EasyNews> findByAccurateSpId(String startTime, String endTime, String SpId);
/**
* 微博数据统计
* @param startTime
......
src/main/java/com/zhiwei/manage/dao/DataDaoImpl.java
......@@ -86,7 +86,7 @@ public class DataDaoImpl implements DataDao {
Criteria criteria = new Criteria();
criteria.and("source").is(source);
criteria.and("time").gte(startTime).lt(endTime);
return mongo2.find(Query.query(criteria), EasyNews.class, "net_media_" + year + month);
return mongo2.find(Query.query(criteria), EasyNews.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
@Override
......@@ -97,7 +97,7 @@ public class DataDaoImpl implements DataDao {
Criteria criteria = new Criteria();
criteria.and("spyderInfoId").is(SpId);
criteria.and("time").gt(startTime).lt(endTime);
return mongo2.find(Query.query(criteria), EasyNews.class, "net_media_" + year + month);
return mongo2.find(Query.query(criteria), EasyNews.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
@Override
......@@ -108,7 +108,7 @@ public class DataDaoImpl implements DataDao {
int month = c.get(Calendar.MONTH) + 1;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
return weibo.count(Query.query(Criteria.where("time").gte(sdf.format(startTime)).lt(sdf.format(endTime))),
Weibo.class, "status_" + year + month);
Weibo.class, "status_" + year + (month>10?""+month:"0"+month));
}
@Override
......@@ -147,14 +147,14 @@ public class DataDaoImpl implements DataDao {
Query.query(Criteria.where("pt").is(pt).andOperator(Criteria.where("other").is("data"))),
ServerBean.class);
if (ser.isTable()) {
end = cal.get(Calendar.YEAR) +""+ (cal.get(Calendar.MONTH) + 1) + "";
int month=cal.get(Calendar.MONTH)+1;
end = cal.get(Calendar.YEAR) +""+ (month>10?""+month:"0"+month);
System.out.println(end);
}
MongoClient mongoClient = new MongoClient(ser.getDbHost(), ser.getDbPort());
// 连接到数据库
MongoDatabase mongo = mongoClient.getDatabase(ser.getDbName());
col = mongo.getCollection(ser.getCollection() + end);
System.out.println(col);
DbDepot.dataCol.put(pt, col);
DbDepot.month = cal.get(Calendar.MONTH);
}
......@@ -164,7 +164,8 @@ public class DataDaoImpl implements DataDao {
Query.query(Criteria.where("pt").is(pt).andOperator(Criteria.where("other").is("data"))),
ServerBean.class);
if (ser.isTable()) {
end = cal.get(Calendar.YEAR) + (cal.get(Calendar.MONTH) + 1) + "";
int month=cal.get(Calendar.MONTH)+1;
end = cal.get(Calendar.YEAR) +""+ (month>10?""+month:"0"+month);
}
MongoClient mongoClient = new MongoClient(ser.getDbHost(), ser.getDbPort());
// 连接到数据库
......@@ -207,10 +208,6 @@ public class DataDaoImpl implements DataDao {
end.setDate(16);
Bson query = new BasicDBObject("time", new BasicDBObject("$gte", start).append("$lte", end));
System.out.println(col.count(query));
// Bson query = new BasicDBObject("time", new BasicDBObject("$gte",
// startTime).append("$lte", endTime))
// .append("spyderInfoId", id);
// System.out.println(col.count(query));
}
@Override
......@@ -240,15 +237,6 @@ public class DataDaoImpl implements DataDao {
Bson query = new BasicDBObject("time", new BasicDBObject());
long count = col.count(query);
return count;
// Calendar c = Calendar.getInstance();
// c.setTime(startTime);
// int year = c.get(Calendar.YEAR);
// int month = c.get(Calendar.MONTH) + 1;
// return
// mongo2.count(Query.query(Criteria.where("time").gte(startTime).lt(endTime).and("pt").is(pt)),
// News.class,
// "net_media_" + year + month);
}
@Override
......@@ -257,9 +245,8 @@ public class DataDaoImpl implements DataDao {
c.setTime(startTime);
int year = c.get(Calendar.YEAR);
int month = c.get(Calendar.MONTH) + 1;
System.out.println("net_media_" + year + month);
return mongo2.find(Query.query(Criteria.where("time").gte(startTime).lt(endTime).and("source").is(source)),
EasyNews.class, "net_media_" + year + month);
return mongo2.find(Query.query(Criteria.where("time").gte(startTime).lt(endTime).and("type").is(source)),
EasyNews.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
@SuppressWarnings("unchecked")
......@@ -269,10 +256,10 @@ public class DataDaoImpl implements DataDao {
int year = c.get(Calendar.YEAR);
int month = c.get(Calendar.MONTH) + 1;
try {
return mongo2.getCollection("net_media_" + year + month).distinct("source",
return mongo2.getCollection("net_media_" + year + (month>10?""+month:"0"+month)).distinct("source",
new BasicDBObject("source", new BasicDBObject("$regex", param)));
} catch (Exception e) {
return mongo2.getCollection("net_media_" + year + month).distinct("source",
return mongo2.getCollection("net_media_" + year + (month>10?""+month:"0"+month)).distinct("source",
new BasicDBObject("source", new BasicDBObject("$regex", param)));
}
}
......@@ -296,7 +283,7 @@ public class DataDaoImpl implements DataDao {
int year = c.get(Calendar.YEAR);
int month = c.get(Calendar.MONTH) + 1;
return mongo2.find(Query.query(Criteria.where("time").gte(startTime).lt(endTime).and("type").is(type)),
EasyNews.class, "net_media_" + year + month);
EasyNews.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
@SuppressWarnings("unchecked")
......@@ -309,7 +296,7 @@ public class DataDaoImpl implements DataDao {
DBObject obj = new BasicDBObject();
obj.put("pt", new BasicDBObject("$ne", "微信"));
obj.put("type", new BasicDBObject("$regex", param));
return mongo2.getCollection("net_media_" + year + month).distinct("type", obj);
return mongo2.getCollection("net_media_" + year + (month>10?""+month:"0"+month)).distinct("type", obj);
} catch (Exception e) {
e.printStackTrace();
}
......@@ -365,4 +352,14 @@ public class DataDaoImpl implements DataDao {
return list;
}
@Override
public List<EasyNews> findBySpId(Date startTime, Date endTime, String syId) {
Calendar c = Calendar.getInstance();
c.setTime(startTime);
int year = c.get(Calendar.YEAR);
int month = c.get(Calendar.MONTH) + 1;
return mongo2.find(Query.query(Criteria.where("time").gte(startTime).lt(endTime).and("spyderInfoId").is(syId)),
EasyNews.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
}
src/main/java/com/zhiwei/manage/dao/FieldBeanDaoImpl.java
......@@ -56,7 +56,7 @@ public class FieldBeanDaoImpl implements FieldBeanDao {
@Override
public FieldBean getFieldsByPt(String pt) {
return mongo.findOne(Query.query(Criteria.where("pt").regex(pt)), FieldBean.class);
return mongo.findOne(Query.query(Criteria.where("pt").is(pt)), FieldBean.class);
}
@Override
......@@ -64,7 +64,7 @@ public class FieldBeanDaoImpl implements FieldBeanDao {
if(pt==null||pt.equals("")){
return (int) mongo.count(null, FieldBean.class);
}else{
return (int) mongo.count(Query.query(Criteria.where("pt").regex(pt)), FieldBean.class);
return (int) mongo.count(Query.query(Criteria.where("pt").is(pt)), FieldBean.class);
}
}
......@@ -73,7 +73,7 @@ public class FieldBeanDaoImpl implements FieldBeanDao {
if(pt==null||pt.equals("")){
return mongo.find(Query.query(Criteria.where("_id").exists(true)).skip((pageNo-1)*pageSize).limit(pageSize),FieldBean.class);
}else{
return mongo.find(Query.query(Criteria.where("pt").regex(pt)).skip((pageNo-1)*pageSize).limit(pageSize),FieldBean.class);
return mongo.find(Query.query(Criteria.where("pt").is(pt)).skip((pageNo-1)*pageSize).limit(pageSize),FieldBean.class);
}
}
......
src/main/java/com/zhiwei/manage/dao/MessageDaoImpl.java
......@@ -128,8 +128,12 @@ public class MessageDaoImpl implements MessageDao {
if (con == null) {
return false;
}
System.out.println(con);
for (String msg : messageId) {
WriteResult wr = con.remove(new BasicDBObject("_id", new ObjectId(msg)));
if(wr.getN()==0) {
return false;
}
}
return true;
}
......@@ -146,9 +150,6 @@ public class MessageDaoImpl implements MessageDao {
return 0;
}
return (int) con.count(new BasicDBObject("handle", false).append("pt",pt ));
// return (int)
// mongo.count(Query.query(Criteria.where("handle").is(false)),
// Message.class);
}
@Override
......
src/main/java/com/zhiwei/manage/dao/NewsDaoImpl.java
......@@ -52,13 +52,13 @@ public class NewsDaoImpl implements NewsDao {
query.addCriteria(Criteria.where("source").is(source));
query.with(new Sort(new Order(Direction.DESC, "time")));
query.limit(delayedCount);
return mongo.find(query, News.class, "net_media_" + year + month);
return mongo.find(query, News.class, "net_media_" + year + (month>10?""+month:"0"+month));
} else {
Query query = new Query();
query.addCriteria(Criteria.where("type").is(type));
query.with(new Sort(new Order(Direction.DESC, "time")));
query.limit(delayedCount);
return mongo.find(query, News.class, "net_media_" + year + month);
return mongo.find(query, News.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
}
......@@ -72,13 +72,13 @@ public class NewsDaoImpl implements NewsDao {
query.addCriteria(Criteria.where("source").is(source));
query.with(new Sort(new Order(Direction.DESC, "time")));
query.limit(filedCount);
return mongo.find(query, News.class, "net_media_" + year + month);
return mongo.find(query, News.class, "net_media_" + year + (month>10?""+month:"0"+month));
} else {
Query query = new Query();
query.addCriteria(Criteria.where("type").is(type));
query.with(new Sort(new Order(Direction.DESC, "time")));
query.limit(filedCount);
return mongo.find(query, News.class, "net_media_" + year + month);
return mongo.find(query, News.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
}
......@@ -90,7 +90,7 @@ public class NewsDaoImpl implements NewsDao {
Criteria criteria = new Criteria();
criteria.and("spyderInfoId").is(spyId);
criteria.and("time").gte(start).lt(end);
return mongo.count(Query.query(criteria), News.class, "net_media_" + year + month);
return mongo.count(Query.query(criteria), News.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
@Override
......@@ -109,7 +109,7 @@ public class NewsDaoImpl implements NewsDao {
Criteria criteria = new Criteria();
criteria.and("source").is(source);
criteria.and("time").gte(start).lt(end);
return (int) mongo.count(Query.query(criteria), News.class, "net_media_" + year + month);
return (int) mongo.count(Query.query(criteria), News.class, "net_media_" + year + (month>10?""+month:"0"+month));
}
@Override
......@@ -118,7 +118,7 @@ public class NewsDaoImpl implements NewsDao {
int month = c.get(Calendar.MONTH) + 1;
int year = c.get(Calendar.YEAR);
return mongo.find(Query.query(Criteria.where("time").gte(start).lt(end)), EasyNews.class,
"net_media_" + year + month);
"net_media_" + year + (month>10?""+month:"0"+month));
}
/**
......
src/main/java/com/zhiwei/manage/dao/TemplateDaoImpl.java
......@@ -37,8 +37,8 @@ public class TemplateDaoImpl implements TemplateDao {
@Override
public boolean insert(Template template) {
DBCollection con = null;
if (DbDepot.dbCons.get(template.getPt()+"msg") != null) {
con = (DBCollection) DbDepot.dbCons.get(template.getPt()+"msg");
if (DbDepot.dbCons.get(template.getPt()+"temp") != null) {
con = (DBCollection) DbDepot.dbCons.get(template.getPt()+"temp");
} else {
con = dbDepot.getDBCollection("msg",template.getPt());
}
......
src/main/java/com/zhiwei/manage/handle/DbDepot.java
......@@ -44,7 +44,8 @@ public class DbDepot {
String end = "";
if (sb.isTable()) {
if (sb.getTableKind().equals("month")) {
end = cal.get(Calendar.YEAR) + (cal.get(Calendar.MONTH) + 1) + "";
int month=cal.get(Calendar.MONTH) + 1;
end = cal.get(Calendar.YEAR) + (month>10?""+month:"0"+month);
} else {
}
......@@ -69,15 +70,17 @@ public class DbDepot {
ServerBean sb = mongo.findOne(
Query.query(Criteria.where("pt").is(pt).orOperator(Criteria.where("other").is(other))),
ServerBean.class);
System.out.println(pt);
System.out.println(sb);
Calendar cal=Calendar.getInstance();
month=cal.get(Calendar.MONTH+1);
if (sb != null) {
if (sb.getDbType().equals("mongo")) {
String end="";
if(sb.isTable()) {
if(sb.getTableKind().equals("month")) {
end = cal.get(Calendar.YEAR) +""+ (cal.get(Calendar.MONTH) + 1) + "";
int month=cal.get(Calendar.MONTH) + 1;
end = cal.get(Calendar.YEAR) + (month>10?""+month:"0"+month);
}else {
}
......
src/main/java/com/zhiwei/manage/handle/MainThread.java
......@@ -147,12 +147,12 @@ public class MainThread extends Thread {
ServerServiceImpl serverService = BeanFactory.getBean(ServerServiceImpl.class);
MessageServiceImpl msgService = BeanFactory.getBean(MessageServiceImpl.class);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// int num = 1;
// int num = 1;
while (true) {
Calendar countTest = Calendar.getInstance();
Calendar start = Calendar.getInstance();
Calendar end = Calendar.getInstance();
// start.set(Calendar.HOUR_OF_DAY, 0);
// start.set(Calendar.HOUR_OF_DAY, 0);
// end.set(Calendar.HOUR_OF_DAY, 0);
if (start.get(Calendar.HOUR_OF_DAY) < 1) {
try {
......@@ -162,6 +162,7 @@ public class MainThread extends Thread {
} catch (ParseException e1) {
e1.printStackTrace();
}
// int num = 1;
// for (int i = 0; i < 19; i++) {
start.add(Calendar.DATE, -1);
countTest.add(Calendar.DATE, -3);
......@@ -184,6 +185,7 @@ public class MainThread extends Thread {
data.setSpyderInfoId(cr.getId());
dataService.insert(data);
if (count == 0) {
// if (num == 1) {
int testCount = (int) dataService.finCountByDayData(countTest.getTime(),
end.getTime(), chan.getPt(), cr.getId());
if (testCount == 0) {
......@@ -196,6 +198,7 @@ public class MainThread extends Thread {
m.setErrorMsg("未定义，" + cr.getConfigName() + "," + chan.getId() + "数据为0");
msgService.insert(m);
}
// }
}
log.info(TimeUtil.yearToDay(start.getTime()) + "|" + data.getTempName() + "|入库");
}
......@@ -222,9 +225,10 @@ public class MainThread extends Thread {
} finally {
mainLock.unlock();
}
// end.add(Calendar.DATE, -1);
// end.add(Calendar.DATE, -1);
// num++;
// }
Tools.sleep(1000 * 60*60);
Tools.sleep(1000 * 60 * 60);
}
Tools.sleep(1000 * 30);
}
......
src/main/java/com/zhiwei/manage/service/DataService.java
......@@ -25,6 +25,8 @@ public interface DataService {
public List<EasyNews> findByAccurateSpId(String startTime, String endTime, String SpId);
public List<EasyNews> findByAccurateType(Date startTime, Date endTime, String type);
public List<EasyNews> findByTempName(Date startTime, Date endTime, String tempName);
public long findWeiboCount(Date start, Date end);
......
src/main/java/com/zhiwei/manage/service/DataServiceImpl.java
......@@ -8,13 +8,15 @@ import org.springframework.stereotype.Service;
import com.zhiwei.manage.bean.Data;
import com.zhiwei.manage.bean.EasyNews;
import com.zhiwei.manage.dao.CrawTemplateDao;
import com.zhiwei.manage.dao.DataDao;
@Service
public class DataServiceImpl implements DataService{
@Autowired
private DataDao dataDao;
@Autowired
private CrawTemplateDao crd;
@Override
public void insert(Data data) {
......@@ -90,6 +92,12 @@ public class DataServiceImpl implements DataService{
public long finCountByDayData(Date startTime, Date endTime, String pt, String id) {
return dataDao.finCountByDayData(startTime, endTime, pt, id);
}
@Override
public List<EasyNews> findByTempName(Date startTime, Date endTime, String tempName) {
String spId=crd.getSpIdByConfigName(tempName);
return dataDao.findBySpId(startTime, endTime, spId);
}
......
src/main/java/com/zhiwei/manage/service/MessageServiceImpl.java
......@@ -39,7 +39,7 @@ public class MessageServiceImpl implements MessageService {
PageEty page = new PageEty();
List<Message> data = messageDao.findAll(pageNo, pageSize,pt);
int count = messageDao.allCount(pt);
if (count % pageSize == 0) {
if (count % pageSize == 0&&count!=0) {
page.setPageCount(count / pageSize);
} else
page.setPageCount(count / pageSize + 1);
......
src/main/java/com/zhiwei/manage/servlet/DataController.java
......@@ -17,6 +17,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -54,32 +55,26 @@ public class DataController {
@RequestMapping(value = "/getDataBySource", produces = "application/json;charset=utf-8")
@ResponseBody
public String getDataBySource(HttpServletRequest request, HttpServletResponse response, long start, long end,
String source) {
int find = 1;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public String getDataBySource(HttpServletRequest request, HttpServletResponse response,@RequestBody Map<String, Object> map) {
long start=(long) map.get("start");
long end=(long) map.get("end");
String source=(String) map.get("source");
Calendar startd = Calendar.getInstance();
startd.setTimeInMillis(start);
Calendar endd = Calendar.getInstance();
endd.setTimeInMillis(end);
System.out.println(sdf.format(startd.getTime()));
System.out.println(sdf.format(endd.getTime()));
if ((end - start) < 1000 * 3600 * 24) {
find = 2;
}
Calendar c = Calendar.getInstance();
c.add(Calendar.DATE, -75);
List<Data> list = dataService.findBySource(startd.getTime(), endd.getTime(), source);
return JSON.toJSONString(list);
}
@RequestMapping(value = "/getDataByTempName", produces = "application/json;charset=utf-8")
@ResponseBody
public String getDataByTempName(HttpServletRequest request, HttpServletResponse response,
@RequestParam(value = "start", defaultValue = "0") long start,
@RequestParam(value = "end", defaultValue = "0") long end,
@RequestParam(value = "timeType", defaultValue = "day") String timeType, String method)
public String getDataByTempName(HttpServletRequest request, HttpServletResponse response,@RequestBody Map<String, Object> map)
throws UnsupportedEncodingException {
long start=(long) map.get("start");
long end=(long) map.get("end");
String timeType=(String) map.get("timeType");
String method=(String) map.get("method");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar startd = Calendar.getInstance();
Calendar endTime = Calendar.getInstance();
......@@ -106,11 +101,11 @@ public class DataController {
}else{
if (method.equals("source")) {
source = request.getParameter("source");
newsList = dataService.findBySourceFromLibrary(startd.getTime(), endTime.getTime(), source);
} else {
source = request.getParameter("tempName");
newsList = dataService.findByTempName(startd.getTime(), endTime.getTime(), source);
}
System.out.println(source);
newsList = dataService.findBySourceFromLibrary(startd.getTime(), endTime.getTime(), source);
}
Data data = Change.changeNewsToDate(newsList, startd.getTime());
list.add(data);
......@@ -146,8 +141,9 @@ public class DataController {
@RequestMapping(value = "/getDataAll", produces = "application/json;charset=utf-8")
@ResponseBody
public String getAllData(@RequestParam(value = "start", defaultValue = "0") long start,
@RequestParam(value = "end", defaultValue = "0") long end) {
public String getAllData(@RequestBody Map<String, Object> map) {
long start=(long) map.get("start");
long end=(long) map.get("end");
try {
if (start == 0) {
List<Channel> channel = serverService.findDisChannel();
......@@ -163,24 +159,6 @@ public class DataController {
chan.setValue(chan.getValue());
list.add(chan);
}
// List<Data> weixin = dataService.findByPt(startTime.getTime(), endTime.getTime(), "微信");
// List<Data> weibo = dataService.findByPt(startTime.getTime(), endTime.getTime(), "微博");
// List<Data> media = dataService.findByPt(startTime.getTime(), endTime.getTime(), "网媒");
// Channel channel = new Channel();
// channel.setList(weixin);
// channel.setPt("微信");
// channel.setValue("wechat");
// Channel cweibo = new Channel();
// cweibo.setList(weibo);
// cweibo.setPt("微博");
// cweibo.setValue("weibo");
// Channel medias = new Channel();
// medias.setList(media);
// medias.setPt("网媒");
// medias.setValue("media");
// list.add(channel);
// list.add(cweibo);
// list.add(medias);
JsonResult result = new JsonResult(true, 200, "请求成功", list);
return JSON.toJSONString(result);
} else {
......@@ -191,10 +169,6 @@ public class DataController {
List<Channel> channel = serverService.findDisChannel();
List<Channel> list = new ArrayList<>();
// Calendar startTime = Calendar.getInstance();
// start = startTime.getTimeInMillis() - 1000 * 3600 * 24 * 7;
// startTime.setTimeInMillis(start);
// Calendar endTime = Calendar.getInstance();
for(Channel chan:channel){
List<Data> weixin = dataService.findByPt(startTime.getTime(), endTime.getTime(), chan.getPt());
chan.setList(weixin);
......@@ -202,25 +176,6 @@ public class DataController {
chan.setValue(chan.getValue());
list.add(chan);
}
// List<Data> weixin = dataService.findByPt(startTime.getTime(), endTime.getTime(), "微信");
// List<Data> weibo = dataService.findByPt(startTime.getTime(), endTime.getTime(), "微博");
// List<Data> media = dataService.findByPt(startTime.getTime(), endTime.getTime(), "网媒");
// List<Channel> list = new ArrayList<Channel>();
// Channel channel = new Channel();
// channel.setList(weixin);
// channel.setPt("微信");
// channel.setValue("wechat");
// Channel cweibo = new Channel();
// cweibo.setList(weibo);
// cweibo.setPt("微博");
// cweibo.setValue("weibo");
// Channel medias = new Channel();
// medias.setList(media);
// medias.setPt("网媒");
// medias.setValue("media");
// list.add(channel);
// list.add(cweibo);
// list.add(medias);
JsonResult result = new JsonResult(true, 200, "请求成功", list);
return JSON.toJSONString(result);
}
......@@ -232,7 +187,9 @@ public class DataController {
@RequestMapping(value = "/getSource", produces = "application/json;charset=utf-8")
@ResponseBody
public String getAllDataCountByTime(String value, String method) {
public String getAllDataCountByTime(@RequestBody Map<String, Object> map) {
String value=(String) map.get("value");
String method=(String) map.get("method");
if (method != null) {
if (method.equals("tempName")) {
List<String> list = dataService.findTmpNameByLikeParam(value);
......@@ -253,7 +210,9 @@ public class DataController {
@RequestMapping(value = "/getTest", produces = "application/json;charset=utf-8")
@ResponseBody
public String getTestData(String method,String value){
public String getTestData(@RequestBody Map<String, Object> map){
String value=(String) map.get("value");
String method=(String) map.get("method");
Calendar startTime=Calendar.getInstance();
startTime.add(Calendar.DATE, -6);
Calendar endTime=Calendar.getInstance();
......
src/main/java/com/zhiwei/manage/servlet/FieldController.java
package com.zhiwei.manage.servlet;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSON;
......@@ -27,8 +28,10 @@ public class FieldController {
*/
@RequestMapping(value = "/getFields", produces = "application/json;charset=utf-8")
@ResponseBody
public String getField(@RequestParam(value = "pageNo", defaultValue = "0") int pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") int pageSize, String pt) {
public String getField(@RequestBody Map<String, Object> map) {
int pageNo = (int) map.get("pageNo");
int pageSize = (int) map.get("pageSize");
String pt = (String) map.get("pt");
PageEty page = fs.findAllFields(pageNo, pageSize, pt);
JsonResult result = new JsonResult(true, 200, "获取成功", page);
return JSON.toJSONString(result);
......@@ -36,7 +39,7 @@ public class FieldController {
@RequestMapping(value = "/updateFields", produces = "application/json;charset=utf-8")
@ResponseBody
public String updateField(FieldBean fieldBean) {
public String updateField(@RequestBody FieldBean fieldBean) {
boolean b = fs.update(fieldBean);
JsonResult result = new JsonResult(true, 200, b ? "修改成功" : "修改失败");
return JSON.toJSONString(result);
......@@ -44,7 +47,8 @@ public class FieldController {
@RequestMapping(value = "/deleteFields", produces = "application/json;charset=utf-8")
@ResponseBody
public String deleteFields(@RequestParam(value = "id[]") List<String> id) {
public String deleteFields(@RequestBody Map<String, Object> map) {
List<String> id=(List<String>) map.get("id");
System.out.println(id);
boolean b = fs.delete(id);
JsonResult result = new JsonResult(b, 200, b ? "删除成功" : "删除失败");
......@@ -53,7 +57,7 @@ public class FieldController {
@RequestMapping(value = "/insertFields", produces = "application/json;charset=utf-8")
@ResponseBody
public String insertField(FieldBean fieldbean) {
public String insertField(@RequestBody FieldBean fieldbean) {
System.out.println(fieldbean);
fs.insert(fieldbean);
JsonResult result = new JsonResult(true, 200, "添加成功");
......@@ -62,7 +66,8 @@ public class FieldController {
@RequestMapping(value = "/getAllFields", produces = "application/json;charset=utf-8")
@ResponseBody
public String getAllFields(String pt) {
public String getAllFields(@RequestBody Map<String, Object> map) {
String pt=(String) map.get("pt");
FieldBean field = fs.getFieldsByPt(pt);
String fields[] = null;
if (field != null) {
......
src/main/java/com/zhiwei/manage/servlet/MessageConteoller.java
package com.zhiwei.manage.servlet;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -22,48 +25,61 @@ public class MessageConteoller {
@RequestMapping(value = "/findAllMsg", produces = "application/json;charset=utf-8")
@ResponseBody
public String getAllMessage(@RequestParam(value = "pageNo", defaultValue = "1") int pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") int pageSize, String tempName,
@RequestParam(value = "pt", defaultValue = "网媒")String pt) {
public String getAllMessage(@RequestBody Map<String, Object> map) {
String tempName = (String) map.get("tempName");
int pageNo = (int) map.get("pageNo");
int pageSize = (int) map.get("pageSize");
String pt = (String) map.get("pt");
if (tempName == null || tempName.equals("")) {
PageEty page = msgService.findAll(pageNo, pageSize,pt);
PageEty page = msgService.findAll(pageNo, pageSize, pt);
JsonResult result = new JsonResult(true, 200, "请求成功", page);
return JSON.toJSONString(result);
} else {
PageEty page = msgService.findByTmpName(tempName, pageNo, pageSize,pt);
JsonResult result = new JsonResult(true, 200, "请求成功", page);
PageEty page = msgService.findByTmpName(tempName, pageNo, pageSize, pt);
JsonResult result = new JsonResult(true, 200, "请求成功", 1);
return JSON.toJSONString(result);
}
}
@RequestMapping(value = "/handle", produces = "application/json;charset=utf-8")
@ResponseBody
public String handle(Message message,@RequestParam(value = "pt", defaultValue = "网媒")String pt) {
System.out.println(message);
String str = msgService.update(message,pt);
public String handle(@RequestBody Map<String, Object> map) {
Message message=new Message();
message.setHandle((boolean)map.get("handle"));
message.setMessageId(String.valueOf(map.get("messageId")));
message.setHandler(String.valueOf("handler"));
String pt = (String) map.get("pt");
String str = msgService.update(message, pt);
JsonResult result = new JsonResult(true, 200, str, "");
return JSON.toJSONString(result);
}
@RequestMapping(value = "/deleteMsg", produces = "application/json;charset=utf-8")
@ResponseBody
public String delete(@RequestParam(value = "messageId[]") List<String> messageId,
@RequestParam(value = "pt", defaultValue = "网媒")String pt) {
msgService.delete(messageId,pt);
public String delete(@RequestBody Map<String, Object> map) {
List<String> messageId=(List<String>) map.get("messageId");
System.out.println(messageId);
String pt=(String) map.get("pt");
msgService.delete(messageId, pt);
JsonResult result = new JsonResult(true, 200, "删除成功", "");
return JSON.toJSONString(result);
}
@RequestMapping(value = "/findHandleMsg", produces = "application/json;charset=utf-8")
@ResponseBody
public String getNewMsg(@RequestParam(value = "pageNo", defaultValue = "1") int pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") int pageSize, String tempName,String pt) {
public String getNewMsg(@RequestBody Map<String, Object> map) {
int pageNo=(int) map.get("pageNo");
int pageSize=(int) map.get("pageSize");
String tempName=(String) map.get("tempName");
String pt=(String) map.get("pt");
if (tempName == null || tempName.equals("")) {
PageEty page = msgService.findByHandle(pageNo, pageSize, true, tempName,pt);
PageEty page = msgService.findByHandle(pageNo, pageSize, true, tempName, pt);
JsonResult result = new JsonResult(true, 200, "获取成功", page);
return JSON.toJSONString(result);
} else {
PageEty page = msgService.findByHandle(pageNo, pageSize, true, tempName,pt);
PageEty page = msgService.findByHandle(pageNo, pageSize, true, tempName, pt);
JsonResult result = new JsonResult(true, 200, "获取成功", page);
return JSON.toJSONString(result);
}
......
src/main/java/com/zhiwei/manage/servlet/PersonController.java
......@@ -2,6 +2,7 @@ package com.zhiwei.manage.servlet;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.Cookie;
......@@ -9,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -27,8 +29,10 @@ public class PersonController {
@RequestMapping(value = "/login", produces = "application/json;charset=utf-8")
@ResponseBody
public String login(HttpServletRequest req, HttpServletResponse res, String username, String password,
boolean isRemember) {
public String login(HttpServletRequest req, HttpServletResponse res,@RequestBody Map<String, Object> map) {
boolean isRemember=(boolean) map.get("isRemember");
String username=(String) map.get("username");
String password=(String) map.get("password");
Person p = personService.login(username, password);
if (p != null) {
Cookie cookie = new Cookie(username, username);
......@@ -49,7 +53,8 @@ public class PersonController {
@RequestMapping(value = "/leave", produces = "application/json;charset=utf-8")
@ResponseBody
public String leave(HttpServletRequest req, HttpServletResponse res, String username) {
public String leave(HttpServletRequest req, HttpServletResponse res, @RequestBody Map<String, Object> map) {
String username=(String) map.get("username");
Cookie[] cookies = req.getCookies();
for (Cookie cookie : cookies) {
if (cookie.getName().equals(username)) {
......@@ -76,10 +81,11 @@ public class PersonController {
@RequestMapping(value = "/getPerson", produces = "application/json;charset=utf-8")
@ResponseBody
public String getPersonByUser(HttpServletResponse res, HttpServletRequest req, String username
,@RequestParam(value = "pageNo", defaultValue = "1") int pageNo,
@RequestParam(value = "pageSize", defaultValue = "10")int pageSize,
@RequestParam(value = "lv", defaultValue = "1")int lv) {
public String getPersonByUser(HttpServletResponse res, HttpServletRequest req,@RequestBody Map<String, Object> map) {
String username=(String) map.get("username");
int pageSize=(int) map.get("pageSize");
int pageNo=(int) map.get("pageNo");
int lv=(int) map.get("lv");
if (username == null || username.equals("")) {
PageEty page = personService.findAll(pageNo, pageSize,lv);
JsonResult result = new JsonResult(true, 200, "获取成功", page);
......@@ -94,7 +100,7 @@ public class PersonController {
@RequestMapping(value = "/updatePerson", produces = "application/json;charset=utf-8")
@ResponseBody
public String updatePerson(Person person){
public String updatePerson(@RequestBody Person person){
boolean b=personService.update(person);
JsonResult result=new JsonResult(b?true:false, 200, b?"操作成功":"操作失败","");
return JSON.toJSONString(result);
......@@ -102,11 +108,12 @@ public class PersonController {
@RequestMapping(value = "/deletePerson", produces = "application/json;charset=utf-8")
@ResponseBody
public String deletePerson(@RequestParam(value = "personId[]")String[] personId){
List<String> deleteList=new ArrayList<>();
for(String p:personId){
deleteList.add(p);
}
public String deletePerson(@RequestBody Map<String, Object> map){
List<String> deleteList=(List<String>) map.get("personId");
// List<String> deleteList=new ArrayList<>();
// for(String p:personId){
// deleteList.add(p);
// }
boolean b=personService.delete(deleteList);
JsonResult result=new JsonResult(b?true:false, 200, b?"操作成功":"操作失败");
return JSON.toJSONString(result);
......@@ -114,7 +121,7 @@ public class PersonController {
@RequestMapping(value = "/savePerson", produces = "application/json;charset=utf-8")
@ResponseBody
public String savePerson(HttpServletRequest req,Person person){
public String savePerson(HttpServletRequest req,@RequestBody Person person){
System.out.println(person);
Cookie[] cookies = req.getCookies();
for (Cookie cookie : cookies) {
......
src/main/java/com/zhiwei/manage/servlet/ServerController.java
......@@ -2,9 +2,11 @@ package com.zhiwei.manage.servlet;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -24,8 +26,10 @@ public class ServerController {
@RequestMapping(value = "/getServer", produces = "application/json;charset=utf-8")
@ResponseBody
public String getServer(@RequestParam(value = "pageNo", defaultValue = "0") int pageNo,
@RequestParam(value = "pageSize", defaultValue = "0") int pageSize, String dbName) {
public String getServer(@RequestBody Map<String, Object> map) {
int pageNo=(int) map.get("pageNo");
int pageSize=(int) map.get("pageSize");
String dbName=(String) map.get("dbName");
PageEty page = ss.findDb(pageNo, pageSize, dbName);
JsonResult result = new JsonResult(true, 200, "获取成功", page);
return JSON.toJSONString(result);
......@@ -33,7 +37,7 @@ public class ServerController {
@RequestMapping(value = "/updateServer", produces = "application/json;charset=utf-8")
@ResponseBody
public String updateServer(ServerBean serverBean) {
public String updateServer(@RequestBody ServerBean serverBean) {
boolean b = ss.update(serverBean);
JsonResult result = new JsonResult(b, 200, b ? "获取成功" : "获取失败");
return JSON.toJSONString(result);
......@@ -41,7 +45,8 @@ public class ServerController {
@RequestMapping(value = "/deleteServer", produces = "application/json;charset=utf-8")
@ResponseBody
public String deleteServer(@RequestParam(value = "serverid[]")List<String> serverid) {
public String deleteServer(@RequestBody Map<String, Object> map) {
List<String> serverid=(List<String>) map.get("serverid");
boolean b = ss.delete(serverid);
JsonResult result = new JsonResult(true, 200, serverid+(b ? "删除成功" : "删除失败"));
return JSON.toJSONString(result);
......@@ -50,7 +55,7 @@ public class ServerController {
@RequestMapping(value = "/insertServer", produces = "application/json;charset=utf-8")
@ResponseBody
public String insertServer(ServerBean serverBean) {
public String insertServer(@RequestBody ServerBean serverBean) {
System.out.println(serverBean);
ss.insert(serverBean);
JsonResult result = new JsonResult(true, 200, "添加成功");
......@@ -63,8 +68,9 @@ public class ServerController {
*/
@RequestMapping(value = "/getChannel", produces = "application/json;charset=utf-8")
@ResponseBody
public String getChannel(@RequestParam(value = "pageNo", defaultValue = "1")int pageNo,
@RequestParam(value = "pageSize", defaultValue = "10")int pageSize){
public String getChannel(@RequestBody Map<String, Object> map){
int pageNo=(int) map.get("pageNo");
int pageSize=(int) map.get("pageSize");
PageEty page=ss.findChannel(pageNo, pageSize);
JsonResult result=new JsonResult(true, 200, "获取成功",page);
return JSON.toJSONString(result);
......@@ -72,7 +78,8 @@ public class ServerController {
@RequestMapping(value = "/changePt", produces = "application/json;charset=utf-8")
@ResponseBody
public String changePt(String pt) {
public String changePt(@RequestBody Map<String, Object> map) {
String pt=(String) map.get("pt");
ss.findPt(pt);
JsonResult result = new JsonResult(true, 200, "源改变成功");
return JSON.toJSONString(result);
......@@ -80,7 +87,7 @@ public class ServerController {
@RequestMapping(value = "/insertChannel", produces = "application/json;charset=utf-8")
@ResponseBody
public String insertChannel(Channel channel){
public String insertChannel(@RequestBody Channel channel){
System.out.println(channel);
ss.insertChannels(channel);
JsonResult result=new JsonResult(true, 200, "添加成功");
......@@ -89,7 +96,7 @@ public class ServerController {
@RequestMapping(value = "/updateChannel", produces = "application/json;charset=utf-8")
@ResponseBody
public String updateChannel(Channel channel){
public String updateChannel(@RequestBody Channel channel){
boolean b=ss.updateChannel(channel);
JsonResult result=new JsonResult(b, 200, b?"修改成功":"修改失败");
return JSON.toJSONString(result);
......@@ -97,7 +104,8 @@ public class ServerController {
@RequestMapping(value = "/deleteChannel", produces = "application/json;charset=utf-8")
@ResponseBody
public String deleteChannel(@RequestParam(value = "id[]")List<String> id) {
public String deleteChannel(@RequestBody Map<String, Object> map) {
List<String> id=(List<String>) map.get("id");
boolean b=ss.deleteChannel(id);
JsonResult result=new JsonResult(b, 200, id+(b?"删除成功":"删除失败"));
return JSON.toJSONString(result);
......
src/main/java/com/zhiwei/manage/servlet/TemplateController.java
package com.zhiwei.manage.servlet;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -24,11 +28,10 @@ public class TemplateController {
private TemplateService ts;
@Autowired
private FieldBeanService fb;
@RequestMapping(value = "/saveTmp", produces = "application/json;charset=utf-8")
@ResponseBody
public String saveTmp(Template template) {
public String saveTmp(@RequestBody Template template) {
System.out.println(template);
if (template != null) {
if (ts.insert(template)) {
......@@ -42,7 +45,8 @@ public class TemplateController {
@RequestMapping(value = "/updateTmp", produces = "application/json;charset=utf-8")
@ResponseBody
public String updateTmp(Template template, String username, HttpServletRequest request) {
public String updateTmp(@RequestBody Map<String, Object> map, HttpServletRequest request) {
Template template = (Template) map.get("template");
if (template != null) {
if (ts.update(template)) {
JsonResult result = new JsonResult(true, 200, "修改成功");
......@@ -55,15 +59,16 @@ public class TemplateController {
@RequestMapping(value = "/deleteTmp", produces = "application/json;charset=utf-8")
@ResponseBody
public String deleteTmp(@RequestParam(value = "templateId[]") String[] templateId,
@RequestParam(value = "pt", defaultValue = "网媒")String pt) {
public String deleteTmp(@RequestBody Map<String, Object> map) {
List<String> templateId = (List<String>) map.get("templateId");
String pt = (String) map.get("pt");
boolean isDelete = false;
String results="";
String results = "";
for (String l : templateId) {
System.out.println(l);
isDelete = ts.delete(l,pt);
MainThread.delete(l);
results+=l+"\n";
isDelete = ts.delete(l, pt);
MainThread.delete(l);
results += l + "\n";
}
JsonResult result = new JsonResult(true, 200, results + "删除" + (isDelete == false ? "成功" : "失败"));
return JSON.toJSONString(result);
......@@ -71,14 +76,17 @@ public class TemplateController {
@RequestMapping(value = "/findAllTmp", produces = "application/json;charset=utf-8")
@ResponseBody
public String findAll(@RequestParam(value = "pageNo", defaultValue = "1") int pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") int pageSize, String tempName,String pt) {
public String findAll(@RequestBody Map<String, Object> map) {
int pageNo = (int) map.get("pageNo");
int pageSize = (int) map.get("pageSize");
String tempName = (String) map.get("tempName");
String pt = (String) map.get("pt");
if (tempName == null || tempName.equals("")) {
PageEty page = ts.findAll(pageNo, pageSize,pt);
PageEty page = ts.findAll(pageNo, pageSize, pt);
JsonResult result = new JsonResult(true, 200, "返回成功", page);
return JSON.toJSONString(result);
} else {
PageEty page = ts.findByTmpName(tempName, pageNo, pageSize,pt);
PageEty page = ts.findByTmpName(tempName, pageNo, pageSize, pt);
if (page != null) {
JsonResult result = new JsonResult(true, 200, "返回成功", page);
return JSON.toJSONString(result);
......@@ -91,7 +99,8 @@ public class TemplateController {
@RequestMapping(value = "/startTmp", produces = "application/json;charset=utf-8")
@ResponseBody
public String startTmp(String templateId) {
public String startTmp(@RequestBody Map<String, Object> map) {
String templateId = (String) map.get("templateId");
boolean b = MainThread.pushMap(templateId);
if (b) {
JsonResult result = new JsonResult(true, 200, "启动成功");
......@@ -104,7 +113,8 @@ public class TemplateController {
@RequestMapping(value = "/stopTmp", produces = "application/json;charset=utf-8")
@ResponseBody
public String stopTmp(String templateId) {
public String stopTmp(@RequestBody Map<String, Object> map) {
String templateId = (String) map.get("templateId");
boolean b = MainThread.removeMap(templateId);
if (b) {
JsonResult result = new JsonResult(true, 200, "关闭成功");
......@@ -114,14 +124,14 @@ public class TemplateController {
return JSON.toJSONString(result);
}
}
@RequestMapping(value = "/getField", produces = "application/json;charset=utf-8")
@ResponseBody
public String getField(@RequestParam(value = "pt", defaultValue = "网媒")String pt){
FieldBean fieldBean=fb.getFieldsByPt(pt);
JsonResult result=new JsonResult(true, 200, "获取成功",fieldBean.getField());
public String getField(@RequestBody Map<String, Object> map) {
String pt = (String) map.get("pt");
FieldBean fieldBean = fb.getFieldsByPt(pt);
JsonResult result = new JsonResult(true, 200, "获取成功", fieldBean.getField());
return JSON.toJSONString(result);
}
}
src/main/resources/mongo.properties
###生产环境
#修改模板线程的注释
mongo.serverMongoIp=192.168.0.101
#mongo.serverMongoIp=192.168.0.101
mongo.serverMongoIp=115.236.59.91
mongo.serverMongoPort=27017
mongo.spyPlatData.dbName1=dataMonitoring
##############################################
mongo2.serverMongoIp=192.168.0.101
mongo2.serverMongoIp=115.236.59.91
mongo2.serverMongoPort=27017
mongo2.spyPlatData.dbName1=mediaspider
##############################################
weibomongo.serverMongoIp=192.168.0.101
weibomongo.serverMongoIp=115.236.59.91
weibomongo.serverMongoPort=27017
weibomongo.spyPlatData.dbName1=NetWork
src/main/webapp/datamanage/dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>数据管理系统</title><link rel=stylesheet href=./static/css/style.ini.css><link rel=stylesheet href=./static/datepicker/css/datepicker.css><link rel=stylesheet href=./static/datepicker/css/layout.css><link href=./static/css/app.9c6ab0c57a93c0f894da068b9ee8c4e1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.5cd57a9c9ef9c94717cd.js></script><script type=text/javascript src=./static/js/vendor.c00def797876150978d2.js></script><script type=text/javascript src=./static/js/app.2eb09a796a47906b0321.js></script></body><script src=./static/js/jquery-1.12.4.min.js></script><script src=./static/js/jquery.easing-master/jquery.easing.min.js></script><script src=./static/js/jquery.transit.js></script><script src=./static/datepicker/js/datepicker.js></script><script src=./static/datepicker/js/eye.js></script><script src=./static/datepicker/js/utils.js></script></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>数据管理系统</title><link rel=stylesheet href=./static/css/style.ini.css><link rel=stylesheet href=./static/datepicker/css/datepicker.css><link rel=stylesheet href=./static/datepicker/css/layout.css><link href=./static/css/app.8d461fe49679002724ef47fee8442561.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.250aa84209ae998dac1d.js></script><script type=text/javascript src=./static/js/vendor.c00def797876150978d2.js></script><script type=text/javascript src=./static/js/app.e63537b1683f72aab222.js></script></body><script src=./static/js/jquery-1.12.4.min.js></script><script src=./static/js/jquery.easing-master/jquery.easing.min.js></script><script src=./static/js/jquery.transit.js></script><script src=./static/datepicker/js/datepicker.js></script><script src=./static/datepicker/js/eye.js></script><script src=./static/datepicker/js/utils.js></script></html>
\ No newline at end of file
src/main/webapp/datamanage/dist/static/js/app.2eb09a796a47906b0321.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/datamanage/dist/static/js/app.2eb09a796a47906b0321.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/datamanage/dist/static/js/manifest.5cd57a9c9ef9c94717cd.js deleted 100644 → 0
!function(e){function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,s=0,l=[];s<t.length;s++)u=t[s],o[u]&&l.push(o[u][0]),o[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=n(n.s=a[s]);return f};var t={},o={2:0};n.e=function(e){function r(){i.onerror=i.onload=null,clearTimeout(u);var n=o[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),o[e]=void 0)}var t=o[e];if(0===t)return new Promise(function(e){e()});if(t)return t[2];var c=new Promise(function(n,r){t=o[e]=[n,r]});t[2]=c;var a=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.timeout=12e4,n.nc&&i.setAttribute("nonce",n.nc),i.src=n.p+"static/js/"+e+"."+{0:"c00def797876150978d2",1:"2eb09a796a47906b0321"}[e]+".js";var u=setTimeout(r,12e4);return i.onerror=i.onload=r,a.appendChild(i),c},n.m=e,n.c=t,n.d=function(e,r,t){n.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},n.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(r,"a",r),r},n.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.5cd57a9c9ef9c94717cd.js.map
\ No newline at end of file
src/main/webapp/datamanage/src/App.vue
......@@ -150,10 +150,10 @@ export default {
methods: {
selectPtChange (n) {
this.ptSelectedData = n
let params = {
let data = {
pt: n.pt
}
requestChangePt(params, {}, (response) => {
requestChangePt({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.ptSelectedData = n
......@@ -198,10 +198,10 @@ export default {
}, 500)
},
logout () {
let params = {
let data = {
username: this.userInfo.username
}
requestLeave(params, {}, (response) => {
requestLeave({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......@@ -224,10 +224,10 @@ export default {
if (val === undefined) {
return false
}
let params = {
let data = {
pt: this.ptSelectedData.pt
}
requestGetAllFields(params, {}, (response) => {
requestGetAllFields({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.allFields = response.data.data
......
src/main/webapp/datamanage/src/components/ChannelData/ChannelData.vue
......@@ -165,11 +165,11 @@ export default {
this.option.legend.data = []
this.option.legend.selected = {}
this.option.series = []
let params = {
let data = {
start: this.startTime,
end: this.endTime
}
requestGetDataAll(params, {}, (response) => {
requestGetDataAll({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.data = response.data.data
......
src/main/webapp/datamanage/src/components/ChannelTableInfo/ChannelTableInfo.vue
......@@ -117,12 +117,12 @@ export default {
},
getChannel () {
let pageSize = this.pageSize
let params = {
let data = {
pageNo: this.page,
pageSize: pageSize
// tempName: this.tempName
}
requestGetChannel(params, {}, (response) => {
requestGetChannel({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.channelData = response.data.data
......
src/main/webapp/datamanage/src/components/CheckInfo/CheckInfo.vue
......@@ -118,13 +118,13 @@ export default {
},
findAllMsg () {
let pageSize = this.pageSize
let params = {
let data = {
pageNo: this.page,
pageSize: pageSize,
tempName: this.tempName,
pt: this.ptSelectedData.pt
}
requestFindAllMsg(params, {}, (response) => {
requestFindAllMsg({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.MsgData = response.data.data
......
src/main/webapp/datamanage/src/components/CheckTemplate/CheckTemplate.vue
......@@ -135,11 +135,11 @@ export default {
this.checkbox = [false, false, false, false, false, false, false, false, false, false]
},
tempToggle (i) {
let params = {
let data = {
templateId: this.tempData.data[i].templateId
}
if (!this.toggle[i]) {
requestStartTmp(params, {}, (response) => {
requestStartTmp({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.findAllTmp()
......@@ -151,7 +151,7 @@ export default {
}
})
} else {
requestStopTmp(params, {}, (response) => {
requestStopTmp({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.findAllTmp()
......@@ -179,13 +179,13 @@ export default {
},
findAllTmp () {
let pageSize = this.pageSize
let params = {
let data = {
pageNo: this.page,
pageSize: pageSize,
tempName: this.tempName,
pt: this.ptSelectedData.pt
}
requestFindAllTmp(params, {}, (response) => {
requestFindAllTmp({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.tempData = response.data.data
......
src/main/webapp/datamanage/src/components/DatabaseInfo/DatabaseInfo.vue
......@@ -141,11 +141,11 @@ export default {
this.checkbox = [false, false, false, false, false, false, false, false, false, false]
},
tempToggle (i) {
let params = {
let data = {
templateId: this.DatabaseData.data[i].templateId
}
if (!this.toggle[i]) {
requestStartTmp(params, {}, (response) => {
requestStartTmp({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.getServer()
......@@ -157,7 +157,7 @@ export default {
}
})
} else {
requestStopTmp(params, {}, (response) => {
requestStopTmp({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.getServer()
......@@ -185,12 +185,12 @@ export default {
},
getServer () {
let pageSize = this.pageSize
let params = {
let data = {
pageNo: this.page,
pageSize: pageSize,
dbName: this.dbName
}
requestGetServer(params, {}, (response) => {
requestGetServer({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.DatabaseData = response.data.data
......
src/main/webapp/datamanage/src/components/DetailedData/DetailedData.vue
......@@ -208,11 +208,11 @@ export default {
this.echartsUpdate()
},
searchValue () {
let params = {
let data = {
method: this.method,
value: this.methodValue
}
requestGetSource(params, {}, (response) => {
requestGetSource({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.matchingWord = response.data.data
......@@ -256,7 +256,8 @@ export default {
bus.$emit('alert', '选择时间段错误！(Error code: 159)')
return false
}
requestGetDataByTempName(params, {}, (response) => {
let data = params
requestGetDataByTempName(params, data, (response) => {
if (response.data) {
if (response.data.state) {
// 清空
......
src/main/webapp/datamanage/src/components/FieldTableInfo/FieldTableInfo.vue
......@@ -141,12 +141,12 @@ export default {
},
getFields () {
let pageSize = this.pageSize
let params = {
let data = {
pageNo: this.page,
pageSize: pageSize,
pt: this.pt
}
requestGetFields(params, {}, (response) => {
requestGetFields({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.fieldData = response.data.data
......
src/main/webapp/datamanage/src/components/Login/Login.vue
......@@ -41,13 +41,13 @@ export default {
bus.$emit('alert', '用户名和密码不可为空！')
return false
}
let params = {
let data = {
username: this.username,
password: this.password,
isRemember: this.isRemember
}
// this.$router.push({'path': '/checkInfo'})
requestLogin(params, {}, (response) => {
requestLogin({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('setUserInfo', response.data.data)
......
src/main/webapp/datamanage/src/components/ProcessingRecord/ProcessingRecord.vue
......@@ -62,7 +62,13 @@
<!-- 删除处理记录 -->
<div class="mask" v-if="popup.processingRecordDelete">
<processing-record-delete @close="popup.processingRecordDelete = false" :children-data="childrenData" :checked-message="checkedMessage" @update="findAllHandleMsg()" @clear-checkbox="clearCheckbox()" />
<processing-record-delete
@close="popup.processingRecordDelete = false"
:children-data="childrenData"
:checked-message="checkedMessage"
@update="findAllHandleMsg()"
@clear-checkbox="clearCheckbox()"
:pt-selected-data="ptSelectedData" />
</div>
</div>
......@@ -121,13 +127,13 @@ export default {
},
findAllHandleMsg () {
let pageSize = this.pageSize
let params = {
let data = {
pageNo: this.page,
pageSize: pageSize,
tempName: this.tempName,
pt: this.ptSelectedData.pt
}
requestFindHandleMsg(params, {}, (response) => {
requestFindHandleMsg({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.handleData = response.data.data
......
src/main/webapp/datamanage/src/components/UserManage/UserManage.vue
......@@ -133,13 +133,13 @@ export default {
},
getUserList () {
let pageSize = this.pageSize
let params = {
let data = {
pageNo: this.page,
pageSize: pageSize,
username: this.username,
lv: this.userInfo.lv
}
requestGetPerson(params, {}, (response) => {
requestGetPerson({}, data, (response) => {
if (response.data) {
if (response.data.state) {
this.userData = response.data.data
......
src/main/webapp/datamanage/src/components/module/channelAdd.vue
......@@ -67,7 +67,8 @@ export default {
bus.$emit('alert', '存在未填写项！')
return false
}
requestInsertChannel(params, {}, (response) => {
let data = params
requestInsertChannel(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/channelDelete.vue
......@@ -44,12 +44,12 @@ export default {
})
},
submit () {
let params = {
let data = {
id: this.checkedChannel.map((n, i) => {
return n.id
})
}
requestDeleteChannel(params, {}, (response) => {
requestDeleteChannel({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/channelDetails.vue
......@@ -73,7 +73,8 @@ export default {
bus.$emit('alert', '存在未填写项！')
return false
}
requestUpdateChannel(params, {}, (response) => {
let data = params
requestUpdateChannel(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/checkInfoDelete.vue
......@@ -44,13 +44,13 @@ export default {
})
},
submit () {
let params = {
let data = {
messageId: this.checkedMessage.map((n, i) => {
return n.messageId
}),
pt: this.ptSelectedData.pt
}
requestDeleteMsg(params, {}, (response) => {
requestDeleteMsg({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/checkInfoDetails.vue
......@@ -113,7 +113,7 @@ export default {
})
},
submit () {
let params = {
let data = {
messageId: this.childrenData.messageId,
// templateName: this.childrenData.templateName,
// handleDate: this.childrenData.handleDate,
......@@ -125,7 +125,7 @@ export default {
handler: this.userInfo.username,
pt: this.ptSelectedData.pt
}
requestHandle(params, {}, (response) => {
requestHandle({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/checkTemplateAdd.vue
......@@ -231,7 +231,8 @@ export default {
console.log('checkTemplateAdd request params:', params)
// {tmp: JSON.stringify(params)}
requestSaveTmp(params, {}, (response) => {
let data = params
requestSaveTmp(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/checkTemplateDelete.vue
......@@ -44,13 +44,13 @@ export default {
})
},
submit () {
let params = {
let data = {
templateId: this.checkedTemplate.map((n, i) => {
return n.templateId
}),
pt: this.ptSelectedData.pt
}
requestDeleteTmp(params, {}, (response) => {
requestDeleteTmp({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/checkTemplateDetails.vue
......@@ -231,9 +231,10 @@ export default {
params.field = this.data.field.join(',')
params.templateId = this.childrenData.templateId
console.log('checkTemplateDetails request params:', params)
// console.log('checkTemplateDetails request params:', params)
requestUpdateTmp(params, {}, (response) => {
let data = params
requestUpdateTmp(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/databaseAdd.vue
......@@ -136,7 +136,8 @@ export default {
bus.$emit('alert', '端口必须为数字')
return false
}
requestInsertServer(params, {}, (response) => {
let data = params
requestInsertServer(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/databaseDelete.vue
......@@ -44,12 +44,12 @@ export default {
})
},
submit () {
let params = {
let data = {
serverid: this.checkedDatabase.map((n, i) => {
return n.id
})
}
requestDeleteServer(params, {}, (response) => {
requestDeleteServer({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/databaseDetails.vue
......@@ -137,7 +137,8 @@ export default {
bus.$emit('alert', '存在未填写项！')
return false
}
requestUpdateServer(params, {}, (response) => {
let data = params
requestUpdateServer(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/fieldAdd.vue
......@@ -144,7 +144,8 @@ export default {
// }
// }
params.field = params.field.join(',')
requestInsertFields(params, {}, (response) => {
let data = params
requestInsertFields(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/fieldDelete.vue
......@@ -44,12 +44,12 @@ export default {
})
},
submit () {
let params = {
let data = {
id: this.checkedField.map((n, i) => {
return n.id
})
}
requestDeleteFields(params, {}, (response) => {
requestDeleteFields({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/fieldDetails.vue
......@@ -154,7 +154,8 @@ export default {
// }
params.field = params.field.join(',')
params.id = this.childrenData.id
requestUpdateFields(params, {}, (response) => {
let data = params
requestUpdateFields(params, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/processingRecordDelete.vue
......@@ -25,7 +25,7 @@ export default {
return {
}
},
props: ['checkedMessage'],
props: ['checkedMessage', 'ptSelectedData'],
mounted () {
// 弹框弹出动画
window.$(() => {
......@@ -44,12 +44,13 @@ export default {
})
},
submit () {
let params = {
let data = {
messageId: this.checkedMessage.map((n, i) => {
return n.messageId
})
}),
pt: this.ptSelectedData.pt
}
requestDeleteMsg(params, {}, (response) => {
requestDeleteMsg({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/userAdd.vue
......@@ -62,13 +62,13 @@ export default {
bus.$emit('alert', '等级只能为整数！')
return false
}
let params = {
let data = {
username: this.username,
password: this.password,
lv: this.lv,
creator: this.userInfo.username
}
requestSavePerson(params, {}, (response) => {
requestSavePerson({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/userDelete.vue
......@@ -44,12 +44,12 @@ export default {
})
},
submit () {
let params = {
let data = {
personId: this.checkedUsers.map((n, i) => {
return n.personId
})
}
requestDeletePerson(params, {}, (response) => {
requestDeletePerson({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
src/main/webapp/datamanage/src/components/module/userEdit.vue
......@@ -66,13 +66,13 @@ export default {
bus.$emit('alert', '等级只能为整数！')
return false
}
let params = {
let data = {
username: this.username,
password: this.password,
personId: this.childrenData.personId,
lv: this.lv
}
requestUpdatePerson(params, {}, (response) => {
requestUpdatePerson({}, data, (response) => {
if (response.data) {
if (response.data.state) {
bus.$emit('alert', response.data.message)
......
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