From a26c074129afced8fe87e300fb501030fde0c056 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期五, 04 七月 2025 18:38:29 +0800
Subject: [PATCH] 添加二级费用项

---
 service-job/src/main/java/com/java110/job/cmd/userDownloadFile/ListUserDownloadFileCmd.java |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/cmd/userDownloadFile/ListUserDownloadFileCmd.java b/service-job/src/main/java/com/java110/job/cmd/userDownloadFile/ListUserDownloadFileCmd.java
index 13f0b45..d2510ec 100644
--- a/service-job/src/main/java/com/java110/job/cmd/userDownloadFile/ListUserDownloadFileCmd.java
+++ b/service-job/src/main/java/com/java110/job/cmd/userDownloadFile/ListUserDownloadFileCmd.java
@@ -17,21 +17,23 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.job.IUserDownloadFileV1InnerServiceSMO;
-import com.java110.po.userDownloadFile.UserDownloadFilePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.PayUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.userDownloadFile.UserDownloadFileDto;
+import com.java110.dto.user.UserDownloadFileDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -51,34 +53,44 @@
 @Java110Cmd(serviceCode = "userDownloadFile.listUserDownloadFile")
 public class ListUserDownloadFileCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListUserDownloadFileCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListUserDownloadFileCmd.class);
     @Autowired
     private IUserDownloadFileV1InnerServiceSMO userDownloadFileV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        super.validatePageInfo(reqJson);
+//        super.validatePageInfo(reqJson);
+//        Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖虹紪鍙�");
     }
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           UserDownloadFileDto userDownloadFileDto = BeanConvertUtil.covertBean(reqJson, UserDownloadFileDto.class);
+        String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
 
-           int count = userDownloadFileV1InnerServiceSMOImpl.queryUserDownloadFilesCount(userDownloadFileDto);
+        UserDownloadFileDto userDownloadFileDto = BeanConvertUtil.covertBean(reqJson, UserDownloadFileDto.class);
+        userDownloadFileDto.setDownloadUserId(userId);
 
-           List<UserDownloadFileDto> userDownloadFileDtos = null;
+        int count = userDownloadFileV1InnerServiceSMOImpl.queryUserDownloadFilesCount(userDownloadFileDto);
 
-           if (count > 0) {
-               userDownloadFileDtos = userDownloadFileV1InnerServiceSMOImpl.queryUserDownloadFiles(userDownloadFileDto);
-           } else {
-               userDownloadFileDtos = new ArrayList<>();
-           }
+        List<UserDownloadFileDto> userDownloadFileDtos = null;
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userDownloadFileDtos);
+        String date = DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate());
+        String token = "";
+        if (count > 0) {
+            userDownloadFileDtos = userDownloadFileV1InnerServiceSMOImpl.queryUserDownloadFiles(userDownloadFileDto);
+            for (UserDownloadFileDto tmpUserDownloadFileDto : userDownloadFileDtos) {
+                token = tmpUserDownloadFileDto.getDownloadId() + date;
+                tmpUserDownloadFileDto.setDownloadUrl("/app/file/userfile/download/" + tmpUserDownloadFileDto.getDownloadId() + "/" + PayUtil.md5(token));
+            }
+        } else {
+            userDownloadFileDtos = new ArrayList<>();
+        }
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, userDownloadFileDtos);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

--
Gitblit v1.8.0