优化

gly-base-core/src/main/java/cn/com/taiji/core/manager/tools/minio/MinioUtil.java

@@ -96,6 +96,7 @@ public class MinioUtil extends CommonAbstract {
     public String fileUploadHttp(File file, String bucketName, BucketFileBus busCode) throws ManagerException {
         String fileName = file.getName();
         String uuidFileName = getUuidFileName(busCode, fileName);
+        logger.info("MinIo 上传文件...{}", uuidFileName);
         try {
             if (StringUtils.isEmpty(bucketName.trim())) {
                 bucketName = defaultBucket;
@@ -105,20 +106,22 @@ public class MinioUtil extends CommonAbstract {
                     .bucket(bucketName)
                     .object(uuidFileName)
                     .stream(inputStream, inputStream.available(), -1)
-                    .contentType(MinIoContentType.getContentType(fileName.substring(fileName.lastIndexOf("."))))
+                    .contentType(MinIoContentType.getContentType(fileName.substring(fileName.lastIndexOf(StrUtil.DOT))))
                     .build());
 
         } catch (Exception e) {
             logger.error("MinIo 上传文件失败...{}", e);
             throw new ManagerException("MinIo 上传文件失败...请联系管理员");
+        }finally {
+            file.delete();
         }
-        file.delete();
+
         return bucketName + StrUtil.SLASH + uuidFileName;
     }
 
     //生成随机文件名
     private static String getUuidFileName(BucketFileBus busCode, String fileName) {
-        String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 24);
+        String uuid = UUID.randomUUID().toString().replace(StrUtil.DASHED, "").substring(0, 24);
         return DateUtil.format(new Date(), "yyyyMMdd") + StrUtil.SLASH + busCode.getCode() + StrUtil.SLASH + uuid + "_" + fileName;
     }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/equity/CouponManagerImpl.java

@@ -7,17 +7,20 @@ import cn.com.taiji.core.entity.dict.EnableStatus;
 import cn.com.taiji.core.entity.dict.issue.CouponStatus;
 import cn.com.taiji.core.entity.issue.IssueCouponDetail;
 import cn.com.taiji.core.entity.issue.IssueCouponInfo;
+import cn.com.taiji.core.entity.issue.IssueSingleEquity;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.manager.cache.RedisCacheManager;
 import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.repo.jpa.issue.IssueCouponDetailRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueCouponInfoRepo;
+import cn.com.taiji.core.repo.jpa.issue.IssueSingleEquityRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.managew.dto.equity.coupon.*;
 import cn.com.taiji.managew.manager.excel.CouponDetailListener;
 import cn.com.taiji.managew.model.excel.CouponDetailData;
 import cn.com.taiji.managew.repo.jpa.request.IssueCouponDetailPageRequest;
 import cn.com.taiji.managew.repo.jpa.request.IssueCouponInfoPageRequest;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.excel.EasyExcel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +47,8 @@ public class CouponManagerImpl extends RedisCacheManager implements CouponManage
     @Autowired
     private IssueCouponDetailRepo issueCouponDetailRepo;
     @Autowired
+    private IssueSingleEquityRepo issueSingleEquityRepo;
+    @Autowired
     private MinioUtil minioUtil;
     @Autowired
     private StaffRepo staffRepo;
@@ -74,8 +79,12 @@ public class CouponManagerImpl extends RedisCacheManager implements CouponManage
         if (byCouponId != null) {
             throw new RuntimeException("该卡券有详情，不可刪除");
         }
-        //是否被权益引用 todo
-
+        //是否被权益引用
+        List<IssueSingleEquity> singleEquities = issueSingleEquityRepo.findByCouponId(req.getId());
+        if (CollectionUtil.isNotEmpty(singleEquities)) {
+            throw new RuntimeException("该卡券被权益引用，不可刪除");
+        }
+        issueCouponInfoRepo.delete(couponInfo);
 
     }
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/tools/StringUtils.java

@@ -2,9 +2,10 @@ package cn.com.taiji.managew.tools;
 
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.json.JSONObject;
+//import org.json.JSONObject;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
@@ -751,21 +752,21 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     }
 
 
-    /**
-     * JSON 转 MAP
-     *
-     * @param json
-     * @return
-     */
-    public static Map<String, Object> entityChangeMap(JSONObject json) {
-        Map<String, Object> param = new HashMap<>();
-        Iterator<?> iterator = json.keys();
-        while (iterator.hasNext()) {
-            String key = String.valueOf(iterator.next());
-            param.put(key, json.get(key));
-        }
-        return param;
-    }
+//    /**
+//     * JSON 转 MAP
+//     *
+//     * @param json
+//     * @return
+//     */
+//    public static Map<String, Object> entityChangeMap(JSONObject json) {
+//        Map<String, Object> param = new HashMap<>();
+//        Iterator<?> iterator = json.keys();
+//        while (iterator.hasNext()) {
+//            String key = String.valueOf(iterator.next());
+//            param.put(key, json.get(key));
+//        }
+//        return param;
+//    }
 
     /**
      * 拼接路径

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/dto/serviceHall/ServiceHallRegisterLocationBatchReqDTO.java

@@ -1,5 +1,6 @@
 package cn.com.taiji.userw.dto.serviceHall;
 
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ import javax.validation.constraints.NotBlank;
  * @date Created in  2025/03/27 17:08
  */
 @Data
-public class ServiceHallRegisterLocationBatchReqDTO {
+public class ServiceHallRegisterLocationBatchReqDTO extends AbstractStaffBizRequestDTO {
 
     @NotBlank(message = "excel文件地址不能为空")
     @ApiModelProperty(value = "excel文件地址")

zhywpt-app-userw/src/main/java/cn/com/taiji/userw/manager/serviceHall/ServiceHallManagerImpl.java

@@ -282,8 +282,6 @@ public class ServiceHallManagerImpl extends AbstractManager implements ServiceHa
                     .doWrite(errors);
             path = minioUtil.fileUploadHttp(upFile, BucketFileBus.SERVICEHALL);
         }
-        //删除临时文件
-        FileUtil.del(tempFile);
         return path;
     }
 

zhywpt-service-ias/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis'
     implementation group: 'com.alibaba', name: 'easyexcel', version: '3.2.1'
     implementation 'io.minio:minio:8.4.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+
     implementation group: 'com.alipay.sdk', name: 'alipay-sdk-java', version: '4.39.79.ALL'
     implementation group: 'cn.jpush.api', name: 'jpush-client', version: '3.6.6'
     //定时器相关
@@ -46,7 +46,7 @@ dependencies {
     // 添加 MapStruct 注解处理器依赖
     annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
 
-    implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+
 }
 
 bootJar {