更新到位率不一致问题。

dyrqGps/src/main/java/com/tofly/dyrqGps/controller/EsCarGpsUploadController.java

@@ -23,6 +23,7 @@ import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -123,15 +124,45 @@ public class EsCarGpsUploadController {
     @ApiOperation(value = "获取汽车GPS最新位置信息")
     @GetMapping("/getCarLocation")
     public ResultRespone getCarLocation(@ModelAttribute EsCarGpsUploadQuery esCarGpsUploadQuery) {
-        if (esCarGpsUploadQuery.getCarId() == null){
+    	
+    	esCarGpsUploadQuery.setGpsType(Long.valueOf("1"));
+    	esCarGpsUploadQuery.setOrderAsc(true);
+    	
+    	
+    	System.out.println("################################1"+esCarGpsUploadQuery.getCarId());
+    	System.out.println("################################2"+esCarGpsUploadQuery.getGpsType());
+    	System.out.println("################################3"+esCarGpsUploadQuery.getEndTime());
+    	System.out.println("################################4"+esCarGpsUploadQuery.getOrderAsc());
+    	System.out.println("################################5"+esCarGpsUploadQuery.getStartTime());
+    	
+    	
+    	
+    	if (esCarGpsUploadQuery.getCarId() == null){
             throw new ToflyDeniedException("carId不能为空");
         }
+    	
         EsCarGpsUpload esCarGpsUpload = null;
         Page page = new Page();
         page.setSize(new Long(10000));
         QueryBuilder[] queryBuilders = EsQueryUtil.CarGpsUploadQuery(page, esCarGpsUploadQuery);
-        List<EsCarGpsUpload> result = esCarGpsUploadService.getAll(esCarGpsUpload, page,
-                esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders);
+                             
+        List<EsCarGpsUpload> result =new ArrayList<EsCarGpsUpload>();
+        
+        try {
+        	   result = esCarGpsUploadService.getAll(esCarGpsUpload, page,
+                      esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders);
+        	   System.out.println("################################6"+result);
+        
+        }catch (Exception e) {
+			e.printStackTrace();
+		}
+        
+        
+      
+        
+        
+        
+        
         Map resultMap = new HashMap<>();
         int end = result.size() - 1;
         resultMap.put("lat", result.size() == 0 ? null : result.get(0).getLocationLatitude());
@@ -156,6 +187,18 @@ public class EsCarGpsUploadController {
     @GetMapping("/getListPage")
     public ResultRespone getListPage(Page page, @ModelAttribute EsCarGpsUploadQuery esCarGpsUploadQuery) {
         EsCarGpsUpload esCarGpsUpload = null;
+        
+        esCarGpsUploadQuery.setGpsType(Long.valueOf("1"));
+    	esCarGpsUploadQuery.setOrderAsc(true);
+        
+    	System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@1"+esCarGpsUploadQuery.getCarId());
+    	System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@2"+esCarGpsUploadQuery.getGpsType());
+    	System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@3"+esCarGpsUploadQuery.getEndTime());
+    	System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@4"+esCarGpsUploadQuery.getOrderAsc());
+    	System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@5"+esCarGpsUploadQuery.getStartTime());
+    	
+     	
+        
         QueryBuilder[] queryBuilders = EsQueryUtil.CarGpsUploadQuery(page, esCarGpsUploadQuery);
         return ResultRespone.success(esCarGpsUploadService.getAllPage(esCarGpsUpload, page,
                 esSaveInfoUtil.DyMonth(esCarGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));

dyrqGps/src/main/java/com/tofly/dyrqGps/controller/EsGpsUploadController.java

@@ -168,7 +168,7 @@ public class EsGpsUploadController {
     public ResultRespone getAllPageStatistics(Page page, @ModelAttribute EsQuery esQuery) {
         EsGpsUpload esGpsUpload = null;
         QueryBuilder[] queryBuilders = EsQueryUtil.putQUery(page, esQuery);
-        return ResultRespone.success(esGpsUploadService.getAllPageStatistics(esGpsUpload, page,
+        return ResultRespone.success(esGpsUploadService.getAll(esGpsUpload, page,
                 esSaveInfoUtil.DyMonth(esGpsUploadService.getIndex()), elasticsearchTemplate, queryBuilders));
     }
 

dyrqGps/src/main/java/com/tofly/dyrqGps/util/DyrqCommonRedis.java

@@ -12,4 +12,7 @@ public interface DyrqCommonRedis {
     
 
     public final static int SAVE_MAX_TIME=20;
+    
+    
+    
 }

dyrqGps/src/main/resources/bootstrap.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: loc
+    active: pro

dyrqcar/src/main/java/com/tofly/dyrqcar/custom/service/impl/CustomCarServiceImpl.java

@@ -30,6 +30,8 @@ public class CustomCarServiceImpl implements CustomCarService {
 
     private List<Map> dyrqGps(Map param, List<Map> list) {
         ResultRespone resultRespone = dyrqGpsService.getListPage(param);
+        System.out.println(resultRespone.getCode()+"2@@@@@@@@@@@@@@@@@@@@@@@@@@");
+        System.out.println(resultRespone.getResult()+"3@@@@@@@@@@@@@@@@@@@@@@@@@@");
         if (resultRespone.getCode() != 1) {
             throw new ToflyDeniedException("es车辆分页信息查询失败");
         }

src/main/java/com/tofly/dyrq/config/ScheduledTaskTest.java

@@ -1,30 +0,0 @@
-package com.tofly.dyrq.config;
-
-import com.tofly.common.websocket.WebSocketServer;
-import com.tofly.dyrq.custom.service.CustomPlanService;
-import com.tofly.dyrq.custom.service.PlanTaskService;
-import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-@EnableScheduling   // 1.开启定时任务
-@EnableAsync        // 2.开启多线程
-@Slf4j
-@Service
-@AllArgsConstructor
-public class ScheduledTaskTest {
-    private final CustomPlanService customPlanService;
-
-    @Async
-    @Scheduled(cron="0 1 0 * * ?")  // 每天0:01触发 0 1 0 * * ?
-    @SneakyThrows
-    public void uploadPlanState(){
-        customPlanService.uploadPlanState();
-    }
-}

src/main/java/com/tofly/dyrq/controller/AppFileController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.entity.ResultRespone;
 import com.tofly.common.log.annotation.ToFlyAppLog;
+import com.tofly.dyrq.custom.mapper.PointContentMapper;
 import com.tofly.dyrq.entity.AppFile;
 import com.tofly.dyrq.service.AppFileService;
 import lombok.AllArgsConstructor;
@@ -32,6 +33,7 @@ import java.util.Arrays;
 public class AppFileController {
 
     private final  AppFileService appFileService;
+    
 
     /**
     * 分页查询
@@ -44,6 +46,11 @@ public class AppFileController {
     public ResultRespone getAppFilePage(Page page, @ModelAttribute AppFile appFile) {
       return ResultRespone.success(appFileService.page(page, Wrappers.query(appFile)));
     }
+    
+    
+  
+    
+    
 
 
     /**

src/main/java/com/tofly/dyrq/custom/entity/PointContent.java

@@ -0,0 +1,61 @@
+/*
+ * Author: wangjian
+ * 生成entity
+ */
+package com.tofly.dyrq.custom.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import com.tofly.common.core.constant.ToflySqlCondition;
+import com.tofly.common.entity.CommonCode;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * GPS状态表
+ *
+ * @author pra
+ * @date Mon Apr 13 00:00:00 CST 2020
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value="TF_POINT_CONTENT")
+@KeySequence("TF_POINT_CONTENT")
+@ApiModel
+public class PointContent extends Model<PointContent> {
+    private static final long serialVersionUID = 1L;
+
+        /**
+     * 编号GUID
+     */
+        @TableId(value = "ID",type= IdType.INPUT)
+        @ApiModelProperty(value = "编号GUID")
+                private Long id;
+                /**
+     *  点位type（0未更新，1已更新）
+     */
+        @ApiModelProperty(value = "是否已经处理")        
+                private Integer isHandle;
+                /**
+     * 点位type（1、point、2、path、3child）
+     */
+        @ApiModelProperty(value = "点位类型")
+                private Integer jsonType;
+        /**
+         * 经度
+         */
+        @ApiModelProperty(value = "点位信息")
+                private String jsonContent;
+  
+        
+}

src/main/java/com/tofly/dyrq/custom/mapper/PointContentMapper.java

@@ -0,0 +1,21 @@
+/*
+ * Author: wangjian
+ * 生成mapper
+ */
+package com.tofly.dyrq.custom.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tofly.dyrq.custom.entity.PointContent;
+
+import org.apache.ibatis.annotations.Param;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+/**
+ * 
+ *
+ * @author Zhangyu
+ * @date Mon Oct 26 00:00:00 GMT+08:00 2020
+ */
+@Mapper
+public interface PointContentMapper extends BaseMapper<PointContent> {}

src/main/java/com/tofly/dyrq/custom/service/impl/CustomPointServiceImpl.java

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tofly.common.core.util.Date8Util;
+import com.tofly.dyrq.custom.entity.PointContent;
 import com.tofly.dyrq.custom.entity.UpdatePoint;
 import com.tofly.dyrq.custom.mapper.CustomPlanMapper;
 import com.tofly.dyrq.custom.mapper.CustomPointMapper;
+import com.tofly.dyrq.custom.mapper.PointContentMapper;
 import com.tofly.dyrq.custom.service.CustomPointService;
 import com.tofly.dyrq.entity.PlanChild;
 import com.tofly.dyrq.entity.PlanPointTemp;
@@ -48,6 +50,9 @@ public class CustomPointServiceImpl implements CustomPointService {
     private final SysDeviceTypeService sysDeviceTypeService;
     private final ValueOperations<String, String> valueOperations;
     private final RedisTemplate redisTemplate;
+    private PointContentMapper pointContentMapper;
+    
+    
     
     @Override
     @Transactional
@@ -64,7 +69,14 @@ public class CustomPointServiceImpl implements CustomPointService {
                         transfer.put("pointTempId", u.getTempId());
                         continue;
                     }
-                    valueOperations.set("point_" + u.getTempId(), JSON.toJSONString(u));
+                    
+                    PointContent pc =new PointContent();
+                    pc.setIsHandle(0);
+                    pc.setJsonContent(JSON.toJSONString(u));
+                    pc.setJsonType(1);
+                    pointContentMapper.insert(pc);
+                    
+                    //valueOperations.set("point_" + u.getTempId(), JSON.toJSONString(u));
                 } else if ("1".equals(u.getType())) {
                     String childPlanState = customPointMapper.getStateByPath(u.getTempId());
                     if ("7".equals(childPlanState)) {
@@ -74,14 +86,28 @@ public class CustomPointServiceImpl implements CustomPointService {
                         if (!childList.contains(u.getPlanChildId())) {
                             childList.add(u.getPlanChildId());
                         }
-                    }                                        
-                    valueOperations.set("path_" + u.getTempId(), JSON.toJSONString(u));  
+                    }                 
+                    PointContent pc1 =new PointContent();
+                    pc1.setIsHandle(0);
+                    pc1.setJsonContent(JSON.toJSONString(u));
+                    pc1.setJsonType(2);
+                    pointContentMapper.insert(pc1);
+                   
+                    //valueOperations.set("path_" + u.getTempId(), JSON.toJSONString(u));  
                 }
             }
             childIds.add(u.getPlanChildId());
         }
-        SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmssSSSSSSS");
-        valueOperations.set("child_" + Long.parseLong(sdf.format(new Date())), StringUtils.join(childIds, ",")); 
+        
+        PointContent pc2 =new PointContent();
+        pc2.setIsHandle(0);
+        pc2.setJsonContent(StringUtils.join(childIds, ","));
+        pc2.setJsonType(3);
+        pointContentMapper.insert(pc2);
+        
+        
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmssSSSSSSS");
+//        valueOperations.set("child_" + Long.parseLong(sdf.format(new Date())), StringUtils.join(childIds, ",")); 
         return transfer;
     }
     
@@ -93,21 +119,24 @@ public class CustomPointServiceImpl implements CustomPointService {
 //	@Override
 	@Async("asyncServiceExecutor")
 	@PostConstruct
-	@Scheduled(fixedDelay = 3000)
+	@Scheduled(fixedDelay = 5000)
 	public void executPoint() {				
 		try {
-			Set<String> pointKeys = redisTemplate.keys("point_"+"*");
-			if (pointKeys.size()!=0) {
-				for(String pointKey : pointKeys) {
-	        		String pointValue = valueOperations.get(pointKey);	        		
+			
+			List<PointContent> pcList= pointContentMapper.selectList(Wrappers.<PointContent>lambdaQuery()
+					.eq(PointContent::getIsHandle, 0).eq(PointContent::getJsonType, 1));	
+			if (pcList.size()!=0) {
+				for(PointContent pc : pcList) {
+	        		String pointValue = pc.getJsonContent();	
 	        		JSONObject jsonObject  = JSONObject.parseObject(pointValue);
 		    		UpdatePoint u = JSON.toJavaObject(jsonObject,UpdatePoint.class);		    		
 	        		planPointTempService.update(Wrappers.<PlanPointTemp>lambdaUpdate()
 	                        .set(PlanPointTemp::getIsover, "1")
 	                        .set(PlanPointTemp::getOverDate, u.getCheckTime())
 	                        .set(PlanPointTemp::getGpsSpeed, u.getGpsSpeed())
-	                        .eq(PlanPointTemp::getId, u.getTempId()));    
-	        		redisTemplate.delete(pointKey);	        		
+	                        .eq(PlanPointTemp::getId, u.getTempId()));    	        		
+	        		pc.setIsHandle(1);
+	        		pointContentMapper.updateById(pc);		
 	        	}
 			}
 		}catch (Exception e) {
@@ -118,31 +147,40 @@ public class CustomPointServiceImpl implements CustomPointService {
 	@Override
 	@Async("asyncServiceExecutor")
 	@PostConstruct
-	@Scheduled(fixedDelay = 2000)
+	@Scheduled(fixedDelay = 5000)
 	public void executPath() {
 		
 		try {
-			Set<String> pathkeys = redisTemplate.keys("path_"+"*");
-		    if (CollectionUtils.isNotEmpty(pathkeys)) {	   
-		    	for(String pathKey : pathkeys) {
-		    		String pathValue = valueOperations.get(pathKey);	  
+			List<PointContent> pcList= pointContentMapper.selectList(Wrappers.<PointContent>lambdaQuery()
+					.eq(PointContent::getIsHandle, 0).eq(PointContent::getJsonType, 2));
+			
+			
+			System.out.println("&&&&&&&&&&&&&&&&&&&&&&&&"+pcList.size());
+			
+		    if (pcList.size()!=0) {	   
+		    	for(PointContent pc : pcList) {
+		    		String pathValue = pc.getJsonContent();;	  
 		    		JSONObject jsonObject  = JSONObject.parseObject(pathValue);
-		    		UpdatePoint up = JSON.toJavaObject(jsonObject,UpdatePoint.class);	
-		    		boolean pathflag =planPathTempService.update(Wrappers.<TfPlanPathTemp>lambdaUpdate()
-		                    .set(TfPlanPathTemp::getIsover, "1")
-		                    .set(TfPlanPathTemp::getOverDate, up.getCheckTime())
-		                    .set(TfPlanPathTemp::getGpsSpeed, up.getGpsSpeed())
-		                    .eq(TfPlanPathTemp::getId, up.getTempId()));	    			    		
-		    		//更新完成点所属线的完成率
-		            Long pointTempId =planPathTempService.getById(up.getTempId()).getTempId();
-		            int isOverNum = planPathTempService.count(Wrappers.<TfPlanPathTemp>lambdaQuery().eq(TfPlanPathTemp::getTempId, pointTempId).eq(TfPlanPathTemp::getIsover, "1"));
-		            int allNum = planPathTempService.count(Wrappers.<TfPlanPathTemp>lambdaQuery().eq(TfPlanPathTemp::getTempId, pointTempId));
-		            double pathOver = new BigDecimal((float) isOverNum / allNum).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
-		            PlanPointTemp one = new PlanPointTemp();
-		            one.setId(pointTempId);
-		            one.setPathIsover(new BigDecimal(pathOver));
-		            planPointTempService.updateById(one);
-		            redisTemplate.delete(pathKey);
+		    		UpdatePoint up = JSON.toJavaObject(jsonObject,UpdatePoint.class);			    		
+		    		TfPlanPathTemp  tppt = planPathTempService.getById(up.getTempId());
+		    		if(null!=tppt) {
+		    			boolean pathflag =planPathTempService.update(Wrappers.<TfPlanPathTemp>lambdaUpdate()
+			                    .set(TfPlanPathTemp::getIsover, "1")
+			                    .set(TfPlanPathTemp::getOverDate, up.getCheckTime())
+			                    .set(TfPlanPathTemp::getGpsSpeed, up.getGpsSpeed())
+			                    .eq(TfPlanPathTemp::getId, up.getTempId()));	    			    		
+			    		//更新完成点所属线的完成率
+			            Long pointTempId =tppt.getTempId();
+			            int isOverNum = planPathTempService.count(Wrappers.<TfPlanPathTemp>lambdaQuery().eq(TfPlanPathTemp::getTempId, pointTempId).eq(TfPlanPathTemp::getIsover, "1"));
+			            int allNum = planPathTempService.count(Wrappers.<TfPlanPathTemp>lambdaQuery().eq(TfPlanPathTemp::getTempId, pointTempId));
+			            double pathOver = new BigDecimal((float) isOverNum / allNum).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
+			            PlanPointTemp one = new PlanPointTemp();
+			            one.setId(pointTempId);
+			            one.setPathIsover(new BigDecimal(pathOver));
+			            planPointTempService.updateById(one);
+			            pc.setIsHandle(1);
+		        		pointContentMapper.updateById(pc);	
+		    		}
 		    	}
 		    }
 		}catch (Exception e) {
@@ -154,13 +192,15 @@ public class CustomPointServiceImpl implements CustomPointService {
 	@Override
 	@Async("asyncServiceExecutor")
 	@PostConstruct
-	@Scheduled(fixedDelay = 3000)
+	@Scheduled(fixedDelay = 6000)
 	public void executChild() {
-		
-			Set<String> childkeys = redisTemplate.keys("child_"+"*");		
-		    if (CollectionUtils.isNotEmpty(childkeys)) {
-		    	for(String childKey : childkeys) {
-		    		String childValue = valueOperations.get(childKey);	        	
+		try {
+			List<PointContent> pcList= pointContentMapper.selectList(Wrappers.<PointContent>lambdaQuery()
+					.eq(PointContent::getIsHandle, 0).eq(PointContent::getJsonType, 3));	
+			
+		    if (pcList.size()!=0) {
+		    	for(PointContent pc : pcList) {
+		    		String childValue = pc.getJsonContent();        	
 		    		List<String> list = Arrays.asList(childValue.split(","));
 		    		
 					for (String sid : list) {
@@ -250,10 +290,12 @@ public class CustomPointServiceImpl implements CustomPointService {
 			            planChildService.update(Wrappers.<PlanChild>lambdaUpdate().set(PlanChild::getChildPlanState, "3")
 			                    .eq(PlanChild::getPercent1, 1).eq(PlanChild::getId, childPlanId));
 					}    
-					redisTemplate.delete(childKey);
-		    	}
-		    	
-		    	
+					pc.setIsHandle(1);
+	        		pointContentMapper.updateById(pc);	
+		    	}	
 		    }
+		}catch (Exception e) {
+			// TODO: handle exception
+		}
 	}
 }

src/main/resources/mapper/PointContent.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.tofly.dyrq.custom.mapper.PointContentMapper">
+   
+   
+   
+</mapper>
+
+
+
+