优化下载中心

java110-bean/src/main/java/com/java110/dto/userDownloadFile/UserDownloadFileDto.java

@@ -31,10 +31,12 @@ public class UserDownloadFileDto extends PageDto implements Serializable {
     private String downloadId;
     private String downloadUserId;
     private String state;
+    private String stateName;
     private String tempUrl;
     private String communityId;
     private String downloadUserName;
     private String fileType;
+    private String fileTypeName;
 
 
     private Date createTime;
@@ -132,4 +134,20 @@ public class UserDownloadFileDto extends PageDto implements Serializable {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getFileTypeName() {
+        return fileTypeName;
+    }
+
+    public void setFileTypeName(String fileTypeName) {
+        this.fileTypeName = fileTypeName;
+    }
 }

java110-db/src/main/resources/mapper/job/UserDownloadFileV1ServiceDaoImplMapper.xml

@@ -20,8 +20,10 @@
         select t.name,t.download_id,t.download_id downloadId,t.download_user_id,t.download_user_id
         downloadUserId,t.status_cd,t.status_cd statusCd,t.state,t.temp_url,t.temp_url
         tempUrl,t.community_id,t.community_id communityId,t.download_user_name,t.download_user_name
-        downloadUserName,t.file_type,t.file_type fileType
+        downloadUserName,t.file_type,t.file_type fileType,td.name stateName,td1.name fileTypeName,t.create_time
         from user_download_file t
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'user_download_file' and td.table_columns = 'state'
+        left join t_dict td1 on t.file_type = td1.status_cd and td1.table_name = 'user_download_file' and td1.table_columns = 'file_type'
         where 1 =1
         <if test="name !=null and name != ''">
             and t.name= #{name}

service-job/src/main/java/com/java110/job/cmd/export/ExportDataCmd.java

@@ -70,7 +70,7 @@ public class ExportDataCmd extends Cmd {
         UserDownloadFilePo userDownloadFilePo = new UserDownloadFilePo();
         userDownloadFilePo.setDownloadId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         userDownloadFilePo.setDownloadUserId(userId);
-        userDownloadFilePo.setDownloadUserName(userDtos.get(0).getUserName());
+        userDownloadFilePo.setDownloadUserName(userDtos.get(0).getName());
         userDownloadFilePo.setFileType(reqJson.getString("pagePath"));
         userDownloadFilePo.setCommunityId(reqJson.getString("communityId"));
         userDownloadFilePo.setName(fileName);

springboot/src/main/java/com/java110/boot/BootApplicationStart.java

@@ -27,6 +27,7 @@ import com.java110.doc.annotation.Java110CmdDocDiscovery;
 import com.java110.doc.registrar.ApiDocCmdPublishing;
 import com.java110.doc.registrar.ApiDocPublishing;
 import com.java110.intf.dev.ICacheV1InnerServiceSMO;
+import com.java110.job.export.ExportDataExecutor;
 import com.java110.service.init.ServiceStartInit;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.util.StringUtil;
@@ -187,6 +188,9 @@ public class BootApplicationStart {
 
             Environment.setSystemStartWay(Environment.SPRING_BOOT);
 
+            //启动导出数据线程处理器
+            ExportDataExecutor.startExportDataExecutor();
+
             //刷新缓存
             flushMainCache(args);
         } catch (Throwable e) {