From 1e5d6051f13b812060f995bf71acd39f3e036628 Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Fri, 31 Mar 2023 16:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A4=87=E4=BB=B6=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=20=E6=9C=80=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modules/pms/data/GetParamInData.java | 63 +++++++++++++++++++ .../sys/controller/SysFileController.java | 5 +- .../modules/sys/service/SysFileService.java | 3 +- .../sys/service/impl/SysFileServiceImpl.java | 9 ++- 4 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/xujie/sys/modules/pms/data/GetParamInData.java diff --git a/src/main/java/com/xujie/sys/modules/pms/data/GetParamInData.java b/src/main/java/com/xujie/sys/modules/pms/data/GetParamInData.java new file mode 100644 index 00000000..9c6011de --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/data/GetParamInData.java @@ -0,0 +1,63 @@ +package com.xujie.sys.modules.pms.data; + +import java.text.ParseException; +import java.util.Date; + +/** + * @author LR + * @version V1.0 + * @ClassName: GetParamInData + * @Description: get的请求参数入参 + * @date 2020年5月22日 + */ +public class GetParamInData { + private String site; + private String orderNo;// 工单号 + private String objectID;// 设备编码 + private String remark;// 备注 + private String folder;// 文件名称 + + public GetParamInData() { + // TODO Auto-generated constructor stub + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getObjectID() { + return objectID; + } + + public void setObjectID(String objectID) { + this.objectID = objectID; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getFolder() { + return folder; + } + + public void setFolder(String folder) { + this.folder = folder; + } +} \ No newline at end of file diff --git a/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java b/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java index 1f12cb8c..1d2d9bb0 100644 --- a/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java +++ b/src/main/java/com/xujie/sys/modules/sys/controller/SysFileController.java @@ -15,6 +15,7 @@ import com.xujie.sys.common.validator.group.UpdateGroup; import com.xujie.sys.modules.ftp.util.FTPUtils; import com.xujie.sys.modules.oss.entity.SysOssEntity; import com.xujie.sys.modules.oss.service.SysOssService; +import com.xujie.sys.modules.pms.data.GetParamInData; import com.xujie.sys.modules.sys.entity.SysUserEntity; import com.xujie.sys.modules.sys.form.PasswordForm; import com.xujie.sys.modules.sys.form.SysLoginForm; @@ -53,8 +54,8 @@ public class SysFileController extends AbstractController { * @version 1.0 */ @PostMapping("/upload") - public R upload(@RequestParam("file") MultipartFile file, String folder, String objectId){ - SysOssEntity ossEntity = sysFileService.upload(file, folder, objectId); + public R upload(@RequestParam("file") MultipartFile file, @ModelAttribute GetParamInData inData){ + SysOssEntity ossEntity = sysFileService.upload(file, inData); return R.ok().put("ossEntity", ossEntity); } diff --git a/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java b/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java index 6f16c0bc..4ec55ebc 100644 --- a/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java +++ b/src/main/java/com/xujie/sys/modules/sys/service/SysFileService.java @@ -1,6 +1,7 @@ package com.xujie.sys.modules.sys.service; import com.xujie.sys.modules.oss.entity.SysOssEntity; +import com.xujie.sys.modules.pms.data.GetParamInData; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -19,7 +20,7 @@ public interface SysFileService { * @date 2023/3/1 15:57 * @version 1.0 */ - SysOssEntity upload(MultipartFile file, String folder, String objectId); + SysOssEntity upload(MultipartFile file, GetParamInData inData); /** * @description: 按照orderRef1查询文件文件参数 diff --git a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java index 46f27335..1e60c233 100644 --- a/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java @@ -8,6 +8,7 @@ import com.xujie.sys.modules.ftp.util.FTPUtils; import com.xujie.sys.modules.oss.dao.SysOssDao; import com.xujie.sys.modules.oss.entity.SysOssEntity; import com.xujie.sys.modules.oss.service.SysOssService; +import com.xujie.sys.modules.pms.data.GetParamInData; import com.xujie.sys.modules.sys.entity.SysUserEntity; import com.xujie.sys.modules.sys.service.SysFileService; import org.apache.shiro.SecurityUtils; @@ -42,7 +43,7 @@ public class SysFileServiceImpl implements SysFileService { private String filePath; @Override - public SysOssEntity upload(MultipartFile file, String folder, String objectId) { + public SysOssEntity upload(MultipartFile file, GetParamInData inData) { if (file.isEmpty()) { throw new XJException("上传文件不能为空"); } @@ -62,7 +63,7 @@ public class SysFileServiceImpl implements SysFileService { String newFileName = RandomUtil.getOrderNoByAtomic1("file")+suffix; String basePath = filePath; String baseDatePath = DateUtils.format(new Date()); - File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + folder); + File baseFilePath = new File(basePath + "\\" + baseDatePath + "\\" + inData.getFolder()); if (!baseFilePath.exists()) { baseFilePath.mkdirs(); } @@ -79,7 +80,9 @@ public class SysFileServiceImpl implements SysFileService { ossEntity.setFileName(fileName+suffix); ossEntity.setNewFileName(newFileName); ossEntity.setCreateDate(new Date()); - ossEntity.setOrderRef2(objectId); + ossEntity.setOrderRef1(inData.getSite()); + ossEntity.setOrderRef2(inData.getObjectID()); + ossEntity.setOrderRef3(inData.getRemark()); sysOssService.save(ossEntity); return ossEntity; }