From 557742de769b59c94ae91aa79b23e91f642b0dda Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 14 九月 2022 16:26:21 +0800
Subject: [PATCH] 软件列表搜索添加板号
---
src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java b/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java
index 0c433b7..9173cb9 100644
--- a/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java
+++ b/src/main/java/com/whyc/controller/MaterialCodeDictionaryController.java
@@ -1,6 +1,7 @@
package com.whyc.controller;
-import com.whyc.pojo.ComponentApproving;
+import com.github.pagehelper.PageInfo;
+import com.whyc.dto.Response;
import com.whyc.pojo.MaterialCodeDictionary;
import com.whyc.service.MaterialCodeDictionaryService;
import io.swagger.annotations.Api;
@@ -10,11 +11,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.io.File;
import java.io.IOException;
-import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -26,9 +28,16 @@
@Autowired
private MaterialCodeDictionaryService service;
- //瑙ｆ瀽瀵煎叆鏁版嵁
+ @GetMapping("codeList")
+ @ApiOperation(value = "鏌ヨ缂栫爜鍒楄〃鍒嗛〉",notes = "level:0(鏌ヨ鎵�鏈�),1(涓�绾х紪鐮�),2(浜岀骇缂栫爜)")
+ public Response<PageInfo<MaterialCodeDictionary>> getCodeList(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam int level){
+ PageInfo<MaterialCodeDictionary> codeList = service.getCodeList(pageNum, pageSize, level);
+ return new Response<PageInfo<MaterialCodeDictionary>>().set(1,codeList);
+ }
+
+ //瑙ｆ瀽瀵煎叆鏁版嵁,鍙娇鐢ㄤ竴娆�
+ @Deprecated
@GetMapping("importData")
- @ApiOperation("瀵煎叆鏁版嵁")
public void importData() throws IOException, InvalidFormatException {
List<MaterialCodeDictionary> list = new LinkedList<>();
File fileTemp = new File("C:\\Users\\29550\\Desktop\\褰撳墠椤圭洰\\202207鍥剧焊绠＄悊\\鐗╂枡绫诲埆(1).xlsx");
--
Gitblit v1.9.1