From 0242c8ae596f44427cd23d38f637bf987a4de0bf Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 25 十二月 2025 15:34:41 +0800
Subject: [PATCH] feat:文案修改
---
src/main/java/cn/besteam/modules/medical/controller/MwCollectRecordController.java | 2
src/main/java/cn/besteam/modules/medical/controller/MwCollectionAmendantRecordController.java | 6 +-
src/main/resources/application-dev.yml | 2
src/main/java/cn/besteam/modules/report/biz/ReportBiz.java | 5 +
src/main/java/cn/besteam/common/aspect/LockApiAspect.java | 114 +++++++++++++++++++-------------------
pom.xml | 10 +-
6 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5144fe7..2f8e424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,11 +206,11 @@
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.baomidou</groupId>-->
-<!-- <artifactId>lock4j-spring-boot-starter</artifactId>-->
-<!-- <version>1.0.0</version>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>lock4j-spring-boot-starter</artifactId>
+ <version>1.0.0</version>
+ </dependency>
<!--oss-->
<dependency>
diff --git a/src/main/java/cn/besteam/common/aspect/LockApiAspect.java b/src/main/java/cn/besteam/common/aspect/LockApiAspect.java
index cf18e02..40ee091 100644
--- a/src/main/java/cn/besteam/common/aspect/LockApiAspect.java
+++ b/src/main/java/cn/besteam/common/aspect/LockApiAspect.java
@@ -1,57 +1,57 @@
-// package cn.besteam.common.aspect;
-//
-// import cn.besteam.common.aspect.annotation.LockApi;
-// import com.baomidou.lock.LockExecutor;
-// import com.baomidou.lock.LockInfo;
-// import org.aspectj.lang.ProceedingJoinPoint;
-// import org.aspectj.lang.annotation.Around;
-// import org.aspectj.lang.annotation.Aspect;
-// import org.aspectj.lang.annotation.Pointcut;
-// import org.aspectj.lang.reflect.MethodSignature;
-// import org.springframework.beans.factory.annotation.Autowired;
-// import org.springframework.stereotype.Component;
-//
-// import java.lang.reflect.Method;
-//
-// /**
-// * 系统日志，切面处理类
-// *
-// * @author chenqilong
-// * @since 2019/4/19
-// */
-// @Aspect
-// @Component
-// public class LockApiAspect {
-//
-// @Autowired
-// private LockExecutor lockExecutor;
-//
-// private LockKeyGenerator lockKeyGenerator = new LockKeyGenerator();
-//
-// @Pointcut("@annotation(cn.besteam.common.aspect.annotation.LockApi)")
-// public void lockPointCut() {
-//
-// }
-//
-// @Around("lockPointCut()")
-// public Object around(ProceedingJoinPoint point) throws Throwable {
-//
-// LockInfo lockInfo = null;
-// try {
-// MethodSignature signature = (MethodSignature) point.getSignature();
-// Method method = signature.getMethod();
-// LockApi lockApi = method.getAnnotation(LockApi.class);
-// String keyName = lockKeyGenerator.getKeyName(point, lockApi);
-// lockInfo = lockExecutor.tryLock(keyName, lockApi.expire(), lockApi.tryTimeout());
-// if (null != lockInfo) {
-// return point.proceed();
-// }
-// return null;
-// } finally {
-// if (null != lockInfo) {
-// lockExecutor.releaseLock(lockInfo);
-// }
-// }
-// }
-//
-// }
+package cn.besteam.common.aspect;
+
+import cn.besteam.common.aspect.annotation.LockApi;
+import com.baomidou.lock.LockExecutor;
+import com.baomidou.lock.LockInfo;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+/**
+ * 系统日志，切面处理类
+ *
+ * @author chenqilong
+ * @since 2019/4/19
+ */
+@Aspect
+@Component
+public class LockApiAspect {
+
+ @Autowired
+ private LockExecutor lockExecutor;
+
+ private LockKeyGenerator lockKeyGenerator = new LockKeyGenerator();
+
+ @Pointcut("@annotation(cn.besteam.common.aspect.annotation.LockApi)")
+ public void lockPointCut() {
+
+ }
+
+ @Around("lockPointCut()")
+ public Object around(ProceedingJoinPoint point) throws Throwable {
+
+ LockInfo lockInfo = null;
+ try {
+ MethodSignature signature = (MethodSignature) point.getSignature();
+ Method method = signature.getMethod();
+ LockApi lockApi = method.getAnnotation(LockApi.class);
+ String keyName = lockKeyGenerator.getKeyName(point, lockApi);
+ lockInfo = lockExecutor.tryLock(keyName, lockApi.expire(), lockApi.tryTimeout());
+ if (null != lockInfo) {
+ return point.proceed();
+ }
+ return null;
+ } finally {
+ if (null != lockInfo) {
+ lockExecutor.releaseLock(lockInfo);
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/cn/besteam/modules/medical/controller/MwCollectRecordController.java b/src/main/java/cn/besteam/modules/medical/controller/MwCollectRecordController.java
index 4ffda77..c7a4b15 100644
--- a/src/main/java/cn/besteam/modules/medical/controller/MwCollectRecordController.java
+++ b/src/main/java/cn/besteam/modules/medical/controller/MwCollectRecordController.java
@@ -563,7 +563,7 @@
writer.setHeaderAlias(headerMapListSupplement);
writer.write(voList);
//
- String fileName = "医废补录记录";
+ String fileName = "废物补录记录";
response.setContentType("application/octet-stream;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
writer.flush(response.getOutputStream());
diff --git a/src/main/java/cn/besteam/modules/medical/controller/MwCollectionAmendantRecordController.java b/src/main/java/cn/besteam/modules/medical/controller/MwCollectionAmendantRecordController.java
index 805ba78..78533be 100644
--- a/src/main/java/cn/besteam/modules/medical/controller/MwCollectionAmendantRecordController.java
+++ b/src/main/java/cn/besteam/modules/medical/controller/MwCollectionAmendantRecordController.java
@@ -215,7 +215,7 @@
headerMapListHistory.put("code", "废物编号");
headerMapListHistory.put("hospitalName", "医院名称");
headerMapListHistory.put("departmentName", "科室名称");
- /*headerMapListHistory.put("wasteTypeStr", "医废类型");
+ /*headerMapListHistory.put("wasteTypeStr", "废物类型");
headerMapListHistory.put("weight", "重量(kg)");*/
headerMapListHistory.put("departmentUserName", "科室人员");
headerMapListHistory.put("creator", "收集人员");
@@ -281,7 +281,7 @@
voList.add(vo);
}
ExcelWriter writer = ExcelUtil.getWriter(true);
- writer.renameSheet("医废修改记录");
+ writer.renameSheet("数据修改记录");
writer.setColumnWidth(0, 30);
writer.setColumnWidth(1, 30);
writer.setColumnWidth(2, 30);
@@ -295,7 +295,7 @@
writer.setHeaderAlias(headerMapListHistory);
writer.write(voList);
//
- String fileName = "医废修改记录";
+ String fileName = "数据修改记录";
response.setContentType("application/octet-stream;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
//response.setContentType("application/octet-stream"); // 响应内容格式
diff --git a/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java b/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java
index 525fc65..de7ff52 100644
--- a/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java
+++ b/src/main/java/cn/besteam/modules/report/biz/ReportBiz.java
@@ -662,8 +662,9 @@
writer = new ExcelWriter(exportDepartmentReport1(dto, type, fileName), fileName);
break;
case 7:
- fileName = "科室产废统计";
- writer = new ExcelWriter(exportDepartmentReport(dto, type, fileName), fileName);
+ fileName = "产废月报表";
+ XSSFWorkbook workbook7 = exportDepartmentReport(dto, type, fileName);
+ writer = new ExcelWriter(workbook7, workbook7.getSheetName(0));
break;
case 8:
fileName = "科室产废统计";
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 420abc6..2e50b64 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -84,7 +84,7 @@
redis:
database: 8
host: 127.0.0.1
- password: 123456
+ password:
jedis:
pool:
max-active: 100 #最大连接数据库连接数,设 0 为没有限制
--
Gitblit v1.7.1