Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldFileController.java

@@ -41,18 +41,21 @@ public class MouldFileController {
     private UserService userService;
     /**
      * 模具文档的上传
-     * 参数: token 用户身份凭证，projectId 项目id ,file 文件信息
+     * 参数: token 用户身份凭证，
+     * mouldId 模具id ,
+     * blongType 文档类型（0-模具文档 1-零件文档 2-试模验收 2-保养方案 3-模具更新 4-模具报废），
+     * file 文件信息
      *
      * @return
      */
     @ApiOperation("模具文档的上传")
     @RequestMapping("/uploadFile")
     @ResponseBody
-    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file,
+    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file,@RequestParam(required = false, defaultValue = "0") Integer blongType,
                                   HttpServletResponse response, HttpServletRequest request, UserVO userVO) throws Exception {
         System.out.println("开始上传文件" + "file+" + file.getOriginalFilename());
         HttpRespMsg msg = new HttpRespMsg();
-        msg = mouldFileService.addFile(userVO,file,path);
+        msg = mouldFileService.addFile(userVO,blongType, file,path);
         return msg;
     }
 
@@ -68,16 +71,30 @@ public class MouldFileController {
     }
 
     /**
-     * 项目文档的列表
-     * 参数: token 用户身份凭证，projectId 项目id
+     * 模具文档的列表
+     * 参数: token 用户身份凭证，mouldId 模具id， type文档类型:0-模具文档，1-零件文档
      *
      * @return
      */
     @ApiOperation("模具文档的列表")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg list(@RequestParam Integer mouldId,  UserVO userVO){
-        HttpRespMsg msg = mouldFileService.getFileList(mouldId, userVO);
+    public HttpRespMsg list(@RequestParam Integer mouldId, @RequestParam Integer blongType,  UserVO userVO){
+        HttpRespMsg msg = mouldFileService.getFileList(mouldId,blongType, userVO);
+        return msg;
+    }
+
+    /**
+     * 模具文档的列表
+     * 参数: token 用户身份凭证，mouldId 模具id， type文档类型:0-模具文档，1-零件文档
+     *
+     * @return
+     */
+    @ApiOperation("模具所有类型的文档列表")
+    @RequestMapping("/allList")
+    @ResponseBody
+    public HttpRespMsg allList(@RequestParam Integer mouldId, UserVO userVO){
+        HttpRespMsg msg = mouldFileService.getAllFileList(mouldId,userVO);
         return msg;
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldFileService.java

@@ -16,9 +16,9 @@ import org.springframework.web.multipart.MultipartFile;
  * @since 2019-08-07
  */
 public interface MouldFileService extends IService<MouldFile> {
-    HttpRespMsg addFile(UserVO userVO, MultipartFile file, String path);
+    HttpRespMsg addFile(UserVO userVO, Integer blongType,MultipartFile file, String path);
     HttpRespMsg check(Integer mouldFileId, Integer isPass, UserVO userVO);
     HttpRespMsg dowloadFile(MouldFile projectFile, String token);
-
-    HttpRespMsg getFileList(int mouldId, UserVO userVO);
+    HttpRespMsg getAllFileList(int mouldId, UserVO userVO);
+    HttpRespMsg getFileList(int mouldId, Integer blongType, UserVO userVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -21,6 +21,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
@@ -44,7 +46,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     ProjectOperationDynamicsMapper projectOperationDynamicsMapper;
 
     @Override
-    public HttpRespMsg addFile(UserVO userVO, MultipartFile file, String path) {
+    public HttpRespMsg addFile(UserVO userVO,Integer blongType, MultipartFile file, String path) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         if(user != null){
@@ -160,10 +162,26 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     }
 
     @Override
-    public HttpRespMsg getFileList(int mouldId, UserVO userVO) {
+    public HttpRespMsg getAllFileList(int mouldId, UserVO userVO) {
+        List<HashMap> dataList = new ArrayList<HashMap>();
+        int maxBlongType = 5;
+        for (int i=0;i<=maxBlongType; i++) {
+            HashMap<String, Object> data = new HashMap<>();
+            data.put("blongType", i);
+            List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", i).orderByDesc("id"));
+            data.put("list", list);
+            dataList.add(data);
+        }
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = dataList;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg getFileList(int mouldId,Integer blongType,  UserVO userVO) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
-        List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).orderByDesc("id"));
+        List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
         msg.data = list;
         return msg;
     }