|  |  | @ -31,7 +31,6 @@ import com.epmet.dto.form.GovOrgFormDTO; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.dto.form.VisitedFormDTO; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.entity.GridVisitedEntity; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.feign.GovOrgFeignClient; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.redis.GridVisitedRedis; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.service.GridLatestService; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.service.GridVisitedService; | 
			
		
	
		
			
				
					|  |  |  | import org.apache.commons.lang3.StringUtils; | 
			
		
	
	
		
			
				
					|  |  | @ -53,8 +52,6 @@ import java.util.Map; | 
			
		
	
		
			
				
					|  |  |  | @Service | 
			
		
	
		
			
				
					|  |  |  | public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, GridVisitedEntity> implements GridVisitedService { | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     @Autowired | 
			
		
	
		
			
				
					|  |  |  |     private GridVisitedRedis gridVisitedRedis; | 
			
		
	
		
			
				
					|  |  |  |     @Autowired | 
			
		
	
		
			
				
					|  |  |  |     private GovOrgFeignClient govOrgFeignClient; | 
			
		
	
		
			
				
					|  |  |  |     @Autowired | 
			
		
	
	
		
			
				
					|  |  | @ -112,6 +109,12 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid | 
			
		
	
		
			
				
					|  |  |  |         baseDao.deleteBatchIds(Arrays.asList(ids)); | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     /** | 
			
		
	
		
			
				
					|  |  |  |      * 网格记录表新增数据 | 
			
		
	
		
			
				
					|  |  |  |      *  @author  sun | 
			
		
	
		
			
				
					|  |  |  |      * @param formDTO | 
			
		
	
		
			
				
					|  |  |  |      * @throws Exception | 
			
		
	
		
			
				
					|  |  |  |      */ | 
			
		
	
		
			
				
					|  |  |  |     @Override | 
			
		
	
		
			
				
					|  |  |  |     @Transactional(rollbackFor = Exception.class) | 
			
		
	
		
			
				
					|  |  |  |     public void saveLatestAndVisited(VisitedFormDTO formDTO) throws Exception { | 
			
		
	
	
		
			
				
					|  |  | @ -132,24 +135,41 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     /** | 
			
		
	
		
			
				
					|  |  |  |      * 网格记录表和最近访问网格表新增数据 | 
			
		
	
		
			
				
					|  |  |  |      * @param formDTO | 
			
		
	
		
			
				
					|  |  |  |      * @param cu | 
			
		
	
		
			
				
					|  |  |  |      */ | 
			
		
	
		
			
				
					|  |  |  |     public void saveGridVisited(VisitedFormDTO formDTO,CustomerGridDTO cu) { | 
			
		
	
		
			
				
					|  |  |  |         Date date = new Date(); | 
			
		
	
		
			
				
					|  |  |  |         GridVisitedDTO vi = new GridVisitedDTO(); | 
			
		
	
		
			
				
					|  |  |  |         vi.setIsRegister(0);//token中获取是否注册
 | 
			
		
	
		
			
				
					|  |  |  |         vi.setIsRegister(getRegister("0"));//token中获取是否注册
 | 
			
		
	
		
			
				
					|  |  |  |         vi.setCustomerId(cu.getCustomerId()); | 
			
		
	
		
			
				
					|  |  |  |         vi.setGridId(cu.getId()); | 
			
		
	
		
			
				
					|  |  |  |         vi.setCustomerUserId(formDTO.getUserId()); | 
			
		
	
		
			
				
					|  |  |  |        // vi.setCustomerUserId(formDTO.getUserId());//token传递的值
 | 
			
		
	
		
			
				
					|  |  |  |         vi.setCustomerUserId("1111111111");//token传递的值
 | 
			
		
	
		
			
				
					|  |  |  |         vi.setVisitTime(date); | 
			
		
	
		
			
				
					|  |  |  |         vi.setUpdatedTime(date); | 
			
		
	
		
			
				
					|  |  |  |         //查询是否存在历史数据(一个用户一天对一个网格只存在一条访问记录)
 | 
			
		
	
		
			
				
					|  |  |  |         GridVisitedEntity dto = baseDao.getGridVisitedByIds(vi); | 
			
		
	
		
			
				
					|  |  |  |         GridVisitedEntity entity = ConvertUtils.sourceToTarget(dto, GridVisitedEntity.class); | 
			
		
	
		
			
				
					|  |  |  |         //查询是否存在历史数据( 一个用户一天对一个网格只存在一条访问记录)
 | 
			
		
	
		
			
				
					|  |  |  |         GridVisitedDTO dto = baseDao.getGridVisitedByIds(vi); | 
			
		
	
		
			
				
					|  |  |  |         GridVisitedEntity entity = null; | 
			
		
	
		
			
				
					|  |  |  |         if(dto==null||dto.getId()==null){ | 
			
		
	
		
			
				
					|  |  |  |             entity = ConvertUtils.sourceToTarget(vi, GridVisitedEntity.class); | 
			
		
	
		
			
				
					|  |  |  |             insert(entity); | 
			
		
	
		
			
				
					|  |  |  |         }else{ | 
			
		
	
		
			
				
					|  |  |  |             entity = ConvertUtils.sourceToTarget(dto, GridVisitedEntity.class); | 
			
		
	
		
			
				
					|  |  |  |             entity.setUpdatedTime(date); | 
			
		
	
		
			
				
					|  |  |  |             updateById(entity); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     /** | 
			
		
	
		
			
				
					|  |  |  |      * (预留方法)查询是否注册状态值 | 
			
		
	
		
			
				
					|  |  |  |      * @param str | 
			
		
	
		
			
				
					|  |  |  |      * @return | 
			
		
	
		
			
				
					|  |  |  |      */ | 
			
		
	
		
			
				
					|  |  |  |     public Integer getRegister(String str){ | 
			
		
	
		
			
				
					|  |  |  |         return 0; | 
			
		
	
		
			
				
					|  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | } |