模具报废增加一个文件支持

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

@@ -53,11 +53,11 @@ public class MouldFileController {
     @ApiOperation("模具文档的上传")
     @RequestMapping("/uploadFile")
     @ResponseBody
-    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file,@RequestParam(required = false, defaultValue = "0") Integer blongType,
+    public HttpRespMsg uploadFile(@RequestParam(required = false) MultipartFile file,@RequestParam(required = false) MultipartFile file2,@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,blongType, file,path);
+        msg = mouldFileService.addFile(userVO,blongType, file,file2, path);
         return msg;
     }
 

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

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-07
+ * @since 2019-08-08
  */
 @TableName("tb_mould_file")
 public class MouldFile extends Model<MouldFile> {
@@ -45,7 +43,6 @@ public class MouldFile extends Model<MouldFile> {
      * 上传时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -54,6 +51,12 @@ public class MouldFile extends Model<MouldFile> {
     @TableField("model_id")
     private Integer modelId;
 
+    /**
+     * 零件id
+     */
+    @TableField("sparepart_id")
+    private Integer sparepartId;
+
     /**
      * 项目名称
      */
@@ -73,7 +76,7 @@ public class MouldFile extends Model<MouldFile> {
     private String fileName;
 
     /**
-     * 所述文件类型，0-模具文档 1-模具产品验收 2-磨具保养作业操作方案 2-模具保养 3-模具更新 4-模具报废
+     * 所述文件类型，0-模具文档 1-零件文档 2-试模验收 3-保养方案 4-模具更新 5-模具报废
      */
     @TableField("blong_type")
     private Integer blongType;
@@ -102,6 +105,30 @@ public class MouldFile extends Model<MouldFile> {
     @TableField("file_size")
     private String fileSize;
 
+    /**
+     * 文件地址2
+     */
+    @TableField("file_url_2")
+    private String fileUrl2;
+
+    /**
+     * 文件名称2
+     */
+    @TableField("file_name_2")
+    private String fileName2;
+
+    /**
+     * 文件类型2
+     */
+    @TableField("file_type_2")
+    private String fileType2;
+
+    /**
+     * 文件大小2
+     */
+    @TableField("file_size_2")
+    private String fileSize2;
+
 
     public Integer getId() {
         return id;
@@ -143,6 +170,14 @@ public class MouldFile extends Model<MouldFile> {
         this.modelId = modelId;
     }
 
+    public Integer getSparepartId() {
+        return sparepartId;
+    }
+
+    public void setSparepartId(Integer sparepartId) {
+        this.sparepartId = sparepartId;
+    }
+
     public Integer getProjectId() {
         return projectId;
     }
@@ -207,6 +242,38 @@ public class MouldFile extends Model<MouldFile> {
         this.fileSize = fileSize;
     }
 
+    public String getFileUrl2() {
+        return fileUrl2;
+    }
+
+    public void setFileUrl2(String fileUrl2) {
+        this.fileUrl2 = fileUrl2;
+    }
+
+    public String getFileName2() {
+        return fileName2;
+    }
+
+    public void setFileName2(String fileName2) {
+        this.fileName2 = fileName2;
+    }
+
+    public String getFileType2() {
+        return fileType2;
+    }
+
+    public void setFileType2(String fileType2) {
+        this.fileType2 = fileType2;
+    }
+
+    public String getFileSize2() {
+        return fileSize2;
+    }
+
+    public void setFileSize2(String fileSize2) {
+        this.fileSize2 = fileSize2;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -220,6 +287,7 @@ public class MouldFile extends Model<MouldFile> {
         ", uploadtor=" + uploadtor +
         ", indate=" + indate +
         ", modelId=" + modelId +
+        ", sparepartId=" + sparepartId +
         ", projectId=" + projectId +
         ", fileUrl=" + fileUrl +
         ", fileName=" + fileName +
@@ -228,6 +296,10 @@ public class MouldFile extends Model<MouldFile> {
         ", state=" + state +
         ", fileType=" + fileType +
         ", fileSize=" + fileSize +
+        ", fileUrl2=" + fileUrl2 +
+        ", fileName2=" + fileName2 +
+        ", fileType2=" + fileType2 +
+        ", fileSize2=" + fileSize2 +
         "}";
     }
 }

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

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

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.FileUtil;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -40,7 +41,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     MouldOperationDynamicsMapper mouldOperationDynamicsMapper;
 
     @Override
-    public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, String path) {
+    public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, MultipartFile file2, String path) {
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         if (user != null) {
@@ -79,7 +80,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     }
 
                     File saveFile = new File(dir, fileName);
-                    mouldFileMapper.insert(projectFile);
+
                     try {
                         saveFile.createNewFile();
                         file.transferTo(saveFile);
@@ -90,6 +91,36 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         e.printStackTrace();
                         projectFile = null;
                     }
+
+
+                    //模具报废情况下，设置files2
+                    if (blongType == 5 && file2 != null && !file2.isEmpty()) {
+                        String fileName2 = file2.getOriginalFilename();
+                        projectFile.setFileName2(fileName2);
+                        projectFile.setFileSize2(FileUtil.getReadableFileSize(file2.getSize()));
+                        System.out.println("上传文件2名称" + file2.getName() + "， dir = " + dir.getAbsolutePath());
+                        pos = fileName2.lastIndexOf(".");
+                        rand = UUID.randomUUID().toString().replaceAll("-", "");
+                        sufix = fileName2.substring(pos);
+                        fileName2 = rand + sufix;
+                        projectFile.setFileType2(sufix);//文件后缀
+                        projectFile.setFileUrl2("/upload/"+fileName2);
+
+                        File saveFile2 = new File(dir, fileName2);
+
+                        try {
+                            saveFile2.createNewFile();
+                            file2.transferTo(saveFile2);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            projectFile = null;
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            projectFile = null;
+                        }
+                    }
+                    mouldFileMapper.insert(projectFile);
+
                     //添加上传记录
                     MouldOperationDynamics dynamics = new MouldOperationDynamics();
                     dynamics.setContent(Constant.UPLOAD);

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_mould_operation_dynamics,tb_mould".split(","));
+        strategy.setInclude("tb_mould_file".split(","));
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/MouldFileMapper.xml

@@ -9,6 +9,7 @@
         <result column="uploadtor" property="uploadtor" />
         <result column="indate" property="indate" />
         <result column="model_id" property="modelId" />
+        <result column="sparepart_id" property="sparepartId" />
         <result column="project_id" property="projectId" />
         <result column="file_url" property="fileUrl" />
         <result column="file_name" property="fileName" />
@@ -17,11 +18,15 @@
         <result column="state" property="state" />
         <result column="file_type" property="fileType" />
         <result column="file_size" property="fileSize" />
+        <result column="file_url_2" property="fileUrl2" />
+        <result column="file_name_2" property="fileName2" />
+        <result column="file_type_2" property="fileType2" />
+        <result column="file_size_2" property="fileSize2" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, uplodtor_id, uploadtor, indate, model_id, project_id, file_url, file_name, blong_type, content, state, file_type, file_size
+        id, uplodtor_id, uploadtor, indate, model_id, sparepart_id, project_id, file_url, file_name, blong_type, content, state, file_type, file_size, file_url_2, file_name_2, file_type_2, file_size_2
     </sql>
 
 </mapper>