修改BUG:工单同时只能出一个

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -398,7 +398,13 @@ public class LiteOrderCache {
     public ORDER_COLOR getNextColor() {
     public ORDER_COLOR getNextColor() {
         //设置颜色
         //设置颜色
         Set<String> currentColors = new HashSet<>();
         Set<String> currentColors = new HashSet<>();
-        for (DataLog dataLog :taskService. getQueueTasks()) {
+//        for (DataLog dataLog :taskService. getQueueTasks()) {
+//            currentColors.add(dataLog.getLightColor());
+//        }
+        for (DataLog dataLog :taskService.getAllTasks()){
+            if(dataLog.isFinished()||dataLog.isCancel()||dataLog.isEnd()){
+                continue;
+            }
             currentColors.add(dataLog.getLightColor());
             currentColors.add(dataLog.getLightColor());
         }
         }
         ORDER_COLOR nextColor = ORDER_COLOR.nextColor(currentColors);
         ORDER_COLOR nextColor = ORDER_COLOR.nextColor(currentColors);

src/test/java/com/neotel/smfcore/ApplicationTests.java

@@ -28,7 +28,7 @@ public class ApplicationTests {
 
 
 	private void saveLanguageFile(String type){
 	private void saveLanguageFile(String type){
 		try {
 		try {
-			String url = "http://192.168.1.243/smf-core/api/translation/getLanguageMsgList";
+			String url = "http://192.168.1.108/smf-core/api/translation/getLanguageMsgList";
 			Map<String,Object> params = new HashMap<>();
 			Map<String,Object> params = new HashMap<>();
 			params.put("type",type);
 			params.put("type",type);
 			System.out.println("开始获取最新["+type+"]翻译资源...");
 			System.out.println("开始获取最新["+type+"]翻译资源...");