|  |  | @ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.constant.NumConstant; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.constant.ServiceConstant; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.constant.StrConstant; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.enums.OrgTypeEnum; | 
			
		
	
		
			
				
					|  |  |  | import com.epmet.commons.tools.exception.EpmetErrorCode; | 
			
		
	
	
		
			
				
					|  |  | @ -58,8 +57,6 @@ import org.springframework.transaction.annotation.Transactional; | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | import javax.annotation.Resource; | 
			
		
	
		
			
				
					|  |  |  | import javax.servlet.http.HttpServletResponse; | 
			
		
	
		
			
				
					|  |  |  | import java.io.UnsupportedEncodingException; | 
			
		
	
		
			
				
					|  |  |  | import java.net.URLEncoder; | 
			
		
	
		
			
				
					|  |  |  | import java.text.SimpleDateFormat; | 
			
		
	
		
			
				
					|  |  |  | import java.util.*; | 
			
		
	
		
			
				
					|  |  |  | import java.util.stream.Collectors; | 
			
		
	
	
		
			
				
					|  |  | @ -122,8 +119,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec | 
			
		
	
		
			
				
					|  |  |  | 		result.setStaffPatrolRecId(entity.getId()); | 
			
		
	
		
			
				
					|  |  |  | 		result.setStatus(entity.getStatus()); | 
			
		
	
		
			
				
					|  |  |  | 		result.setLatestSerialNum(PatrolConstant.END.equals(entity.getStatus()) ? NumConstant.ONE_NEG : detail.getSerialNum()); | 
			
		
	
		
			
				
					|  |  |  | 		//最小间隔设置 3*60s
 | 
			
		
	
		
			
				
					|  |  |  | 		result.setCarmDown(NumConstant.THREE * NumConstant.SIXTY); | 
			
		
	
		
			
				
					|  |  |  | 		//最小间隔设置 20s
 | 
			
		
	
		
			
				
					|  |  |  | 		result.setCarmDown(NumConstant.TWENTY); | 
			
		
	
		
			
				
					|  |  |  | 		result.setPatrolStartTime(DateUtils.format(entity.getPatrolStartTime(), DateUtils.DATE_TIME_PATTERN)); | 
			
		
	
		
			
				
					|  |  |  | 		//状态为巡查中时返回所在网格ID和名称
 | 
			
		
	
		
			
				
					|  |  |  | 		if (PatrolConstant.PATROLLING.equals(entity.getStatus())) { | 
			
		
	
	
		
			
				
					|  |  | 
 |