src/main/java/com/whyc/mapper/MaterialHistoryMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/MaterialHistory.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MaterialHistoryService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/MaterialService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/mapper/MaterialHistoryMapper.java
New file @@ -0,0 +1,9 @@ package com.whyc.mapper; import com.whyc.pojo.MaterialHistory; public interface MaterialHistoryMapper extends CustomMapper<MaterialHistory> { } src/main/java/com/whyc/pojo/MaterialHistory.java
@@ -5,12 +5,17 @@ import java.util.Date; /** * 图纸或图片历史的存储地址: * material/[material_id]-[material_code]/[material_code]_timestamp.xxx */ @TableName("tb_material_history") public class MaterialHistory { private Integer id; private Integer materialId; private String picUrl; private String pictureUrl; private String dwgUrl; private Integer upUserId; private Date createTime; @@ -50,12 +55,12 @@ this.materialId = materialId; } public String getPicUrl() { return picUrl; public String getPictureUrl() { return pictureUrl; } public void setPicUrl(String picUrl) { this.picUrl = picUrl; public void setPictureUrl(String pictureUrl) { this.pictureUrl = pictureUrl; } public String getDwgUrl() { src/main/java/com/whyc/service/MaterialHistoryService.java
New file @@ -0,0 +1,18 @@ package com.whyc.service; import com.whyc.mapper.MaterialHistoryMapper; import com.whyc.pojo.MaterialHistory; import org.springframework.stereotype.Service; import javax.annotation.Resource; @Service public class MaterialHistoryService { @Resource private MaterialHistoryMapper mapper; public void insert(MaterialHistory mh) { mapper.insert(mh); } } src/main/java/com/whyc/service/MaterialService.java
@@ -10,6 +10,7 @@ import com.whyc.mapper.MaterialMapper; import com.whyc.pojo.DocUser; import com.whyc.pojo.Material; import com.whyc.pojo.MaterialHistory; import com.whyc.pojo.ProductBom; import com.whyc.util.DateUtil; import com.whyc.util.*; @@ -34,6 +35,10 @@ public class MaterialService { @Autowired(required = false) private MaterialMapper mapper; @Autowired private MaterialHistoryService mhService; //查询所有的散装件信息加设置了替换关系的子件信息 /*public Response getAllMaterial(String category,String subCode,String subName,String subModel,int pageCurr,int pageSize) { PageHelper.startPage(pageCurr,pageSize); @@ -470,14 +475,24 @@ multipartFile.transferTo(zipFile); //路径不存在,说明是首次上传,设置物料对应的fileUrl //同时在物料历史里面添加记录 Material temp = new Material(); MaterialHistory mh = new MaterialHistory(); temp.setId(material.getId()); mh.setMaterialId(material.getId()); int userId = ActionUtil.getUser().getId().intValue(); mh.setUpUserId(userId); mh.setCreateTime(now); if(fileSuffix.equals("dwg")){ temp.setDwgUrl(dirPathDB + fileFullName); mh.setDwgUrl(dirPathDB + fileFullName); }else { temp.setPictureUrl(dirPathDB + fileFullName); mh.setPictureUrl(dirPathDB + fileFullName); } mapper.updateById(temp); mhService.insert(mh); return new Response().set(1, true, "上传完成"); }