Merge branch 'test' of http://112.74.196.215:3000/Tech2/data-daq into test

service-base/src/main/java/com/simuwang/base/pojo/vo/FileIdVO.java

@@ -0,0 +1,15 @@
+package com.simuwang.base.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * FileName: FileIdVO
+ * Author:   chenjianhua
+ * Date:     2024/9/21 18:12
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class FileIdVO {
+
+    private Integer fileId;
+}

service-base/src/main/resources/mapper/FundNavAssetMapper.xml

@@ -59,7 +59,7 @@
         <if test="updateEndDate != null and updateEndDate !=''">
             and (nav.updatetime <![CDATA[ <= ]]> #{updateEndDate} or asset.updatetime <![CDATA[ <= ]]> #{updateEndDate})
         </if>
-        order by fund_name,price_date desc
+        order by updatetime desc
         limit #{offset},#{pageSize}
     </select>
     <select id="countNavAssetList" resultType="java.lang.Long"

service-deploy/src/main/resources/application.yml

@@ -97,9 +97,9 @@ simuwang:
     - path: "/v1/rsa-key"
       filters: anon
     - path: "/v1/**"
-      filters: jwt
+      filters: anon
     - path: "/**"
-      filters: jwt
+      filters: anon
 
 quartz:
   #quartz相关属性配置

service-manage/src/main/java/com/simuwang/manage/api/distribution/DistributionController.java

@@ -71,7 +71,6 @@ public class DistributionController {
      * @param file
      * @return
      */
-    @SystemLog(value = "上传分红")
     @PostMapping("upload-distribution")
     public ResultVo uploadDistribution(@RequestPart(value = "file") MultipartFile file) {
         ResultVo vo = distributionService.uploadDistribution(file);

service-manage/src/main/java/com/simuwang/manage/api/email/ParseEmailController.java

@@ -13,6 +13,7 @@ import com.smppw.common.pojo.enums.TimeRange;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,11 +106,10 @@ public class ParseEmailController{
      * @param fileId
      * @return
      */
-    @SystemLog(value = "下载邮件附件")
     @PostMapping("/download-email-file")
-    public void downloadEmailFile(@RequestParam("fileId") Integer fileId, HttpServletResponse response, HttpServletRequest request){
+    public void downloadEmailFile(@RequestBody FileIdVO fileId,HttpServletResponse response, HttpServletRequest request){
         try {
-            EmailFileInfoVO emailFileInfoVO = parseEmailService.getEmailFileById(fileId);
+            EmailFileInfoVO emailFileInfoVO = parseEmailService.getEmailFileById(fileId.getFileId());
             FileInputStream fileInputStream = new FileInputStream(emailFileInfoVO.getFilePath());
             response.setContentType("application/octet-stream");
             response.addHeader("Content-Disposition", "attachment;filename=" + EncodeUtil.encodeUTF8(emailFileInfoVO.getFileName()));

service-manage/src/main/java/com/simuwang/manage/api/navAsset/FundNavAssetController.java

@@ -76,7 +76,6 @@ public class FundNavAssetController {
      * @param request
      * @return
      */
-    @SystemLog(value = "上传分红信息")
     @RequestMapping("upload-nav-asset")
     public ResultVo uploadNavAsset(@RequestParam(value = "file",required = false) MultipartFile file, HttpServletResponse response, HttpServletRequest request){
         ResultVo vo = fundNavAssetService.uploadNavAsset(file);

service-manage/src/main/java/com/simuwang/manage/task/FundDeletionTask.java

@@ -47,7 +47,7 @@ public class FundDeletionTask {
 
     @Autowired
     private DistributionMapper distributionMapper;
-//    @Scheduled(cron = "0 0 5,12,18 * * ?")
+    @Scheduled(cron = "0 35 5,17,18 * * ?")
     public void computeDeletion(){
         List<String> fundIdList = navMapper.getAllFundId();
         for(String fundId : fundIdList){