From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

---
 src/main/java/com/lf/server/service/data/DownloadService.java |   76 ++++++++++++++++++++++++++++----------
 1 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/lf/server/service/data/DownloadService.java b/src/main/java/com/lf/server/service/data/DownloadService.java
index 0199d31..6d4e5f3 100644
--- a/src/main/java/com/lf/server/service/data/DownloadService.java
+++ b/src/main/java/com/lf/server/service/data/DownloadService.java
@@ -1,10 +1,9 @@
 package com.lf.server.service.data;
 
-import com.lf.server.entity.ctrl.DownloadReqEntity;
+import com.lf.server.entity.all.AbstractPwdEntity;
 import com.lf.server.entity.data.DownloadEntity;
-import com.lf.server.helper.PathHelper;
-import com.lf.server.helper.RsaHelper;
-import com.lf.server.helper.StringHelper;
+import com.lf.server.entity.show.PipelineEntity;
+import com.lf.server.helper.*;
 import com.lf.server.mapper.data.DownloadMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -12,7 +11,7 @@
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.util.List;
+import java.util.*;
 
 /**
  * 涓嬭浇璁板綍
@@ -30,30 +29,30 @@
 
     @Override
     public Integer selectCount(String name) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return downloadMapper.selectCount(name);
     }
 
     @Override
     public List<DownloadEntity> selectByPage(String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+        name = StringHelper.getLikeUpperStr(name);
 
         return downloadMapper.selectByPage(name, limit, offset);
     }
 
     @Override
-    public Integer selectCountForUser(Integer createUser, Integer type, String name) {
-        name = StringHelper.getLikeStr(name);
+    public Integer selectCountForUser(Integer createUser, String types, String name) {
+        name = StringHelper.getLikeUpperStr(name);
 
-        return downloadMapper.selectCountForUser(createUser, type, name);
+        return downloadMapper.selectCountForUser(createUser, types, name);
     }
 
     @Override
-    public List<DownloadEntity> selectByPageForUser(Integer createUser, Integer type, String name, Integer limit, Integer offset) {
-        name = StringHelper.getLikeStr(name);
+    public List<DownloadEntity> selectByPageForUser(Integer createUser, String types, String name, Integer limit, Integer offset) {
+        name = StringHelper.getLikeUpperStr(name);
 
-        return downloadMapper.selectByPageForUser(createUser, type, name, limit, offset);
+        return downloadMapper.selectByPageForUser(createUser, types, name, limit, offset);
     }
 
     @Override
@@ -112,19 +111,19 @@
     }
 
     /**
-     * 鏍￠獙瀵嗙爜鏈夋晥鎬�
+     * 瑙ｅ瘑
      *
-     * @param reqEntity 璇锋眰涓嬭浇瀹炰綋绫�
-     * @return 鏄�/鍚︽湁鏁�
+     * @param entity 瀵嗙爜鎶借薄绫�
+     * @return 鏄�/鍚﹁В瀵嗘垚鍔�
      */
-    public boolean validatePwd(DownloadReqEntity reqEntity) {
+    public static boolean decryptPwd(AbstractPwdEntity entity) {
         try {
-            String pwd = RsaHelper.decrypt(reqEntity.getPwd());
-            if (StringHelper.isEmpty(pwd) || !StringHelper.checkPwdValid(pwd)) {
+            String pwd = RsaHelper.decrypt(entity.getPwd());
+            if (StringHelper.isEmpty(pwd)) {
                 return false;
             }
 
-            reqEntity.setPwd(pwd);
+            entity.setPwd(pwd);
 
             return true;
         } catch (Exception ex) {
@@ -132,4 +131,41 @@
             return false;
         }
     }
+
+    /**
+     * 瑙ｅ瘑
+     *
+     * @param pe 绠￠亾鍒嗘瀽瀹炰綋绫�
+     * @return 鏄�/鍚﹁В瀵嗘垚鍔�
+     */
+    public static boolean decryptPwd(PipelineEntity pe) {
+        try {
+            String pwd = RsaHelper.decrypt(pe.getPwd());
+            if (StringHelper.isEmpty(pwd)) {
+                return false;
+            }
+
+            pe.setPwd(pwd);
+
+            return true;
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            return false;
+        }
+    }
+
+    /**
+     * 瑙ｅ瘑
+     *
+     * @param pwd 鍔犲瘑瀵嗙爜
+     * @return 鍘熷瀵嗙爜
+     */
+    public static String decryptPwd(String pwd) {
+        try {
+            return RsaHelper.decrypt(pwd);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+            return null;
+        }
+    }
 }

--
Gitblit v1.9.3