diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FileSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FileSystemController.java index d22dce2..c3f9b7e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FileSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FileSystemController.java @@ -2,12 +2,9 @@ package com.ruoyi.web.controller.file; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.file.domain.Project; -import com.ruoyi.file.object.FileModel; -import com.ruoyi.file.object.FileSystemFilter; +import com.ruoyi.file.model.FileModel; +import com.ruoyi.file.model.FileSystemFilter; import com.ruoyi.file.service.FileSystemService; -import com.ruoyi.file.service.IProjectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/OpenFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/OpenFileController.java index ff9f7ab..22c08de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/OpenFileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/OpenFileController.java @@ -1,18 +1,13 @@ package com.ruoyi.web.controller.open; import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.file.object.UploadForwardReq; -import com.ruoyi.file.object.UploadRedirectReq; +import com.ruoyi.file.request.UploadForwardReq; +import com.ruoyi.file.request.UploadRedirectReq; import com.ruoyi.file.object.UploadResp; -import com.ruoyi.file.object.UploadResult; import com.ruoyi.file.service.FileService; -import com.ruoyi.framework.config.ServerConfig; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -29,9 +24,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; /** * 文件接口 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/RuralCollectiveAssetsFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/RuralCollectiveAssetsFileController.java index 0dce035..1962c6b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/RuralCollectiveAssetsFileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/open/RuralCollectiveAssetsFileController.java @@ -1,24 +1,14 @@ package com.ruoyi.web.controller.open; -import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.file.object.CommonAttachReq; -import com.ruoyi.file.object.CommonUploadReq; -import com.ruoyi.file.object.UploadForwardReq; -import com.ruoyi.file.object.UploadRedirectReq; -import com.ruoyi.file.object.UploadResp; +import com.ruoyi.file.request.CommonAttachReq; +import com.ruoyi.file.request.CommonUploadReq; +import com.ruoyi.file.request.FinanceVoucherUploadReq; import com.ruoyi.file.service.FileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -27,7 +17,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.Map; /** * 文件接口 @@ -63,4 +52,14 @@ public class RuralCollectiveAssetsFileController { fileService.commonAttach(file, req, request, response); } + + /** + * 凭证附件上传 + */ + @ApiOperation("凭证附件上传") + @PostMapping("/finance/voucher/upload") + public void financeVoucherUpload(@Valid FinanceVoucherUploadReq req, MultipartFile file, HttpServletRequest request, HttpServletResponse response) + { + fileService.financeVoucherUpload(file, req, request, response); + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/MybatisStdOutputLog.java b/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/MybatisStdOutputLog.java index 9b24017..3f31045 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/MybatisStdOutputLog.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/MybatisStdOutputLog.java @@ -18,6 +18,7 @@ public class MybatisStdOutputLog implements Log { static final int SQL_RESULT_STYLE = Konsole.GenStyle(Konsole.FC_PURPLE, Konsole.FS_BOLD, Konsole.BC_YELLOW, Konsole.S_BG_ENABLED); static final int SQL_ROWS_STYLE = Konsole.GenStyle(Konsole.FC_GREEN); static final int SQL_COLUMNS_STYLE = Konsole.GenStyle(Konsole.FC_YELLOW, Konsole.FS_BOLD); + static final int SQL_STYLE = Konsole.GenStyle(Konsole.FC_RED); // 不输出的查询 private static final String[] UnhandleClass = { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/SQLQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/SQLQuery.java index acfd5f5..a95e6c5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/SQLQuery.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/dev/mybatis/SQLQuery.java @@ -171,7 +171,7 @@ public class SQLQuery SQLStatement sqlStatement = new SQLStatement(sql, parms); String parsedSql = sqlStatement.Parse(); if(null != parsedSql) - MybatisStdOutputLog.cout("编译SQL: \n" + parsedSql, MybatisStdOutputLog.SQL_STATEMENT_STYLE); + MybatisStdOutputLog.cout(/*"编译SQL: \n" + */parsedSql, MybatisStdOutputLog.SQL_STYLE); // Select query if(result >= 0) diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/object/FileModel.java b/ruoyi-file/src/main/java/com/ruoyi/file/model/FileModel.java similarity index 96% rename from ruoyi-file/src/main/java/com/ruoyi/file/object/FileModel.java rename to ruoyi-file/src/main/java/com/ruoyi/file/model/FileModel.java index 3f8c1d3..717d213 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/object/FileModel.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/model/FileModel.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.object; +package com.ruoyi.file.model; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.PathUtils; diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/object/FileSystemFilter.java b/ruoyi-file/src/main/java/com/ruoyi/file/model/FileSystemFilter.java similarity index 96% rename from ruoyi-file/src/main/java/com/ruoyi/file/object/FileSystemFilter.java rename to ruoyi-file/src/main/java/com/ruoyi/file/model/FileSystemFilter.java index fa9e35c..8c199bf 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/object/FileSystemFilter.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/model/FileSystemFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.object; +package com.ruoyi.file.model; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.file.enums.FileType; diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/object/CommonAttachReq.java b/ruoyi-file/src/main/java/com/ruoyi/file/request/CommonAttachReq.java similarity index 93% rename from ruoyi-file/src/main/java/com/ruoyi/file/object/CommonAttachReq.java rename to ruoyi-file/src/main/java/com/ruoyi/file/request/CommonAttachReq.java index 6789f86..13d11ca 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/object/CommonAttachReq.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/request/CommonAttachReq.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.object; +package com.ruoyi.file.request; import lombok.Data; diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/object/CommonUploadReq.java b/ruoyi-file/src/main/java/com/ruoyi/file/request/CommonUploadReq.java similarity index 89% rename from ruoyi-file/src/main/java/com/ruoyi/file/object/CommonUploadReq.java rename to ruoyi-file/src/main/java/com/ruoyi/file/request/CommonUploadReq.java index b025d0f..ab82989 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/object/CommonUploadReq.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/request/CommonUploadReq.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.object; +package com.ruoyi.file.request; import lombok.Data; diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/request/FinanceVoucherUploadReq.java b/ruoyi-file/src/main/java/com/ruoyi/file/request/FinanceVoucherUploadReq.java new file mode 100644 index 0000000..1149f0d --- /dev/null +++ b/ruoyi-file/src/main/java/com/ruoyi/file/request/FinanceVoucherUploadReq.java @@ -0,0 +1,17 @@ +package com.ruoyi.file.request; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class FinanceVoucherUploadReq +{ + private Long id; + @NotBlank(message = "服务标识不能为空") + private String token; + + private String bizPath = "voucher"; + + private String fileType; +} diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadForwardReq.java b/ruoyi-file/src/main/java/com/ruoyi/file/request/UploadForwardReq.java similarity index 94% rename from ruoyi-file/src/main/java/com/ruoyi/file/object/UploadForwardReq.java rename to ruoyi-file/src/main/java/com/ruoyi/file/request/UploadForwardReq.java index d81e480..ee07303 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadForwardReq.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/request/UploadForwardReq.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.object; +package com.ruoyi.file.request; import lombok.Data; diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadRedirectReq.java b/ruoyi-file/src/main/java/com/ruoyi/file/request/UploadRedirectReq.java similarity index 97% rename from ruoyi-file/src/main/java/com/ruoyi/file/object/UploadRedirectReq.java rename to ruoyi-file/src/main/java/com/ruoyi/file/request/UploadRedirectReq.java index 825927e..9b9aee5 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/object/UploadRedirectReq.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/request/UploadRedirectReq.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.object; +package com.ruoyi.file.request; import com.ruoyi.common.utils.StringUtils; import lombok.Data; diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/service/FileService.java b/ruoyi-file/src/main/java/com/ruoyi/file/service/FileService.java index a19cd1d..4c1516c 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/service/FileService.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/service/FileService.java @@ -12,14 +12,15 @@ import cn.hutool.http.Method; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.PathUtils; import com.ruoyi.file.domain.Project; -import com.ruoyi.file.object.CommonAttachReq; -import com.ruoyi.file.object.CommonUploadReq; +import com.ruoyi.file.request.CommonAttachReq; +import com.ruoyi.file.request.CommonUploadReq; import com.ruoyi.file.object.ProjectState; import com.ruoyi.file.object.StateMachine; import com.ruoyi.file.object.UploadException; -import com.ruoyi.file.object.UploadForwardReq; +import com.ruoyi.file.request.FinanceVoucherUploadReq; +import com.ruoyi.file.request.UploadForwardReq; import com.ruoyi.file.object.UploadLog; -import com.ruoyi.file.object.UploadRedirectReq; +import com.ruoyi.file.request.UploadRedirectReq; import com.ruoyi.file.object.UploadResp; import com.ruoyi.file.object.UploadResult; import com.ruoyi.file.object.UploadSession; @@ -34,7 +35,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.nio.charset.StandardCharsets; -import java.util.Enumeration; import java.util.LinkedHashMap; import java.util.Map; @@ -97,7 +97,7 @@ public class FileService public void commonUpload(MultipartFile file, CommonUploadReq req, HttpServletRequest request, HttpServletResponse response) { UploadRedirectReq redirectReq = new UploadRedirectReq(); - redirectReq.setRedirectUri("/common/upload"); + redirectReq.setRedirectUri("/file/common/upload"); redirectReq.ParseToken(request); UploadLog.Clear(); @@ -109,7 +109,7 @@ public class FileService public void commonAttach(MultipartFile file, CommonAttachReq req, HttpServletRequest request, HttpServletResponse response) { UploadRedirectReq redirectReq = new UploadRedirectReq(); - redirectReq.setRedirectUri("/common/attach"); + redirectReq.setRedirectUri("/file/common/attach"); Map map = BeanUtil.beanToMap(req, false, true); map.remove("token"); redirectReq.setFormData(map); @@ -121,6 +121,22 @@ public class FileService RedirectRemote(session, redirectReq, request, response); } + public void financeVoucherUpload(MultipartFile file, FinanceVoucherUploadReq req, HttpServletRequest request, HttpServletResponse response) + { + UploadRedirectReq redirectReq = new UploadRedirectReq(); + redirectReq.setRedirectUri("/file/finance/voucher/upload"); + Map map = BeanUtil.beanToMap(req, false, true); + map.remove("token"); + map.remove("bizPath"); + redirectReq.setFormData(map); + redirectReq.ParseToken(request); + + UploadLog.Clear(); + UploadSession session = Upload(file, req.getBizPath(), req.getToken()); + UploadLog.Output(); + RedirectRemote(session, redirectReq, request, response); + } + private String RequestRemote(UploadSession session, UploadForwardReq req, HttpServletRequest request, HttpServletResponse response) { String url = PathUtils.appendPaths(session.project.getRemoteHost(), req.getRequestUri()); diff --git a/ruoyi-file/src/main/java/com/ruoyi/file/service/FileSystemService.java b/ruoyi-file/src/main/java/com/ruoyi/file/service/FileSystemService.java index c36bdbc..0a8f2ac 100644 --- a/ruoyi-file/src/main/java/com/ruoyi/file/service/FileSystemService.java +++ b/ruoyi-file/src/main/java/com/ruoyi/file/service/FileSystemService.java @@ -2,8 +2,8 @@ package com.ruoyi.file.service; import com.ruoyi.common.exception.ASSERT; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.file.object.FileSystemFilter; -import com.ruoyi.file.object.FileModel; +import com.ruoyi.file.model.FileSystemFilter; +import com.ruoyi.file.model.FileModel; import org.springframework.stereotype.Service; import java.io.File;