Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/service/impl/JmgaServiceImpl.java

@@ -254,11 +254,11 @@ public class JmgaServiceImpl implements IJmgaService {
         }
 
         //去读data.fdage
-        File dataFdageFile = FileUtil.loopFiles(zipDir + uuid).stream().filter(v -> v.getName().equals("data.fdage")).findFirst().get();
-        if(dataFdageFile == null){
+        String dataFdagePath = zipDir + uuid + "/dage.fdage";
+        if(!FileUtil.exist(dataFdagePath)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_4002.code(), ErrorCode.FAILURE_CODE_4002.formatMessage("data.fdage"));
         }
-        JSONObject dataFdageObj = JSONObject.parseObject(FileUtil.readUtf8String(dataFdageFile));
+        JSONObject dataFdageObj = JSONObject.parseObject(FileUtil.readUtf8String(dataFdagePath));
         int camType = dataFdageObj.getJSONObject("cam").getIntValue("type");
         String snCode = dataFdageObj.getJSONObject("cam").getString("uuid");
         String uuidTime = dataFdageObj.getString("uuidtime");