From 7256cfae5c075ee4b353a96d864963373e05946c Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 20 十月 2023 15:48:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/MaterialHistoryService.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialHistoryService.java b/src/main/java/com/whyc/service/MaterialHistoryService.java
index c5009f2..3bc74e4 100644
--- a/src/main/java/com/whyc/service/MaterialHistoryService.java
+++ b/src/main/java/com/whyc/service/MaterialHistoryService.java
@@ -5,17 +5,27 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.mapper.MaterialHistoryMapper;
+import com.whyc.pojo.Material;
import com.whyc.pojo.MaterialHistory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
+import java.util.LinkedList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class MaterialHistoryService {
@Resource
private MaterialHistoryMapper mapper;
+
+ @Autowired
+ @Lazy
+ private MaterialService materialService;
public void insert(MaterialHistory mh) {
mapper.insert(mh);
@@ -48,4 +58,24 @@
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list.size()>0,pageInfo,"鏍规嵁鐗╂枡id鏌ヨpic鍘嗗彶");
}
+
+ public Response moveFromMaterialTable(int checkNum) {
+ List<Material> list = materialService.getList();
+ list = list.stream().filter(temp-> temp.getPictureUrl()!=null || temp.getDwgUrl()!=null).collect(Collectors.toList());
+ List<MaterialHistory> materialHistories = new LinkedList<>();
+ Date now = new Date();
+ for (Material material : list) {
+ MaterialHistory history = new MaterialHistory();
+ history.setProductId(0);
+ history.setMaterialId(material.getId());
+ history.setPictureUrl(material.getPictureUrl());
+ history.setDwgUrl(material.getDwgUrl());
+ history.setUpUserId(material.getUpUserId()==null?null:material.getUpUserId().intValue());
+ history.setCreateTime(now);
+
+ materialHistories.add(history);
+ }
+ mapper.insertBatchSomeColumn(materialHistories);
+ return new Response().set(1,true,"棣栨鐨勭墿鏂欏浘绾歌浆绉讳繚瀛樺畬鎴�");
+ }
}
--
Gitblit v1.9.1