模板下载

pom.xml

@@ -137,6 +137,21 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>cer</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>py</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>keystore</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

web/src/main/java/com/zhehekeji/web/controller/CategoryController.java

@@ -7,11 +7,16 @@ import com.zhehekeji.web.pojo.category.PageSearch;
 import com.zhehekeji.web.service.CategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
 import java.util.List;
 
 @Api(value = "category",tags = "分类管理")
@@ -62,4 +67,26 @@ public class CategoryController {
         categoryService.del(id);
         return Result.success();
     }
+
+    @GetMapping("/export/model")
+    @ApiOperation(value = "品规模板下载")
+    public void download(HttpServletResponse response) throws IOException {
+        OutputStream os = response.getOutputStream();
+        byte[] buffer = new byte[4096];
+        int n;
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+        String fileName = URLEncoder.encode("品规模板", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename="+fileName+".xlsx");
+        ClassPathResource classPathResource = new ClassPathResource("品规模板.xlsx");
+        InputStream in = classPathResource.getInputStream();
+        while ((n = in.read(buffer)) > 0) {
+            os.write(buffer, 0, n);
+        }
+        os.flush();
+        os.close();
+        response.flushBuffer();
+
+    }
 }

web/src/main/java/com/zhehekeji/web/controller/StockController.java

@@ -13,13 +13,14 @@ import com.zhehekeji.web.pojo.stock.StockExportExcel;
 import com.zhehekeji.web.service.StockService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -43,6 +44,28 @@ public class StockController {
         return Result.success();
     }
 
+    @GetMapping("/export/model")
+    @ApiOperation(value = "库存模板下载")
+    public void download(HttpServletResponse response) throws IOException {
+        OutputStream os = response.getOutputStream();
+        byte[] buffer = new byte[4096];
+        int n;
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
+        String fileName = URLEncoder.encode("库存模板", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename="+fileName+".xlsx");
+        ClassPathResource classPathResource = new ClassPathResource("库存模板.xlsx");
+        InputStream in = classPathResource.getInputStream();
+        while ((n = in.read(buffer)) > 0) {
+            os.write(buffer, 0, n);
+        }
+        os.flush();
+        os.close();
+        response.flushBuffer();
+
+    }
+
     @GetMapping("/list")
     @ApiOperation(value = "盘点页面  返回map  key:货架号  value:库存信息")
     public Result<Map<String, List<Stock>>> stockByStreet(@RequestParam(required = true) Integer streetId) {

web/src/main/java/com/zhehekeji/web/entity/Category.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 
@@ -21,6 +22,7 @@ public class Category {
 
     private String name;
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
 }

web/src/main/java/com/zhehekeji/web/entity/Stock.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -45,6 +46,7 @@ public class Stock {
     @ApiModelProperty("操作后的图片")
     private String overoperationPic;
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private LocalDateTime exportTime;
 
 

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -41,19 +41,24 @@ public class StockService {
 
     public void importExcel(MultipartFile file) {
         log.info("import excel stock");
-        Thread thread = new Thread(
-                new Runnable() {
-                    @Override
-                    public void run() {
         try {
             EasyExcel.read(file.getInputStream(), StockExcel.class, new StockImport(stockMapper)).sheet().doRead();
-                        } catch (IOException e) {
-                            log.error("库存导入error:{}", e);
-                        }
-                    }
-                }
-        );
-        thread.start();
+        }catch (Exception e){
+            Assert.isTrue(false,"导入出错");
+        }
+//
+//        Thread thread = new Thread(
+//                new Runnable() {
+//                    @Override
+//                    public void run() {
+//                        try {
+//                                                    } catch (IOException e) {
+//                            log.error("库存导入error:{}", e);
+//                        }
+//                    }
+//                }
+//        );
+//        thread.start();
     }
 
     /**