From 6d821998c18677356d6673a31225e4ab2be8eae1 Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Fri, 31 Jul 2020 20:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8BeanUtils=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/toesbieya/jxc/common/model/entity/BizDoc.java | 12 ------------ .../jxc/common/model/entity/BizPurchaseInbound.java | 5 ----- .../jxc/common/model/entity/BizPurchaseOrder.java | 9 --------- .../jxc/common/model/entity/BizSellOrder.java | 9 --------- .../jxc/common/model/entity/BizSellOutbound.java | 5 ----- .../toesbieya/jxc/common/model/vo/DepartmentVo.java | 6 ++---- .../cn/toesbieya/jxc/common/model/vo/ResourceVo.java | 7 ++----- .../cn/toesbieya/jxc/common/model/vo/UserVo.java | 10 ++-------- .../jxc/document/model/vo/PurchaseInboundVo.java | 3 ++- .../jxc/document/model/vo/PurchaseOrderVo.java | 3 ++- .../toesbieya/jxc/document/model/vo/SellOrderVo.java | 3 ++- .../jxc/document/model/vo/SellOutboundVo.java | 3 ++- .../system/controller/SysDepartmentController.java | 3 ++- .../cn/toesbieya/jxc/system/model/vo/CustomerVo.java | 11 ++--------- .../cn/toesbieya/jxc/system/model/vo/SupplierVo.java | 11 ++--------- .../jxc/system/service/SysCategoryService.java | 2 +- .../java/cn/toesbieya/jxc/model/vo/DepartmentVo.java | 6 ++---- .../main/java/cn/toesbieya/jxc/model/vo/UserVo.java | 10 ++-------- .../cn/toesbieya/jxc/service/SysCategoryService.java | 6 ++++-- 19 files changed, 29 insertions(+), 95 deletions(-) diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizDoc.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizDoc.java index 80c50aa..8801101 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizDoc.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizDoc.java @@ -18,16 +18,4 @@ public class BizDoc implements Serializable { private Long vtime; private Integer status; private String remark; - - public BizDoc(BizDoc doc) { - this.id = doc.getId(); - this.cid = doc.getCid(); - this.cname = doc.getCname(); - this.ctime = doc.getCtime(); - this.vid = doc.getVid(); - this.vname = doc.getVname(); - this.vtime = doc.getVtime(); - this.status = doc.getStatus(); - this.remark = doc.getRemark(); - } } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseInbound.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseInbound.java index 2b73d06..8968c89 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseInbound.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseInbound.java @@ -11,9 +11,4 @@ import lombok.ToString; @NoArgsConstructor public class BizPurchaseInbound extends BizDoc { private String pid; - - public BizPurchaseInbound(BizPurchaseInbound obj) { - super(obj); - this.pid = obj.getPid(); - } } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseOrder.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseOrder.java index 5bb6e81..0a3dd79 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseOrder.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizPurchaseOrder.java @@ -17,13 +17,4 @@ public class BizPurchaseOrder extends BizDoc { private Integer finish; private Long ftime; private BigDecimal total; - - public BizPurchaseOrder(BizPurchaseOrder obj) { - super(obj); - this.sid = obj.getSid(); - this.sname = obj.getSname(); - this.finish = obj.getFinish(); - this.ftime = obj.getFtime(); - this.total = obj.getTotal(); - } } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOrder.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOrder.java index ffe06f6..ececda4 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOrder.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOrder.java @@ -17,13 +17,4 @@ public class BizSellOrder extends BizDoc { private Integer finish; private Long ftime; private BigDecimal total; - - public BizSellOrder(BizSellOrder obj) { - super(obj); - this.customerId = obj.getCustomerId(); - this.customerName = obj.getCustomerName(); - this.finish = obj.getFinish(); - this.ftime = obj.getFtime(); - this.total = obj.getTotal(); - } } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOutbound.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOutbound.java index 1a009af..73efa46 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOutbound.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/BizSellOutbound.java @@ -11,9 +11,4 @@ import lombok.ToString; @NoArgsConstructor public class BizSellOutbound extends BizDoc { private String pid; - - public BizSellOutbound(BizSellOutbound obj) { - super(obj); - this.pid = obj.getPid(); - } } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/DepartmentVo.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/DepartmentVo.java index fdea55a..3735caa 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/DepartmentVo.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/DepartmentVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; @Data @NoArgsConstructor @@ -14,9 +15,6 @@ public class DepartmentVo extends SysDepartment { String fullname; public DepartmentVo(SysDepartment parent) { - this.setId(parent.getId()); - this.setPid(parent.getPid()); - this.setName(parent.getName()); - this.setStatus(parent.getStatus()); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/ResourceVo.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/ResourceVo.java index d305b31..283bed6 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/ResourceVo.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/ResourceVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; @Data @NoArgsConstructor @@ -14,10 +15,6 @@ public class ResourceVo extends SysResource { private String fullname; public ResourceVo(SysResource parent) { - this.setId(parent.getId()); - this.setPid(parent.getPid()); - this.setName(parent.getName()); - this.setUrl(parent.getUrl()); - this.setAdmin(parent.isAdmin()); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/UserVo.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/UserVo.java index 71f3425..280ad00 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/UserVo.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/UserVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; import java.util.Set; @@ -21,13 +22,6 @@ public class UserVo extends SysUser { private Set resourceIds; public UserVo(SysUser parent) { - this.setId(parent.getId()); - this.setName(parent.getName()); - this.setPwd(parent.getPwd()); - this.setRole(parent.getRole()); - this.setAvatar(parent.getAvatar()); - this.setCtime(parent.getCtime()); - this.setAdmin(parent.isAdmin()); - this.setStatus(parent.getStatus()); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseInboundVo.java b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseInboundVo.java index f40ff0e..2c98265 100644 --- a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseInboundVo.java +++ b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseInboundVo.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; import java.util.List; @@ -21,6 +22,6 @@ public class PurchaseInboundVo extends BizPurchaseInbound { private List deleteImageList; public PurchaseInboundVo(BizPurchaseInbound parent) { - super(parent); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseOrderVo.java b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseOrderVo.java index e50f81f..218660e 100644 --- a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseOrderVo.java +++ b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/PurchaseOrderVo.java @@ -4,6 +4,7 @@ import cn.toesbieya.jxc.common.model.entity.BizPurchaseOrder; import cn.toesbieya.jxc.common.model.entity.BizPurchaseOrderSub; import cn.toesbieya.jxc.common.model.entity.RecAttachment; import lombok.*; +import org.springframework.beans.BeanUtils; import java.util.List; @@ -18,6 +19,6 @@ public class PurchaseOrderVo extends BizPurchaseOrder { private List deleteImageList; public PurchaseOrderVo(BizPurchaseOrder parent) { - super(parent); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOrderVo.java b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOrderVo.java index cfd634a..1e3b804 100644 --- a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOrderVo.java +++ b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOrderVo.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; import java.util.List; @@ -21,6 +22,6 @@ public class SellOrderVo extends BizSellOrder { private List deleteImageList; public SellOrderVo(BizSellOrder parent) { - super(parent); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOutboundVo.java b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOutboundVo.java index 021d452..ad01515 100644 --- a/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOutboundVo.java +++ b/java/cloud/web/web-modules/document/src/main/java/cn/toesbieya/jxc/document/model/vo/SellOutboundVo.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; import java.util.List; @@ -21,6 +22,6 @@ public class SellOutboundVo extends BizSellOutbound { private List deleteImageList; public SellOutboundVo(BizSellOutbound parent) { - super(parent); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SysDepartmentController.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SysDepartmentController.java index 17c8977..d887bce 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SysDepartmentController.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/SysDepartmentController.java @@ -2,6 +2,7 @@ package cn.toesbieya.jxc.system.controller; import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum; import cn.toesbieya.jxc.common.model.entity.SysDepartment; +import cn.toesbieya.jxc.common.model.vo.DepartmentVo; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.system.service.SysDepartmentService; import org.springframework.util.StringUtils; @@ -19,7 +20,7 @@ public class SysDepartmentController { @GetMapping("get") public Result get(boolean all) { - List list = departmentService.getAll(); + List list = departmentService.getAll(); if (!all) { list = list .stream() diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/CustomerVo.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/CustomerVo.java index faa59a2..15aa219 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/CustomerVo.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/CustomerVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; @Data @NoArgsConstructor @@ -14,14 +15,6 @@ public class CustomerVo extends SysCustomer { private String regionName; public CustomerVo(SysCustomer parent) { - this.setId(parent.getId()); - this.setName(parent.getName()); - this.setAddress(parent.getAddress()); - this.setLinkman(parent.getLinkman()); - this.setLinkphone(parent.getLinkphone()); - this.setRegion(parent.getRegion()); - this.setStatus(parent.getStatus()); - this.setCtime(parent.getCtime()); - this.setRemark(parent.getRemark()); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/SupplierVo.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/SupplierVo.java index f72584a..7c31027 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/SupplierVo.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/model/vo/SupplierVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; @Data @NoArgsConstructor @@ -14,14 +15,6 @@ public class SupplierVo extends SysSupplier { private String regionName; public SupplierVo(SysSupplier parent) { - this.setId(parent.getId()); - this.setName(parent.getName()); - this.setAddress(parent.getAddress()); - this.setLinkman(parent.getLinkman()); - this.setLinkphone(parent.getLinkphone()); - this.setRegion(parent.getRegion()); - this.setStatus(parent.getStatus()); - this.setCtime(parent.getCtime()); - this.setRemark(parent.getRemark()); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SysCategoryService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SysCategoryService.java index 44194db..51870e5 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SysCategoryService.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SysCategoryService.java @@ -109,7 +109,7 @@ public class SysCategoryService { .ne(id != null, SysCategory::getId, id) ); if (exist != null && exist > 0) { - return "分类【" + category.getName() + "】已存在"; + return String.format("分类【%s】已存在", category.getName()); } Integer cid = category.getId(); diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/DepartmentVo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/DepartmentVo.java index b595006..ce3ce64 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/DepartmentVo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/DepartmentVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; @Data @NoArgsConstructor @@ -14,9 +15,6 @@ public class DepartmentVo extends SysDepartment { String fullname; public DepartmentVo(SysDepartment parent) { - this.setId(parent.getId()); - this.setPid(parent.getPid()); - this.setName(parent.getName()); - this.setStatus(parent.getStatus()); + BeanUtils.copyProperties(parent, this); } } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/UserVo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/UserVo.java index 7139722..ad08d09 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/UserVo.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/UserVo.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.ToString; +import org.springframework.beans.BeanUtils; import java.util.Set; @@ -21,13 +22,6 @@ public class UserVo extends SysUser { private Set resourceIds; public UserVo(SysUser parent) { - this.setId(parent.getId()); - this.setName(parent.getName()); - this.setPwd(parent.getPwd()); - this.setRole(parent.getRole()); - this.setAvatar(parent.getAvatar()); - this.setCtime(parent.getCtime()); - this.setAdmin(parent.isAdmin()); - this.setStatus(parent.getStatus()); + BeanUtils.copyProperties(parent,this); } } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/SysCategoryService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/SysCategoryService.java index 8b52950..84de565 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/SysCategoryService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/SysCategoryService.java @@ -61,10 +61,12 @@ public class SysCategoryService { private String check(SysCategory category) { if (category.getPid() != 0) { SysCategory parent = categoryMapper.getById(category.getPid()); - if (parent == null || parent.getType() == 1) return "父节点状态变更，请刷新后重试"; + if (parent == null || parent.getType() == 1) { + return "父节点状态变更，请刷新后重试"; + } } if (categoryMapper.isNameExist(category.getName(), category.getId())) { - return "分类【" + category.getName() + "】已存在"; + return String.format("分类【%s】已存在",category.getName()); } if (category.getId() != null && category.getType() == 1) {