Skip to content

D
datamanage
Commit b460a4b7 by admin
Options

修复修改失败的问题

parent 63c6ae0b
Showing with 35 additions and 53 deletions
src/main/java/com/zhiwei/manage/dao/MessageDaoImpl.java
package com.zhiwei.manage.dao;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.bson.types.ObjectId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.CriteriaDefinition;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Component;
import com.mongodb.BasicDBObject;
import com.mongodb.DBCollection;
import com.mongodb.DBCursor;
import com.mongodb.DBObject;
import com.mongodb.WriteResult;
import com.zhiwei.manage.bean.Message;
import com.zhiwei.manage.handle.DbDepot;
import com.zhiwei.manage.util.Change;
@Component
public class MessageDaoImpl implements MessageDao {
......@@ -59,7 +46,7 @@ public class MessageDaoImpl implements MessageDao {
for (int j = 0; j < fields.length; j++) {
fields[j].setAccessible(true);
try {
if (fields[j].getName().equals("templateId")||fields[j].getName().equals("tempName")) {
if (fields[j].getName().equals("messageId")) {
continue;
}
if (fields[j].get(message) != null)
......@@ -69,7 +56,7 @@ public class MessageDaoImpl implements MessageDao {
e.printStackTrace();
}
}
WriteResult result = mongo.upsert(Query.query(Criteria.where("tempName").is(message.getTempName())), update,
WriteResult result = mongo.upsert(Query.query(Criteria.where("_id").is(message.getMessageId())), update,
Message.class);
if (result.getN() == 1) {
return "修改成功";
......
src/main/java/com/zhiwei/manage/handle/MainThread.java
......@@ -55,7 +55,7 @@ public class MainThread extends Thread {
}
public MainThread() {
this.start();
// this.start();
}
/**
......@@ -69,7 +69,6 @@ public class MainThread extends Thread {
return false;
} else {
mainMap.put(template.getTemplateId(), template);
System.out.println("加入模板" + template);
if (template.isNeedDelayed()) {
NewsDelayed nd = new NewsDelayed();
nd.setCollection(template.getCollection());
......@@ -176,7 +175,7 @@ public class MainThread extends Thread {
start.add(Calendar.DATE, -1);
}
Calendar end = Calendar.getInstance();
Calendar inTime=Calendar.getInstance();
Calendar inTime = Calendar.getInstance();
inTime.setTime(end.getTime());
inTime.add(Calendar.HOUR_OF_DAY, -1);
try {
......@@ -189,7 +188,7 @@ public class MainThread extends Thread {
map.put(chan.getPt(), chan.getValue());
try {
ServerBean ser = serverService.findServer(chan.getPt());
count = es.getCountByPt(start.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);//当日的数据量
count = es.getCountByPt(start.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);// 当日的数据量
System.out.println(count);
Data data = new Data();
data.setCount(count);
......@@ -197,7 +196,7 @@ public class MainThread extends Thread {
data.setTime(start.getTime());
dataService.insert(data);
log.info(sdf.format(start.getTime()) + "|" + chan.getPt() + "|入库");
count = es.getCountByPt(inTime.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);//小时的数据量
count = es.getCountByPt(inTime.getTime(), end.getTime(), chan.getPt(), chan.getValue(), ser);// 小时的数据量
if (counts.get(chan.getPt()) != null)
if (count < counts.get(chan.getPt())) {
Messages m = new Messages();
......@@ -219,8 +218,8 @@ public class MainThread extends Thread {
if (tmp.getSpyderInfoId() != null) {
int cwCount = 0;
String pt = crawService.findPt(tmp.getSpyderInfoId());
cwCount = (int) es.getCounts(start.getTime(), end.getTime(), pt, map.get(pt),
tmp.getSpyderInfoId(), serverService.findServer(pt));
cwCount = es.getCounts(start.getTime(), end.getTime(), pt, map.get(pt), tmp.getSpyderInfoId(),
serverService.findServer(pt));
try {
Data data = new Data();
data.setCount(cwCount);
......@@ -231,7 +230,7 @@ public class MainThread extends Thread {
if (cwCount == 0) {
loop.setTime(start.getTime());
loop.add(Calendar.DATE, -2);
cwCount = (int) es.getCounts(start.getTime(), end.getTime(), pt, map.get(pt),
cwCount = es.getCounts(start.getTime(), end.getTime(), pt, map.get(pt),
tmp.getSpyderInfoId(), serverService.findServer(pt));
if (cwCount < 3) {
Message msg = new Message();
......
src/main/java/com/zhiwei/manage/service/MessageServiceImpl.java
......@@ -3,9 +3,7 @@ package com.zhiwei.manage.service;
import java.util.ArrayList;
import java.util.List;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import com.zhiwei.manage.bean.Message;
......@@ -24,9 +22,9 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public String update(Message message,String pt) {
public String update(Message message, String pt) {
try {
String str=messageDao.update(message,pt);
String str = messageDao.update(message, pt);
return str;
} catch (Exception e) {
e.printStackTrace();
......@@ -35,11 +33,11 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public PageEty findAll(int pageNo, int pageSize,String pt) {
public PageEty findAll(int pageNo, int pageSize, String pt) {
PageEty page = new PageEty();
List<Message> data = messageDao.findAll(pageNo, pageSize,pt);
List<Message> data = messageDao.findAll(pageNo, pageSize, pt);
int count = messageDao.allCount(pt);
if (count % pageSize == 0&&count!=0) {
if (count % pageSize == 0 && count != 0) {
page.setPageCount(count / pageSize);
} else
page.setPageCount(count / pageSize + 1);
......@@ -51,14 +49,14 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public PageEty findByTmpName(String templateName, int pageNo, int pageSize,String pt) {
public PageEty findByTmpName(String templateName, int pageNo, int pageSize, String pt) {
PageEty page = new PageEty();
List<Message> data = messageDao.findByTmpName(templateName, pageNo, pageSize,pt);
int count = messageDao.findByTmpCount(templateName,pt);
if(data.size()==0){
List<Message> data = messageDao.findByTmpName(templateName, pageNo, pageSize, pt);
int count = messageDao.findByTmpCount(templateName, pt);
if (data.size() == 0) {
page.setData(new ArrayList<>());
page.setDataCount(1);
}else{
} else {
page.setData(data);
page.setDataCount(count);
}
......@@ -72,15 +70,15 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public boolean delete(List<String> MessageId,String pt) {
return messageDao.delete(MessageId,pt);
public boolean delete(List<String> MessageId, String pt) {
return messageDao.delete(MessageId, pt);
}
@Override
public PageEty findByHandle(int pageNo, int pageSize, boolean handle, String tempName,String pt) {
public PageEty findByHandle(int pageNo, int pageSize, boolean handle, String tempName, String pt) {
PageEty page = new PageEty();
int count = messageDao.findByHandleCount(pageNo, pageSize, handle, tempName,pt);
List<Message> list=messageDao.findByHandle(pageNo, pageSize, handle, tempName,pt);
int count = messageDao.findByHandleCount(pageNo, pageSize, handle, tempName, pt);
List<Message> list = messageDao.findByHandle(pageNo, pageSize, handle, tempName, pt);
page.setData(list);
page.setDataCount(count);
page.setPageNo(pageNo);
......@@ -93,8 +91,8 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public Message findMsg(String tempName,String errorType) {
return messageDao.findMsg(tempName,errorType);
public Message findMsg(String tempName, String errorType) {
return messageDao.findMsg(tempName, errorType);
}
}
src/main/java/com/zhiwei/manage/servlet/MessageConteoller.java
......@@ -8,8 +8,6 @@ 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;
import com.alibaba.fastjson.JSON;
......@@ -45,8 +43,8 @@ public class MessageConteoller {
@RequestMapping(value = "/handle", produces = "application/json;charset=utf-8")
@ResponseBody
public String handle(@RequestBody Map<String, Object> map) {
Message message=new Message();
message.setHandle((boolean)map.get("handle"));
Message message = new Message();
message.setHandle((boolean) map.get("handle"));
message.setMessageId(String.valueOf(map.get("messageId")));
message.setHandler(String.valueOf(map.get("handler")));
message.setHandleMsg(String.valueOf(map.get("handleMsg")));
......@@ -60,8 +58,8 @@ public class MessageConteoller {
@RequestMapping(value = "/deleteMsg", produces = "application/json;charset=utf-8")
@ResponseBody
public String delete(@RequestBody Map<String, Object> map) {
List<String> messageId=(List<String>) map.get("messageId");
String pt=(String) map.get("pt");
List<String> messageId = (List<String>) map.get("messageId");
String pt = (String) map.get("pt");
msgService.delete(messageId, pt);
JsonResult result = new JsonResult(true, 200, "删除成功", "");
return JSON.toJSONString(result);
......@@ -70,10 +68,10 @@ public class MessageConteoller {
@RequestMapping(value = "/findHandleMsg", produces = "application/json;charset=utf-8")
@ResponseBody
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");
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);
JsonResult result = new JsonResult(true, 200, "获取成功", page);
......
src/main/java/com/zhiwei/manage/util/ESUtil.java
......@@ -120,7 +120,7 @@ public class ESUtil {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
for(Map<String,Object> map: getDatasMap("1.119.44.201", 9300, "Media-University", "mediaspider*"
, 20, "UrlListDetaildb4b9042-006f-4d09-a643-de379ac07e15", "平媒")) {
, 20, "UrlListDetailb174e638-69f9-4b92-9468-786c274bbfee", "平媒")) {
System.out.println(map.get("title"));
String date = map.get("time").toString().replace("Z", " UTC");
// System.out.println(map.get("time"));
......
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