| 
					
				 | 
			
			
				@@ -12,6 +12,7 @@ import com.usky.common.core.bean.ApiResult; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.common.core.bean.CommonPage; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.common.core.exception.BusinessException; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.common.security.utils.SecurityUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.usky.iot.RuoYiSystemApplication; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.iot.domain.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.iot.mapper.BaseAlarmMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.iot.mapper.DmpDeviceTypeMapper; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -21,6 +22,8 @@ import com.usky.iot.service.config.websocket.WebSocket; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.iot.service.vo.BaseAlarmListVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.iot.service.vo.BaseAlarmRequestVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.usky.iot.service.vo.BaseAlarmResponeVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.slf4j.Logger; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import org.slf4j.LoggerFactory; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.beans.factory.annotation.Autowired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.springframework.stereotype.Service; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -46,6 +49,8 @@ import java.util.stream.Collectors; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @Service 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, BaseAlarm> implements BaseAlarmService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private static final Logger LOGGER = LoggerFactory.getLogger(BaseAlarmServiceImpl.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private DmpProductInfoService dmpProductInfoService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -551,7 +556,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.updateBatchById(list); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }else {  // 单一 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            log.error(SecurityUtils.getLoginUser().toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            LOGGER.info(SecurityUtils.getLoginUser().toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             baseAlarm.setHandleStatus(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             baseAlarm.setHandleBy(SecurityUtils.getUsername()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             baseAlarm.setHandleTime(LocalDateTime.now()); 
			 |