Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

6 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java

@@ -26,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.zy.acs.common.utils.News;

import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -267,7 +268,7 @@
//            }

        } catch (InterruptedException e) {
            log.error("unlockTaskQueue", e);
            News.error("unlockTaskQueue", e);
        }
    }

@@ -731,4 +732,4 @@
        return result;
    }

}
}