From 84b1b466fd70500eb1ffb92ba58628012727799d Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Fri, 3 Sep 2021 11:21:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/base/BaseOrderInvalidVerify.java | 24 ++++ .../cowr/ssjygl/file/OssFileControler.java | 122 ++++++++++++++++++ .../com/cowr/local/ssjygl/main/Config.java | 2 + .../OrderInvalidVerifyController.java | 3 +- .../OrderInvalidVerifySyncService.java | 3 +- .../com/cowr/service/ssjygl/main/Config.java | 2 + 6 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/file/OssFileControler.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java index 3692f49..be1a82c 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseOrderInvalidVerify.java @@ -290,6 +290,30 @@ public abstract class BaseOrderInvalidVerify return getStr("invalid_memo"); } + + /** + * name: attachment + * type: text + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param attachment 附件路径等信息 + */ + @JSONField(name="attachment") + public void setAttachment(String attachment) { + set("attachment", attachment); + } + + + /** + * @return attachment 附件路径等信息 + */ + @JSONField(name="attachment") + public String getAttachment() { + return getStr("attachment"); + } + + /** * name: memo * type: VARCHAR(255) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/file/OssFileControler.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/file/OssFileControler.java new file mode 100644 index 0000000..708576f --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/file/OssFileControler.java @@ -0,0 +1,122 @@ +package com.cowr.ssjygl.file; + +import com.cowr.common.oss.OSSKit; +import com.cowr.common.utils.DateTimeUtil; +import com.cowr.common.view.Result; +import com.jfinal.core.Controller; +import com.jfinal.kit.StrKit; +import com.jfinal.log.Log; +import com.jfinal.plugin.activerecord.Record; +import com.jfinal.upload.UploadFile; + +import java.io.File; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class OssFileControler extends Controller { + private static Log log = Log.getLog(OssFileControler.class); + + public void upload() { + List fileList = this.getFiles(); + if (fileList == null || fileList.size() == 0) { + renderJson(Result.failed("文件不能为空")); + return; + } + + List ret = new ArrayList<>(); + + for (UploadFile upload : fileList) { + File file = null; + String fileName = ""; + try { + String key = StrKit.getRandomUUID(); + file = upload.getFile(); + fileName = file.getName(); + String suffix = fileName.substring(fileName.lastIndexOf("."), fileName.length()).toLowerCase(); + OSSKit.putObject(key + suffix, file); + + Record r = new Record(); + r.set("fileName", fileName); + r.set("ossKey", key + suffix); + r.set("tm", DateTimeUtil.sdfhms.get().format(new Date(file.lastModified()))); + ret.add(r); + } catch (Exception e) { + log.error(e.getMessage(), e); + renderJson(Result.failed(fileName + "上传失败")); + return; + } finally { + if (file != null) { + file.delete(); + } + } + } + + renderJson(Result.object(ret)); + } + + public void del() { + String ossKey = get("ossKey"); + if (StrKit.isBlank(ossKey)) { + renderJson(Result.failed("ossKey不能为空")); + return; + } + + boolean flag; + try { + flag = OSSKit.delObject(ossKey); + } catch (Exception e) { + log.error(e.getMessage(), e); + renderJson(Result.failed("删除失败！")); + return; + } + + renderJson(Result.object(flag)); + } + + public void uploadCancelOrder() { + List fileList = this.getFiles(); + String order_sn = get("order_sn"); + + if (StrKit.isBlank(order_sn)) { + renderJson(Result.failed("订单号不能为空")); + return; + } + + if (fileList == null || fileList.size() == 0) { + renderJson(Result.failed("文件不能为空")); + return; + } + + List ret = new ArrayList<>(); + + for (UploadFile upload : fileList) { + File file = null; + String fileName = ""; + try { + file = upload.getFile(); + fileName = file.getName(); + String uuid = StrKit.getRandomUUID(); + String suffix = fileName.substring(fileName.lastIndexOf("."), fileName.length()).toLowerCase(); + String key = "attachment/" + order_sn + "/" + uuid + suffix; + OSSKit.putObject(key, file); + + Record r = new Record(); + r.set("fileName", fileName); + r.set("ossKey", key); + r.set("tm", DateTimeUtil.sdfhms.get().format(new Date(file.lastModified()))); + ret.add(r); + } catch (Exception e) { + log.error(e.getMessage(), e); + renderJson(Result.failed(fileName + "上传失败")); + return; + } finally { + if (file != null) { + file.delete(); + } + } + } + + renderJson(Result.object(ret)); + } +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index f072d45..8f00b52 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -64,6 +64,7 @@ import com.cowr.model._MappingKit; import com.cowr.ssjygl.CacheData; import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; import com.cowr.ssjygl.cctv.CctvController; +import com.cowr.ssjygl.file.OssFileControler; import com.cowr.ssjygl.modifylog.ModifyLogController; import com.cowr.ssjygl.stat.invoice.InvoiceUseController; import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; @@ -177,6 +178,7 @@ public class Config extends JFinalConfig { me.add("/camera", CameraController.class); me.add("/supcctv", CctvController.class); me.add("/overall", OverallController.class); + me.add("/ossFile", OssFileControler.class); // -- 权限系统 me.add("/sysuser", SysuserController.class); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java index af6e93a..84beac3 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifyController.java @@ -32,8 +32,9 @@ public class OrderInvalidVerifyController extends Controller { String order_sn = get("order_sn"); String invalid_memo = get("invalid_memo"); + String attachment = get("attachment"); - renderJson(OrderInvalidVerifySyncService.me.save(order_sn, invalid_memo, tokenuser)); + renderJson(OrderInvalidVerifySyncService.me.save(order_sn, attachment, invalid_memo, tokenuser)); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java index db96cef..5683785 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/invalidverify/OrderInvalidVerifySyncService.java @@ -20,7 +20,7 @@ public class OrderInvalidVerifySyncService { private static Log log = Log.getLog(OrderInvalidVerifySyncService.class); public static OrderInvalidVerifySyncService me = new OrderInvalidVerifySyncService(); - public Result save(String order_sn, String invalid_memo, Sysuser sysuser) { + public Result save(String order_sn, String attachment, String invalid_memo, Sysuser sysuser) { OrderTemp order = OrderTemp.dao.findById(order_sn); if (order == null) { @@ -48,6 +48,7 @@ public class OrderInvalidVerifySyncService { model.setCreateUserName(sysuser.getName()); model.setOrderSn(order.getSn()); model.setType(OrderTypeEnum.TEMP.getTypeid()); + model.setAttachment(attachment); model.setInvalidMemo(invalid_memo); SyncTask synctask = new SyncTask(); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java index 0b4cea2..83fb087 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java @@ -61,6 +61,7 @@ import com.cowr.ssjygl.CacheData; import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; import com.cowr.ssjygl.cctv.CctvController; import com.cowr.ssjygl.customer.type.CustomerTypeController; +import com.cowr.ssjygl.file.OssFileControler; import com.cowr.ssjygl.modifylog.ModifyLogController; import com.cowr.ssjygl.stat.invoice.InvoiceUseController; import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; @@ -155,6 +156,7 @@ public class Config extends JFinalConfig { me.add("/cache", CacheController.class); me.add("/supcctv", CctvController.class); me.add("/overall", OverallController.class); + me.add("/ossFile", OssFileControler.class); // -- 权限系统 me.add("/sysuser", SysuserController.class);