feat:文案修改

“mitao”

2025-12-25 0242c8ae596f44427cd23d38f637bf987a4de0bf

feat:文案修改

 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>

 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);
            }
        }
    }

}

 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());

 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"); // 响应内容格式

 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 = "科室产废统计";

 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 为没有限制