文档、环境清单

xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java

@@ -15,6 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -101,10 +102,13 @@ public class XmRecordVisitController {
 
 			this.datas.add(xmRecordVisit);
 			if(this.datas.size()>100){
-				xmRecordVisitService.batchAddAndCalc(this.datas);
+				List<XmRecordVisit> newDatas=new ArrayList<>();
+				newDatas.addAll(this.datas);
 				this.datas.clear();
+				xmRecordVisitService.batchAddAndCalc(newDatas);
+
 			}
-			m.put("data",xmRecordVisit);
+			//m.put("data",xmRecordVisit);
 		}catch (BizException e) {
 			tips=e.getTips();
 			logger.error("",e);
@@ -116,6 +120,16 @@ public class XmRecordVisitController {
 		return m;
 	}
 
+	@Scheduled(cron = "0 0 */3 * * ?")
+	public void batchAddAndCalc(){
+		if(this.datas.size()>0){
+			List<XmRecordVisit> newDatas=new ArrayList<>();
+			newDatas.addAll(this.datas);
+			this.datas.clear();
+			xmRecordVisitService.batchAddAndCalc(newDatas);
+		}
+	}
+
 	
 	/**
 	@ApiOperation( value = "删除一条重要页面访问记录信息",notes=" ")

xm-core/src/main/java/com/xm/core/ctrl/XmTaskAccessRecordController.java

@@ -1,48 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.utils.ResponseHelper;
-import com.mdp.safe.client.entity.User;
-import com.mdp.safe.client.utils.LoginUtils;
-import com.xm.core.entity.XmTask;
-import com.xm.core.service.XmTaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
-
-import java.util.Map;
-
-/**
- * url编制采用rest风格,如对XM.xm_task xm_task的操作有增删改查,对应的url分别为:<br>
- *  新增: xm/xmTask/add <br>
- *  查询: xm/xmTask/list<br>
- *  模糊查询: xm/xmTask/listKey<br>
- *  修改: xm/xmTask/edit <br>
- *  删除: xm/xmTask/del<br>
- *  批量删除: xm/xmTask/batchDel<br>
- * 组织 com.qqkj  顶级模块 oa 大模块 xm 小模块 <br>
- * 实体 XmTask 表 XM.xm_task 当前主键(包括多主键): id; 
- ***/
-@RestController("xm.core.xmTaskController")
-@RequestMapping(value="/**/xm/core/xmTask")
-@Api(tags={"任务操作接口"})
-public class XmTaskAccessRecordController {
-	
-	static Log logger=LogFactory.getLog(XmTaskAccessRecordController.class);
-
-
-	@Autowired
-	private XmTaskService xmTaskService;
-
-	@ApiOperation("统计所有上级的进度情况")
-	@RequestMapping(value="/accessLog",method=RequestMethod.POST)
-	public Map<String,Object> calcProgress(  @RequestBody XmTask xmTask){
-		User user=LoginUtils.getCurrentUserInfo();
-		return ResponseHelper.ok("成功");
-	}
-}

xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java

@@ -4,7 +4,6 @@ import com.mdp.core.service.BaseService;
 import com.xm.core.entity.XmRecordVisit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -18,7 +17,6 @@ import java.util.*;
 public class XmRecordVisitService extends BaseService {
 	static Logger logger =LoggerFactory.getLogger(XmRecordVisitService.class);
 
-	@Autowired
 	public void batchAddAndCalc(List<XmRecordVisit> datas) {
 		Map<String, Integer> timesMap=new HashMap<>();
 		Map<String,Set<String> > usersMap=new HashMap<>();