From dd93297e80ecad5b4fb7267f048d50ffb9f2c191 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 14 七月 2023 22:31:14 +0800
Subject: [PATCH] 补单上传照片
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 94 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 84 insertions(+), 10 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index 40bf192..4d1c07e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -1,24 +1,43 @@
package com.ld.igds.inout.view;
+import java.io.File;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import com.bstek.bdf2.core.business.IUser;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
+import com.bstek.dorado.uploader.UploadFile;
+import com.bstek.dorado.uploader.annotation.FileProvider;
+import com.bstek.dorado.uploader.annotation.FileResolver;
+import com.ld.igds.constant.RedisConst;
+import com.ld.igds.data.PageResponse;
+
+import com.ld.igds.file.CoreFileService;
+import com.ld.igds.file.FileManager;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.manager.InoutManager;
import com.ld.igds.inout.manager.InoutReportManager;
import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.models.DicTrigger;
+import com.ld.igds.models.FileInfo;
import com.ld.igds.util.ContextUtil;
+
+import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
/**
* 鍑哄叆搴撹鍗曢〉闈㈢鐞�
@@ -31,12 +50,45 @@
@Component
public class InoutDataPR {
- @Autowired
+ @Resource
private InoutService inoutService;
- @Autowired
+ @Resource
private InoutReportManager inoutReportManager;
- @Autowired
+ @Resource
private InoutManager inoutManager;
+ @Autowired
+ private CoreFileService fileService;
+ @Autowired
+ private RedisUtil redisUtil;
+
+
+ // ${dorado.getDataProvider("inoutDataPR#triggerRecordStatus1").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerRecordStatus1() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutConstant.RECORD_STATUS_DEL, "浣滃簾鍗�"));
+ list.add(new DicTrigger(InoutConstant.RECORD_STATUS_NORMAL, "姝ｅ父鍗�"));
+ return list;
+ }
+
+ // ${dorado.getDataProvider("inoutDataPR#triggerResult").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerResult() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutConstant.RESULT_1, "鍚堟牸"));
+ list.add(new DicTrigger(InoutConstant.RESULT_0, "涓嶅悎鏍�"));
+ return list;
+ }
+
+ // ${dorado.getDataProvider("inoutDataPR#triggerSampleType").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerSampleType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutConstant.SAMPLE_TYPE_MANUAL, "浜哄伐"));
+ list.add(new DicTrigger(InoutConstant.SAMPLE_TYPE_AUTOMATIC, "鑷姩"));
+ list.add(new DicTrigger(InoutConstant.SAMPLE_TYPE_RANDOM, "鏅鸿兘闅忔満"));
+ return list;
+ }
/**
* inoutDataPR#pageInoutData
@@ -46,8 +98,7 @@
* @throws Exception
*/
@DataProvider
- public void pageInoutData(Page<InoutData> page, InoutParam param)
- throws Exception {
+ public void pageInoutData(Page<InoutData> page, InoutParam param) throws Exception {
// 璋冪敤鏍稿績鍖呬腑鏂规硶锛岄渶瑕佸仛瀵硅薄杞崲
param.setPage(page.getPageNo());
param.setLimit(page.getPageSize());
@@ -165,7 +216,6 @@
@Expose
public InoutData initAddData(String type) {
IUser user = ContextUtil.getLoginUser();
-
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
@@ -187,15 +237,11 @@
*/
@DataProvider
public InoutData initDataByHand(String type) {
-
IUser user = ContextUtil.getLoginUser();
-
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
- data.setCompleteTime(new Date());
data.setType(type);
- data.setIntelCard("0000");
data.setRegisterUser(user.getCname());
data.setDeptId(ContextUtil.subDeptId(user));
data.setCheckUser(user.getCname());
@@ -204,4 +250,32 @@
return data;
}
+ /**
+ * inoutDataPR#uploadImage
+ *
+ * @param file
+ * @param parameter
+ * @return
+ */
+ @FileResolver
+ public String uploadImage(UploadFile file, Map<String, Object> parameter) {
+ String plateNum = (String) parameter.get("plateNum");
+ String newFileName = null;
+ try {
+ String basePath = fileService.getInoutFilePath(new Date());
+ // 鑾峰彇鏂扮殑ID
+ newFileName = DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
+ // 鏂囦欢鍚庣紑鍚�
+ String suffixName = file.getFileName().substring(file.getFileName().lastIndexOf("."));
+ // 鍚堟垚鏂扮殑鏂囦欢鍚�
+
+ newFileName = newFileName + suffixName;
+ file.transferTo(new File(basePath + newFileName));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return newFileName;
+ }
+
}
--
Gitblit v1.9.3