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 | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 3c9318a..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,7 +1,6 @@
package com.lf.server.service.data;
-import com.lf.server.entity.ctrl.DownloadReqEntity;
-import com.lf.server.entity.ctrl.PwdEntity;
+import com.lf.server.entity.all.AbstractPwdEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.show.PipelineEntity;
import com.lf.server.helper.*;
@@ -43,17 +42,17 @@
}
@Override
- public Integer selectCountForUser(Integer createUser, Integer type, String 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) {
+ 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
@@ -117,7 +116,7 @@
* @param entity 瀵嗙爜鎶借薄绫�
* @return 鏄�/鍚﹁В瀵嗘垚鍔�
*/
- public static boolean decryptPwd(PwdEntity entity) {
+ public static boolean decryptPwd(AbstractPwdEntity entity) {
try {
String pwd = RsaHelper.decrypt(entity.getPwd());
if (StringHelper.isEmpty(pwd)) {
--
Gitblit v1.9.3