Merge branch 'pt' of https://gitee.com/ccsens_s/ccsenscloud into pt

tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java

@@ -41,8 +41,8 @@ public class DeliverVo {
         private Long deleteTime;
         @ApiModelProperty("交付物访问路径")
         private String url;
-        @ApiModelProperty("交付物访问路径")
+        @ApiModelProperty("WPS文件信息")
-        private List<String> wbsFilePaths;
+        private List<String> wpsFilePaths;
         @ApiModelProperty("是否是历史交付物 1是 0不是")
         private String isHistory;
         @ApiModelProperty("该用户自身是否是此交付物的检查人")

tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java

@@ -42,8 +42,8 @@ public class ProjectVo {
         private List<LabelVo.SelectLabel> labelList;
         @ApiModelProperty("未处理信息的数量")
         private ProjectUnreadMsg projectUnreadMsg;
-        @ApiModelProperty("WBS文件信息")
+        @ApiModelProperty("WPS文件信息")
-        private List<String> wbsFilePaths;
+        private List<String> wpsFilePaths;
 
         public Long getTotalDuration(){
             if(ObjectUtil.isNotNull(endTime) && ObjectUtil.isNotNull(beginTime)){

tall/src/main/java/com/ccsens/tall/service/ExcelService.java

@@ -857,8 +857,6 @@ public class ExcelService implements IExcelService {
         taskDetails.add(endTask);
     }
 
-
-
     /**
      * 分解任务时间
      * @param taskDetails 任务集合

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -197,7 +197,7 @@ public class ProjectService implements IProjectService {
                 ProjectVo.ProjectUnreadMsg unreadMsg =  getUnreadMsgByProject(currentUserId,projectInfo.getId());
                 projectInfo.setProjectUnreadMsg(unreadMsg);
                 //获取wps文件路径
-                projectInfo.setWbsFilePaths(wpsService.queryVisitUrls(projectInfo.getId(), (byte) 0,token));
+                projectInfo.setWpsFilePaths(wpsService.queryVisitUrls(projectInfo.getId(), (byte) 0,token));
             });
         }
     }
@@ -333,7 +333,7 @@ public class ProjectService implements IProjectService {
             projectInfo.setLabelList(labelList);
         }
         //获取wps文件路径
-        projectInfo.setWbsFilePaths(wpsService.queryVisitUrls(projectInfo.getId(), (byte) 0,token));
+        projectInfo.setWpsFilePaths(wpsService.queryVisitUrls(projectInfo.getId(), (byte) 0,token));
         return projectInfo;
     }
 

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -590,7 +590,7 @@ public class TaskDeliverService implements ITaskDeliverService {
                 filePath.setCheckerList(checkerList);
                 filePath.setIsChecker(isChecker);
                 //获取wps里的文件路径
-                filePath.setWbsFilePaths(wpsService.queryVisitUrls(filePath.getDeliverLogId(), (byte) 1,token));
+                filePath.setWpsFilePaths(wpsService.queryVisitUrls(filePath.getDeliverLogId(), (byte) 1,token));
             }
             deliverInfo.setFileList(fileIds);
         }

tall/src/main/java/com/ccsens/tall/service/WpsService.java

@@ -204,6 +204,9 @@ public class WpsService implements IWpsService {
      * @return wps访问路径
      */
     private String getUrl(String fileId, String ext, String token) {
+        if(!WebConstant.Wps.FILE_TYPE_ALL.contains(ext)){
+            return null;
+        }
         String fileType = WebConstant.Wps.getFileType(ext);
         Map<String, String> paramMap= new HashMap<>();
         paramMap.put("_w_appid", WebConstant.Wps.APPID);

tall/src/main/java/com/ccsens/tall/web/ExcelController.java

@@ -37,7 +37,7 @@ public class ExcelController {
     @RequestMapping(value = "/wbs", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ProjectVo.ProjectInfo> btproImport(HttpServletRequest request, HttpServletResponse response,
                                                            @RequestParam(required = true) Part file,
-                                                           @RequestParam(required = true) Long wpsFileId) throws Exception {
+                                                           @RequestParam(required = false) Long wpsFileId) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
 
         //1.上传文件

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common