项目上传，以及人员权限的修改

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

@@ -2,6 +2,8 @@ package com.hssx.cloudmodel.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.MouldFile;
+import com.hssx.cloudmodel.entity.ProjectFile;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.MouldFileService;
@@ -97,5 +99,19 @@ public class MouldFileController {
         HttpRespMsg msg = mouldFileService.getAllFileList(mouldId,userVO);
         return msg;
     }
+
+    /**
+     * 项目文档的下载
+     * 参数: token 用户身份凭证，id 项目id
+     *
+     * @return
+     */
+    @ApiOperation("模具所有类型文档的下载")
+    @RequestMapping("/dowloadFile")
+    @ResponseBody
+    public HttpRespMsg dowloadFile(MouldFile mouldFile, String token){
+        HttpRespMsg msg = mouldFileService.dowloadFile(mouldFile,token);
+        return msg;
+    }
 }
 

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

@@ -1,21 +1,42 @@
 package com.hssx.cloudmodel.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hssx.cloudmodel.entity.MouldOperationDynamics;
+import com.hssx.cloudmodel.entity.ProjectOperationDynamics;
+import com.hssx.cloudmodel.service.MouldOperationDynamicsService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-08-08
  */
 @RestController
-@RequestMapping("/mould-operation-dynamics")
+@RequestMapping("/mouldoperationdynamics")
 public class MouldOperationDynamicsController {
 
+    @Autowired
+    private MouldOperationDynamicsService mDynamicsService;
+    /**
+     *
+     * 项目操作记录列表
+     * projectId 项目id ,belongType 所述文件类型，0-模具文档 1-零件文档 2-试模验收 3-保养方案 4-模具更新 5-模具报废
+     * @return
+     */
+    @ApiOperation("项目操作记录列表")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(MouldOperationDynamics mouldOperationDynamics){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = mDynamicsService.list(new QueryWrapper<MouldOperationDynamics>().eq("mould_id",mouldOperationDynamics.getBelongType()).eq("belong_type",mouldOperationDynamics.getBelongType()).orderByDesc("id"));
+        return msg;
+    }
+
 }
 

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

@@ -30,6 +30,7 @@ public class PowerController {
     /**
      * 权限列表
      * 参数 ：token 用户身份标识 pageNum 当前页码，pageSize 每页条数 keyName 关键字查询
+     * cId 公司id筛选，projectId 项目id筛选
      *
      * @return
      */
@@ -43,7 +44,7 @@ public class PowerController {
 
     /**
      * 修改权限
-     * 参数 ：projectId 项目id ,id 用户id,token 用户凭证
+     * 参数 ：projectId 项目id ,id 用户id,token 用户凭证 ,powers 权限类型“0,1,2,3”
      *
      * @return
      */

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

@@ -56,7 +56,7 @@ public class ProjectFileController {
     }
     /**
      * 项目文档的下载
-     * 参数: token 用户身份凭证，projectId 项目id
+     * 参数: token 用户身份凭证，id 项目id
      *
      * @return
      */

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldOperationDynamics.java

@@ -58,7 +58,7 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
     private String fileName;
 
     /**
-     * 所属类型
+     * 所述文件类型，0-模具文档 1-零件文档 2-试模验收 3-保养方案 4-模具更新 5-模具报废
      */
     @TableField("belong_type")
     private Integer belongType;

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

@@ -2,15 +2,9 @@ package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.constant.Constant;
-import com.hssx.cloudmodel.entity.MouldFile;
-import com.hssx.cloudmodel.entity.ProjectFile;
-import com.hssx.cloudmodel.entity.ProjectOperationDynamics;
-import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.UserVO;
-import com.hssx.cloudmodel.mapper.MouldFileMapper;
-import com.hssx.cloudmodel.mapper.ProjectFileMapper;
-import com.hssx.cloudmodel.mapper.ProjectOperationDynamicsMapper;
-import com.hssx.cloudmodel.mapper.UserMapper;
+import com.hssx.cloudmodel.mapper.*;
 import com.hssx.cloudmodel.service.MouldFileService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.FileUtil;
@@ -43,7 +37,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     @Resource
     MouldFileMapper mouldFileMapper;
     @Resource
-    ProjectOperationDynamicsMapper projectOperationDynamicsMapper;
+    MouldOperationDynamicsMapper mouldOperationDynamicsMapper;
 
     @Override
     public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, String path) {
@@ -97,13 +91,15 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         projectFile = null;
                     }
                     //添加上传记录
-//                    ProjectOperationDynamics dynamics = new ProjectOperationDynamics();
-//                    dynamics.setContent(Constant.UPLOAD);
-//                    dynamics.setFileName(file.getOriginalFilename());
-//                    dynamics.setOperatorId(user.getId());
-//                    dynamics.setOperator(user.getUsername());
-//                    dynamics.setProjectId(userVO.getProjectId());
-//                    projectOperationDynamicsMapper.insert(dynamics);
+                    MouldOperationDynamics dynamics = new MouldOperationDynamics();
+                    dynamics.setContent(Constant.UPLOAD);
+                    dynamics.setFileName(file.getOriginalFilename());
+                    dynamics.setOperatorId(user.getId());
+                    dynamics.setFileId(projectFile.getId());
+                    dynamics.setOperatorName(user.getUsername());
+                    dynamics.setMouldId(userVO.getMouldId());
+                    dynamics.setBelongType(blongType);
+                    mouldOperationDynamicsMapper.insert(dynamics);
                 }
                 msg.data = projectFile;
             }
@@ -158,6 +154,16 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     public HttpRespMsg dowloadFile(MouldFile projectFile, String token) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
+        //添加上传记录
+         MouldFile file = mouldFileMapper.selectById(projectFile.getId());
+        MouldOperationDynamics dynamics = new MouldOperationDynamics();
+        dynamics.setContent(Constant.DOWNLOAD);
+        dynamics.setFileName(file.getFileName());
+        dynamics.setOperatorId(user.getId());
+        dynamics.setOperatorName(user.getUsername());
+        dynamics.setMouldId(file.getModelId());
+        dynamics.setFileId(file.getId());
+        mouldOperationDynamicsMapper.insert(dynamics);
         return msg;
     }
 

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

@@ -109,7 +109,7 @@ public class ProjectFileServiceImpl extends ServiceImpl<ProjectFileMapper, Proje
         dynamics.setFileName(file.getFileName());
         dynamics.setOperatorId(user.getId());
         dynamics.setOperator(user.getUsername());
-        dynamics.setProjectId(projectFile.getProjectId());
+        dynamics.setProjectId(file.getProjectId());
         projectOperationDynamicsMapper.insert(dynamics);
         return msg;
     }