From ba1a99c09206ac657e2fffaa2777fb1ea7c5077f Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 21 十一月 2023 17:13:04 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/controller/SysInsetRecordsController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/controller/SysInsetRecordsController.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/controller/SysInsetRecordsController.java
index 1fd7df0..8258f39 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/controller/SysInsetRecordsController.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/controller/SysInsetRecordsController.java
@@ -31,7 +31,9 @@
*/
@PostMapping(value = "insert")
public BasicResult insert (@RequestBody SysEmbedmentRecordEntity sysEmbedmentRecordEntity){
- return sysEmbedmentRecordService.insert(sysEmbedmentRecordEntity);
+ synchronized (this){
+ return sysEmbedmentRecordService.insert(sysEmbedmentRecordEntity);
+ }
}
/**
@@ -51,7 +53,9 @@
*/
@PostMapping(value = "update")
BasicResult update(@RequestBody SysEmbedmentRecordEntity sysEmbedmentRecordEntity){
- return sysEmbedmentRecordService.update(sysEmbedmentRecordEntity);
+ synchronized (this){
+ return sysEmbedmentRecordService.update(sysEmbedmentRecordEntity);
+ }
}
/**
@@ -96,12 +100,12 @@
/**
* 导出模板
- * @param embedmentRecordDto
+ * @param
* @param response
*/
@PostMapping(value = "recordExportTemplate")
- void recordExportTemplate(@RequestBody EmbedmentRecordDto embedmentRecordDto, HttpServletResponse response){
- this.sysEmbedmentRecordService.recordExportTemplate(embedmentRecordDto,response);
+ void recordExportTemplate(HttpServletResponse response){
+ this.sysEmbedmentRecordService.recordExportTemplate(null,response);
}
/**
@@ -110,7 +114,9 @@
* @param request
*/
@PostMapping(value = "variateExcel")
- void variateExcel(@RequestParam MultipartFile file, HttpServletRequest request){
- this.sysEmbedmentRecordService.variateExcel(file,request);
+ BasicResult variateExcel(@RequestParam MultipartFile file, HttpServletRequest request){
+ synchronized (this){
+ return this.sysEmbedmentRecordService.variateExcel(file,request);
+ }
}
}
--
Gitblit v1.9.3