From eb33c60306f707ec7b30a048388e4de702ca2f15 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 06 三月 2025 08:24:51 +0800
Subject: [PATCH] 查询日期三天内的所有上传软件
---
src/main/java/com/whyc/controller/ProductController.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/ProductController.java b/src/main/java/com/whyc/controller/ProductController.java
index 28c73be..9d78ceb 100644
--- a/src/main/java/com/whyc/controller/ProductController.java
+++ b/src/main/java/com/whyc/controller/ProductController.java
@@ -14,7 +14,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.Date;
@Api(tags = "浜у搧绠＄悊")
@RestController
@@ -48,9 +47,10 @@
@RequestParam(required = false) String parentName,
@RequestParam(required = false) String parentModel,
@RequestParam(required = false) String customCode,
+ @RequestParam(required = false) Integer enabled,
@RequestParam int pageCurr,
@RequestParam int pageSize){
- return service.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,pageCurr,pageSize);
+ return service.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,enabled,pageCurr,pageSize);
}
@ApiOperation(value = "鏌ヨ鍑烘墍鏈夌殑浜у搧鏃犲弬涓嶅垎椤碉紙浜у搧涓婁紶鐨勬槸鐢級",notes = "9.2淇敼鍚庝娇鐢�")
@@ -71,8 +71,9 @@
}
@ApiOperation(value = "浜у搧涓嬭浇(浜у搧id鍜岀増鏈�<褰撳墠鏈�鏂扮増鏈�>)",notes = "8.17淇敼鍚庝娇鐢�")
@GetMapping("downloadProduct")
- public void downloadProduct(HttpServletRequest req, HttpServletResponse resp, @RequestParam int productId, @RequestParam int version){
- bomService.downloadProduct(req,resp,productId,version);
+ public void downloadProduct(HttpServletRequest req, HttpServletResponse resp, @RequestParam int productId, @RequestParam int version
+ , @RequestParam String oprateReason, @RequestParam String oprateInfo){
+ bomService.downloadProduct(req,resp,productId,version,oprateReason,oprateInfo);
}
@ApiOperation(value = "鍘嗗彶浜у搧淇℃伅鏌ョ湅锛堟牴鎹巻鍙蹭骇鍝佷骇鍝乮d鍜岀増鏈煡璇㈠瓙浠跺強鍏跺叧鑱旂殑鐗╂枡淇℃伅锛�",notes = "8.17淇敼鍚庝娇鐢�")
@@ -81,11 +82,24 @@
return bomHistoryService.getBomHistoryAndMaterial(productId,version);
}
+ @ApiOperation(value = "鍘嗗彶浜у搧淇℃伅鏌ョ湅锛堜骇鍝佷腑鏈�0120寮�澶寸殑鐗╂枡鍏跺疄鏄骇鍝侊紝鏌ョ湅浜у搧淇℃伅锛�",notes = "2.8淇敼鍚庝娇鐢紒锛侊紒鏆傛椂鏃犵敤锛侊紒锛侊紒")
+ @GetMapping("getBomHistoryAndMaterial_0120")
+ public Response getBomHistoryAndMaterial_0120( @RequestParam String parentCode, @RequestParam String parentName, @RequestParam String parentModel){
+ return bomHistoryService.getBomHistoryAndMaterial_0120(parentCode,parentName,parentModel);
+ }
+
+ @ApiOperation(value = "鏍规嵁浜у搧姣嶆枡鍨嬪彿锛屽畾鍒跺崟鍙凤紝鐗堟湰涓嬭浇鍘熷鍘嬬缉鍖呮枃浠�",notes = "11.17淇敼鍚庝娇鐢�")
+ @GetMapping("getOriginalZip")
+ public Response getOriginalZip(@RequestParam String parentCode, @RequestParam String parentModel,@RequestParam(required = false) String customCode,@RequestParam int version){
+ return bomHistoryService.getOriginalZip(parentCode,parentModel,customCode,version);
+ }
+
@ApiOperation(value = "鍘嗗彶浜у搧涓嬭浇(浜у搧id鍜岀増鏈�<涓嬭浇鐨勭増鏈�>)",notes = "8.17淇敼鍚庝娇鐢�")
@GetMapping("downloadProductHistory")
- public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, @RequestParam int productId, @RequestParam int version){
- bomHistoryService.downloadProductHistory(req,resp,productId,version);
+ public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, @RequestParam int productId, @RequestParam int version
+ , @RequestParam String oprateReason, @RequestParam String oprateInfo){
+ bomHistoryService.downloadProductHistory(req,resp,productId,version,oprateReason,oprateInfo);
}
@ApiOperation(value = "鍘嗗彶鐗堟湰鍙敤鎬ц瀹�",notes = "8.31淇敼鍚庝娇鐢�")
@@ -94,16 +108,55 @@
return historyService.setpHistoryEnable(parentCode, customCode, version, enabled,reason,versionTime);
}
@PostMapping("zipParse")
- @ApiOperation(value = "zip瑙ｆ瀽",notes = "杩斿洖缁撴灉涓�,杩藉姞data3涓哄姣旂粨鏋�,涓簁ey-value闆嗗悎,key涓篸iffList,addList,deleteList")
+ @ApiOperation(value = "zip瑙ｆ瀽",notes = "杩斿洖缁撴灉涓�,杩藉姞data3涓哄姣旂粨鏋�,涓簁ey-value闆嗗悎,key涓篸iffList,addList,deleteList,diffDwgList")
public Response zipParse(@RequestParam("file") MultipartFile file,@RequestParam(required = false) String baseStr) throws IOException, InvalidFormatException {
//瑕佸仛瀵规瘮鐨勪骇鍝�,浼犲叆浜嗙墿鏂�(parent_code)鍜屽畾鍒惰〃鍗曞彿(custom_code)
Product baseProduct = (baseStr==null?null:ActionUtil.getGson().fromJson(baseStr, Product.class));
return service.zipParse(file,baseProduct);
}
+ /**
+ * 杩欎釜鎺ュ彛鏄繘琛屼骇鍝佹柊澧�,浜у搧bom鏂板鐨勬帴鍙�.
+ * 鏂板鏂瑰紡鏈夊緢澶�,鏈夌洿鎺ヤ粠zip瑙ｆ瀽鏂板浜у搧,涔熷彲浠ュ熀浜庡師鏈変骇鍝佸鍒惰繘琛屽畾鍒剁瓑.闇�瑕佹敞鎰忓吋瀹�!
+ * @param product 浜у搧鏂板,bom鏂板,浜у搧鐗堟湰鏇存柊
+ * @return
+ * @throws IOException
+ */
@PostMapping
@ApiOperation(value = "鏂板",notes = "瑙ｆ瀽鏃惰繑鍥炵殑缁濆璺緞,闇�瑕佸洖浼犲埌瀛楁fileUrl")
public Response add(@RequestBody Product product) throws IOException {
return service.add(product);
}
+
+ @ApiOperation(value = "鏍规嵁浜у搧id鏌ヨ琚攣瀹氱殑鐗╂枡dwg鍜屼骇鍝佷笣鍗�",notes = "8.17淇敼鍚庝娇鐢�")
+ @GetMapping("getLockedByProductId")
+ public Response getLockedByProductId( @RequestParam int productId){
+ return service.getLockedByProductId(productId);
+ }
+
+ /*@GetMapping("manualUpdate")
+ @Transactional
+ public void manualUpdate(){
+ //material灞炴�ц浆绉诲埌bom鍜宐omHistory
+ bomHistoryService.updateMaterialField2BomHistory();
+ bomService.updateMaterialField2Bom();
+ }*/
+
+ @ApiOperation(tags = "鍙嶉绠＄悊",value = "鏌ヨ褰撳墠浣跨敤鐨勬墍鏈夌殑浜у搧")
+ @GetMapping("getFkProduct")
+ public Response getFkProduct(){
+ return service.getFkProduct();
+ }
+
+ @ApiOperation(value = "浜у搧瀵规瘮涓嬫媺閫変腑")
+ @GetMapping("getCompareProduct")
+ public Response getCompareProduct(){
+ return service.getCompareProduct();
+ }
+
+ @ApiOperation(value = "楠岃瘉姣嶆枡缂栫爜鏄惁瀛樺湪浜у搧涓�")
+ @GetMapping("judgeParentCode")
+ public Response judgeParentCode(@RequestParam String parentCode,@RequestParam(required = false) String customCode){
+ return service.judgeParentCode(parentCode,customCode);
+ }
}
--
Gitblit v1.9.1