用户创建的修改

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

@@ -46,7 +46,7 @@ public class MouldFileController {
      * 参数: token 用户身份凭证，
      * mouldId 模具id ,
      * blongType 文档类型（0-模具文档 1-零件文档 2-试模验收 2-保养方案 3-模具更新 4-模具报废），
-     * file 文件信息
+     * file 文件信息，dwgType 图档类型0-2D,1-3D(上传零件文档和模具文档时传该参数)
      *
      * @return
      */

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-08
+ * @since 2019-08-10
  */
 @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;
 
     /**
@@ -132,6 +129,12 @@ public class MouldFile extends Model<MouldFile> {
     @TableField("file_size_2")
     private String fileSize2;
 
+    /**
+     * 图档类型0-2D,1-3D
+     */
+    @TableField("dwg_type")
+    private Integer dwgType;
+
 
     public Integer getId() {
         return id;
@@ -277,6 +280,14 @@ public class MouldFile extends Model<MouldFile> {
         this.fileSize2 = fileSize2;
     }
 
+    public Integer getDwgType() {
+        return dwgType;
+    }
+
+    public void setDwgType(Integer dwgType) {
+        this.dwgType = dwgType;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -303,6 +314,7 @@ public class MouldFile extends Model<MouldFile> {
         ", fileName2=" + fileName2 +
         ", fileType2=" + fileType2 +
         ", fileSize2=" + fileSize2 +
+        ", dwgType=" + dwgType +
         "}";
     }
 }

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

@@ -1,5 +1,6 @@
 package com.hssx.cloudmodel.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.hssx.cloudmodel.entity.User;
 import lombok.Builder;
 import lombok.Data;
@@ -22,4 +23,8 @@ public class UserVO extends User {
     private Integer isManager = 0;
     private String powers;
     private Integer mouldId;//模具id
+    /**
+     * 图档类型0-2D,1-3D
+     */
+    private Integer dwgType;
 }

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

@@ -78,9 +78,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     } else {
                         projectFile.setState(0);
                     }
-
                     File saveFile = new File(dir, fileName);
-
                     try {
                         saveFile.createNewFile();
                         file.transferTo(saveFile);
@@ -91,8 +89,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         e.printStackTrace();
                         projectFile = null;
                     }
-
-
                     //模具报废情况下，设置files2
                     if (blongType == 5 && file2 != null && !file2.isEmpty()) {
                         String fileName2 = file2.getOriginalFilename();
@@ -119,6 +115,10 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                             projectFile = null;
                         }
                     }
+                    //上传零件文档和上传模具文档的时候需要区分是否为2D或者3D
+                    if(userVO.getDwgType() != null){
+                        projectFile.setDwgType(userVO.getDwgType());
+                    }
                     mouldFileMapper.insert(projectFile);
 
                     //添加上传记录

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("vnotice_user");
+        strategy.setInclude("tb_mould_file");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -22,11 +22,12 @@
         <result column="file_name_2" property="fileName2" />
         <result column="file_type_2" property="fileType2" />
         <result column="file_size_2" property="fileSize2" />
+        <result column="dwg_type" property="dwgType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        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
+        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, dwg_type
     </sql>
 
 </mapper>