diff --git a/BJD_20240619000073.xls b/BJD_20240619000073.xls deleted file mode 100644 index 47a4b42..0000000 Binary files a/BJD_20240619000073.xls and /dev/null differ diff --git a/BJD_20240619000099.xls b/BJD_20240619000099.xls deleted file mode 100644 index 70389b3..0000000 Binary files a/BJD_20240619000099.xls and /dev/null differ diff --git a/BJD_20240619000115.xls b/BJD_20240619000115.xls deleted file mode 100644 index 250d54b..0000000 Binary files a/BJD_20240619000115.xls and /dev/null differ diff --git a/RB_BJD_AHP20240619092621195275 b/RB_BJD_AHP20240619092621195275 deleted file mode 100644 index afbc2a1..0000000 Binary files a/RB_BJD_AHP20240619092621195275 and /dev/null differ diff --git a/RB_BJD_DHW20240619093313731913.xls b/RB_BJD_DHW20240619093313731913.xls deleted file mode 100644 index 70a56c6..0000000 Binary files a/RB_BJD_DHW20240619093313731913.xls and /dev/null differ diff --git a/RB_BJD_ENZ20240619091135080348 b/RB_BJD_ENZ20240619091135080348 deleted file mode 100644 index 038ae47..0000000 Binary files a/RB_BJD_ENZ20240619091135080348 and /dev/null differ diff --git a/RB_BJD_GXW20240619091043295970 b/RB_BJD_GXW20240619091043295970 deleted file mode 100644 index 478661d..0000000 Binary files a/RB_BJD_GXW20240619091043295970 and /dev/null differ diff --git a/RB_BJD_IXK20240619091608786202 b/RB_BJD_IXK20240619091608786202 deleted file mode 100644 index 722866f..0000000 Binary files a/RB_BJD_IXK20240619091608786202 and /dev/null differ diff --git a/RB_BJD_RUH20240619094420010842.xls b/RB_BJD_RUH20240619094420010842.xls deleted file mode 100644 index a63a33e..0000000 Binary files a/RB_BJD_RUH20240619094420010842.xls and /dev/null differ diff --git a/RB_BJD_SNP20240619093101696539.xls b/RB_BJD_SNP20240619093101696539.xls deleted file mode 100644 index 6f82684..0000000 Binary files a/RB_BJD_SNP20240619093101696539.xls and /dev/null differ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java index 7883790..e94836d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java @@ -28,6 +28,7 @@ import com.ruoyi.web.utils.IdUtils; import com.ruoyi.web.utils.ListSplitUtil; import com.ruoyi.web.utils.rbExcel.excelUtil; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.web.bind.annotation.*; @@ -266,6 +267,7 @@ public class RedBookController extends BaseController public AjaxResult madeXjQuot(HttpServletResponse response, @RequestBody OAQuot quot) throws Exception { Quot xjquot = new Quot(); + File excelFile = null; try{ xjquot.setQuotId(UUID.fastUUID().toString()); String quotCode = redBookService.getCode("BJD"); @@ -280,7 +282,9 @@ public class RedBookController extends BaseController iQuotService.insertQuot(xjquot); List list = quot.getSelectedResultData(); - File file = excelUtil.exportXjQuotExcel(response,xjquot,list); + + excelFile = new File("xjQuotFile/"+xjquot.getQuotCode()+".xls"); + File file = excelUtil.exportXjQuotExcel(response,excelFile,xjquot,list); MultipartFile multipartFile = convert(file); /** 上传清单附件 **/ @@ -316,6 +320,7 @@ public class RedBookController extends BaseController } /** 上传清单附件 **/ + FileUtils.delete(excelFile); return success(xjquot); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java index 67d6134..8dc64ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/rbExcel/excelUtil.java @@ -20,14 +20,9 @@ import jxl.write.*; import jxl.write.biff.RowsExceededException; import org.apache.commons.io.FileUtils; import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; - import javax.servlet.http.HttpServletResponse; import java.io.*; import java.math.BigDecimal; -import java.net.URL; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -672,10 +667,8 @@ public class excelUtil { * @param quot * @param list */ - public static File exportXjQuotExcel(HttpServletResponse response, Quot quot, List list){ - File excelFile = null; + public static File exportXjQuotExcel(HttpServletResponse response,File excelFile, Quot quot, List list){ try { - excelFile = new File(quot.getQuotCode()+".xls"); WritableWorkbook wwb = Workbook.createWorkbook(excelFile); // 新建一张表 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index b810335..758b175 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -88,7 +88,7 @@ spring: # 密码 password: # 连接超时时间 - timeout: 30s + timeout: 60s lettuce: pool: # 连接池中的最小空闲连接 @@ -96,7 +96,7 @@ spring: # 连接池中的最大空闲连接 max-idle: 100 # 连接池的最大数据库连接数 - max-active: 300 + max-active: 500 # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms # 关闭超时时间 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedissonConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedissonConfig.java index 6869ee4..9c1b582 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedissonConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedissonConfig.java @@ -43,6 +43,7 @@ public class RedissonConfig { // 可以用"rediss://"来启用SSL连接 String address = "redis://" + host + ":" + port; singleServerConfig.setAddress(address); + config.useSingleServer().setPingConnectionInterval(0); // 防止出现 redis 连接不上的问题 // 设置 数据库编号 singleServerConfig.setDatabase(database); /*