[FE]合并

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/impl/ListeningFileDirectoryServiceImpl.java

@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Timer;
import java.util.TimerTask;
@@ -48,9 +49,10 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
    @Autowired
    private KafkaProcess kafkaProcess;
    
    private static Map<String,Timer> timerMap=new HashMap<String,Timer>();
    
    //防止重启后重复监控文件
    private String taskName="pictureTask";
    private static Map<String,Timer> timerMap=new HashMap<String,Timer>();
    private static Map<String,WatchKey> keyMap=new HashMap<String,WatchKey>();
    @Override
    public void getFile(String filePath,int index)  {
@@ -65,7 +67,7 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
    	timerMap.get(timerMapKey).schedule(new TimerTask() {
            @Override
            public void run() {
                WatchKey key;
                WatchKey watchKey;
                //System.out.println("filePath:   " + filePath);
                log.info("filePath:   " + filePath);
                String mapKey = "";
@@ -78,10 +80,12 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
                            File file = new File(filePath);//path为监听文件夹
                            //System.out.println("等待图片加载！");
                            log.info("等待图片加载！");
                            key = watchService.take();//没有文件增加时，阻塞在这里
                            watchKey = watchService.take();//没有文件增加时，阻塞在这里
                            keyMap.put(timerMapKey, watchKey);
                            
                            int i = 0;
                            String[] fileContent = new String[3600];
                            for (WatchEvent<?> event : key.pollEvents()) {
                            for (WatchEvent<?> event : watchKey.pollEvents()) {
                                String fileName = filePath+MonitorManageConsts.getSystemSeparator()+event.context();
                                //System.out.println("增加文件的文件夹路径== :"+fileName);
                                //System.out.println("增加文件的名称== :"+event.context());
@@ -124,7 +128,7 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
//                                Map<String, String> fileMap = fileManageService.uploadFile(mfile,null);
//                                System.out.println("pictureUrl=== " + fileMap.get("pictureUrl"));
                            }if (!key.reset()) {
                            }if (!watchKey.reset()) {
                                break; //中断循环
                            }
                        }
@@ -171,12 +175,26 @@ public class ListeningFileDirectoryServiceImpl  implements ListeningFileDirector
		}
    	
        try{
        	Iterator<Map.Entry<String, Timer>> it = timerMap.entrySet().iterator();
    	    while(it.hasNext()){
    	        Map.Entry<String, Timer> entry = it.next();
    	        entry.getValue().cancel();
        		it.remove(); 
        	Iterator<Map.Entry<String, Timer>> timerIt = timerMap.entrySet().iterator();
    	    while(timerIt.hasNext()){
    	        Map.Entry<String, Timer> entry = timerIt.next();
    	        Timer timer=entry.getValue();
    	        timer.cancel();
    	        timer=null;
        		timerIt.remove(); 
			}
    	    
			if (!CollectionUtils.isEmpty(keyMap)) {
				Iterator<Entry<String, WatchKey>> keyIt = keyMap.entrySet().iterator();
			    while(keyIt.hasNext()){
			        Map.Entry<String, WatchKey> entry = keyIt.next();
			        WatchKey watchKey=entry.getValue();
			        watchKey.cancel();
			        watchKey=null;
					keyIt.remove();
				}
			}
			
        }catch(Exception e){
           log.error("removeTimer is error :"+e.getMessage());  
           return "关闭失败";

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/impl/MonitorManageServiceImpl.java

@@ -42,14 +42,15 @@ public class MonitorManageServiceImpl implements MonitorManageService {
	//@Autowired
	//private SecurityProtectionMinioConfig minioConfig;
	private static boolean isBeginFlag=false;
	//监听状态
	private boolean isListenFlag=false;
	
	@Override
	public String loadPictureFromDirectory() throws InterruptedException {
		if (!isBeginFlag) {
		if (!isListenFlag) {
			//监听文件目录，加载文件
			loadFileList();
			isBeginFlag=true;
			isListenFlag=true;
			log.info("图片监听开启成功");
			return "开启成功";
		}
@@ -62,7 +63,7 @@ public class MonitorManageServiceImpl implements MonitorManageService {
		File file = new File(baseFilePath);//path为监听文件夹
		File[] files = file.listFiles();
		int n=1;
		int n=0;
		//摄像头列表
		for(File file1:files){
			file1.getName();
@@ -84,6 +85,7 @@ public class MonitorManageServiceImpl implements MonitorManageService {
				n++;
			}
		}
		log.info("此次开启监听"+n+"个文件夹");
	}
	
	/**
@@ -93,7 +95,7 @@ public class MonitorManageServiceImpl implements MonitorManageService {
		log.debug("关闭图片监听");
		String result=listeningFileDirectoryService.removeTimer();
		
		isBeginFlag=false;
		isListenFlag=false;
		log.info("关闭图片监听："+result);
		return result;
	}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/utils/AiIdenUtils.java

@@ -98,6 +98,8 @@ public class AiIdenUtils {
		} finally {
			try {
				is.close();
			} catch (NullPointerException e) {
				log.error("getBufferedImage is NullPointerException1: " + e.getMessage() + ", filePath=" + filePath);
			} catch (IOException e) {
				log.error("getBufferedImage is IOException1: " + e.getMessage() + ", filePath=" + filePath);
			}