资源上传下载bug修改。任务增加sourceId过滤

src/main/java/com/neotel/smfcore/core/language/rest/LanguageMsgController.java

@@ -180,10 +180,14 @@ public class LanguageMsgController {
     @AnonymousAccess
     @AnonymousAccess
     public List<LanguageResourceDto> resourceDownload(String type,String lanCode ) {
     public List<LanguageResourceDto> resourceDownload(String type,String lanCode ) {
 
 
-        lanCode=lanCode.replace("_","-");
-        List<LanguageMsg> msgList=MessageUtils.getLanMsgByType(type);
-        Map<String,Map<String,String>> resourceMap=new HashMap<>();
-        List<String> allLantypeList=messageService.getAllLanList();
+        if (ObjectUtil.isEmpty(lanCode)) {
+            lanCode = "";
+        }
+        log.info("resourceDownload: type=" + type + ",lanCode=" + lanCode);
+        lanCode = lanCode.replace("_", "-");
+        List<LanguageMsg> msgList = MessageUtils.getLanMsgByType(type);
+        Map<String, Map<String, String>> resourceMap = new HashMap<>();
+        List<String> allLantypeList = messageService.getAllLanList();
         for (LanguageMsg msg :
         for (LanguageMsg msg :
                 msgList) {
                 msgList) {
             for (Content con :
             for (Content con :
@@ -196,7 +200,7 @@ public class LanguageMsgController {
                     continue;
                     continue;
                 }
                 }
 
 
-                if(!allLantypeList.contains(con.getLanCode())){
+                if (!allLantypeList.contains(con.getLanCode())) {
                     continue;
                     continue;
                 }
                 }
 
 
@@ -208,12 +212,12 @@ public class LanguageMsgController {
                 resourceMap.put(con.getLanCode(), valueMap);
                 resourceMap.put(con.getLanCode(), valueMap);
             }
             }
         }
         }
-        List<LanguageResourceDto> list=new ArrayList<>();
+        List<LanguageResourceDto> list = new ArrayList<>();
         for (String key :
         for (String key :
                 resourceMap.keySet()) {
                 resourceMap.keySet()) {
             Map<String, String> valueMap = resourceMap.get(key);
             Map<String, String> valueMap = resourceMap.get(key);
-            if(valueMap!=null&&valueMap.size()>0){
-                LanguageResourceDto dto=new LanguageResourceDto(key,valueMap);
+            if (valueMap != null && valueMap.size() > 0) {
+                LanguageResourceDto dto = new LanguageResourceDto(key, valueMap);
                 list.add(dto);
                 list.add(dto);
             }
             }
         }
         }
@@ -242,7 +246,7 @@ public class LanguageMsgController {
                 log.info("收到客户端上传资源，未找到指定语言：类型[" + type + "],语言[" + key + "] ");
                 log.info("收到客户端上传资源，未找到指定语言：类型[" + type + "],语言[" + key + "] ");
                 continue;
                 continue;
             }
             }
-            log.info("收到客户端上传资源类型[" + type + "],语言[" + key + "]");
+//            log.info("收到客户端上传资源类型[" + type + "],语言[" + key + "]");
 
 
             Map<String, String> lanResourceMap = new HashMap<>();
             Map<String, String> lanResourceMap = new HashMap<>();
             Map<String, Object> reMap = (Map<String, Object>) value;
             Map<String, Object> reMap = (Map<String, Object>) value;

src/main/java/com/neotel/smfcore/core/language/util/MessageService.java

@@ -164,6 +164,11 @@ public class MessageService {
         if (proMap != null && proMap.size() > 0) {
         if (proMap != null && proMap.size() > 0) {
             for (String key :
             for (String key :
                     proMap.keySet()) {
                     proMap.keySet()) {
+                //如果Key爲空，直接返回
+                if(ObjectUtil.isEmpty(key))
+                {
+                    continue;
+                }
                 String msgStr = proMap.get(key);
                 String msgStr = proMap.get(key);
 
 
                 LanguageMsg msg = MessageUtils.getMsg(type,key);
                 LanguageMsg msg = MessageUtils.getMsg(type,key);

src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java

@@ -97,7 +97,7 @@ public class TaskController {
         if(!curruser.getGroups().contains(groupId)){
         if(!curruser.getGroups().contains(groupId)){
             throw new ValidateException("smfcore.nogroupaccess","没有组[{0}]的操作权限",new String[] {groupId});
             throw new ValidateException("smfcore.nogroupaccess","没有组[{0}]的操作权限",new String[] {groupId});
         }
         }
-        return getTaskList(groupId,null);
+        return getTaskList(groupId,null,"");
     }
     }
 
 
     @ApiOperation("获取队列中的任务")
     @ApiOperation("获取队列中的任务")
@@ -113,10 +113,10 @@ public class TaskController {
                 cids=new String[]{storage.getCid()};
                 cids=new String[]{storage.getCid()};
             }
             }
         }
         }
-        return getTaskList(groupId,cids);
+        return getTaskList(groupId,cids,criteria.getSourceId());
     }
     }
 
 
-    private List<TaskDto> getTaskList(String groupId, String[] cids){
+    private List<TaskDto> getTaskList(String groupId, String[] cids,String sourceId){
         List<DataLog> resultTasks = Lists.newArrayList();
         List<DataLog> resultTasks = Lists.newArrayList();
         List<DataLog> allTasks = taskService.getAllTasks();
         List<DataLog> allTasks = taskService.getAllTasks();
         List<String> cidList = Lists.newArrayList();
         List<String> cidList = Lists.newArrayList();
@@ -131,29 +131,21 @@ public class TaskController {
                 }
                 }
             }
             }
         }
         }
-        if(!cidList.isEmpty()){
+        if(!cidList.isEmpty() ||(ObjectUtil.isNotEmpty(sourceId))){
             for (DataLog task : allTasks) {
             for (DataLog task : allTasks) {
                 String cid = task.getCid();
                 String cid = task.getCid();
-                if(cidList.contains(cid)){
+                if(cidList.isEmpty()||cidList.contains(cid)){
+                    if(ObjectUtil.isEmpty(sourceId) ){
+                        resultTasks.add(task);
+                    }else if(ObjectUtil.isNotEmpty(task.getSourceId())&& task.getSourceId().equals(sourceId)){
                         resultTasks.add(task);
                         resultTasks.add(task);
                     }
                     }
-//                else if(!ObjectUtils.isEmpty(groupId)) {
-//                    if (task.getGroupId() != null) {
-//                        if (task.getGroupId().equals(groupId)) {
-//                            resultTasks.add(task);
-//                        }
-//                    }
-//                }
+                }
             }
             }
         }else {
         }else {
             resultTasks = allTasks;
             resultTasks = allTasks;
         }
         }
 
 
-
-//        DataLog testTask = new DataLog();
-//        testTask.setCid("123");
-//        testTask.setStatus("FINISHED");
-//        resultTasks.add(testTask);
         List<TaskDto> resultDtos = taskMapper.toDto(resultTasks);
         List<TaskDto> resultDtos = taskMapper.toDto(resultTasks);
         return resultDtos;
         return resultDtos;
     }
     }

src/main/java/com/neotel/smfcore/core/system/rest/bean/query/TaskQueryCondition.java

@@ -26,7 +26,9 @@ public class TaskQueryCondition {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private BetweenData<Date> updateDate;
     private BetweenData<Date> updateDate;
 
 
-
+    @QueryCondition
+    @ApiModelProperty("來源ID")
+    private String sourceId;
 
 
     @QueryCondition
     @QueryCondition
     @ApiModelProperty("任务状态")
     @ApiModelProperty("任务状态")