From 7d7bb8298935b1002ee2770fdf00fc382a53864c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 03 七月 2024 09:43:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/controller/MatV2Controller.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatV2Controller.java b/src/main/java/com/zy/asrs/controller/MatV2Controller.java
index c390a4a..cfe323b 100644
--- a/src/main/java/com/zy/asrs/controller/MatV2Controller.java
+++ b/src/main/java/com/zy/asrs/controller/MatV2Controller.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -13,10 +15,19 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.utils.MatExcelListener;
+import com.zy.asrs.utils.MatV2ExcelListener;
+import com.zy.common.entity.MatExcel;
+import com.zy.common.entity.MatV2Excel;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -151,8 +162,47 @@
@RequestMapping(value = "/matV2/auth")
@ManagerAuth
public R find(@RequestParam("matnr") String matnr,@RequestParam("type") Integer type) {
- MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", matnr));
- return R.ok();
+ List<MatV2> matV2s = new ArrayList<>();
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", matnr));;
+ // type: 1锛氬綋鍓嶇墿鏂� 2锛氬綋鍓嶈妭鐐规墍鏈夌墿鏂� 3锛氬瓙鑺傜偣鎵�鏈夌墿鏂�
+ switch (type) {
+ case 1:
+ matV2s = matV2Service.selectList(new EntityWrapper<MatV2>().eq("matnr", matnr));
+ break;
+ case 2:
+ matV2s = matV2Service.selectList(new EntityWrapper<MatV2>().eq("uuid", matV2.getUuid()));
+ break;
+ case 3:
+ matV2s = matV2Service.selectList(new EntityWrapper<MatV2>().eq("uuid", matV2.getTagId()));
+ break;
+ }
+ return R.ok().add(matV2s);
+ }
+
+ /**
+ * excel瀵煎叆妯℃澘涓嬭浇
+ */
+ @RequestMapping(value = "/matV2/excel/import/mould")
+ public void matV2ExcelImportMould(HttpServletResponse response) throws IOException {
+ List<MatV2Excel> excels = new ArrayList<>();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("缁勪欢妗ｆExcel瀵煎叆妯℃澘", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), MatV2Excel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("sheet1")
+ .doWrite(excels);
+ }
+
+ // excel瀵煎叆
+ @PostMapping(value = "/matV2/excel/import/auth")
+ @ManagerAuth(memo = "缁勪欢妗ｆ鏁版嵁瀵煎叆")
+ @Transactional
+ public R matV2ExcelImport(MultipartFile file) throws IOException {
+ MatV2ExcelListener listener = new MatV2ExcelListener(getUserId());
+ EasyExcel.read(file.getInputStream(), MatV2Excel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
}
}
--
Gitblit v1.9.1