diff --git a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java index af4be2a2..e9a369df 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; @@ -80,7 +81,7 @@ public class AuthAdminController { // // 视图列表 // List authAdminResponseList = authAdminList.stream().map(item -> { // AuthAdminResponse authAdminResponse = new AuthAdminResponse(); -// BeanUtils.copyProperties(item, authAdminResponse); +// BeanUtil.copyProperties(item, authAdminResponse); // List roles = authRoleAdminList.stream() // .filter(authRoleAdmin -> authAdminResponse.getId().equals(authRoleAdmin.getAdmin_id())) // .map(AuthRoleAdmin::getRole_id) @@ -112,7 +113,7 @@ public class AuthAdminController { // pageSimpleResponse.setTotal(pageInfo.getTotal()); // List authAdminRoleResponses = authRoleList.stream().map(e -> { // AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); -// BeanUtils.copyProperties(e, authAdminRoleResponse); +// BeanUtil.copyProperties(e, authAdminRoleResponse); // return authAdminRoleResponse; // }).collect(Collectors.toList()); // pageSimpleResponse.setList(authAdminRoleResponses); @@ -139,7 +140,7 @@ public class AuthAdminController { // pageSimpleResponse.setTotal(pageInfo.getTotal()); // List authAdminRoleResponses = authRoleList.stream().map(e -> { // AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); -// BeanUtils.copyProperties(e, authAdminRoleResponse); +// BeanUtil.copyProperties(e, authAdminRoleResponse); // return authAdminRoleResponse; // }).collect(Collectors.toList()); // pageSimpleResponse.setList(authAdminRoleResponses); @@ -160,7 +161,7 @@ public class AuthAdminController { pageSimpleResponse.setTotal(pageInfo.getTotal()); List authAdminRoleResponses = authRoleList.stream().map(e -> { AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); - BeanUtils.copyProperties(e, authAdminRoleResponse); + BeanUtil.copyProperties(e, authAdminRoleResponse); return authAdminRoleResponse; }).collect(Collectors.toList()); pageSimpleResponse.setList(authAdminRoleResponses); @@ -181,7 +182,7 @@ public class AuthAdminController { pageSimpleResponse.setTotal(pageInfo.getTotal()); List authAdminRoleResponses = authRoleList.stream().map(e -> { AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); - BeanUtils.copyProperties(e, authAdminRoleResponse); + BeanUtil.copyProperties(e, authAdminRoleResponse); return authAdminRoleResponse; }).collect(Collectors.toList()); pageSimpleResponse.setList(authAdminRoleResponses); @@ -221,7 +222,7 @@ public class AuthAdminController { // } // // AuthAdmin authAdmin = new AuthAdmin(); -// BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); +// BeanUtil.copyProperties(authAdminSaveRequest, authAdmin); // // if (authAdmin.getPassWord() != null) { // authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); @@ -278,7 +279,7 @@ public class AuthAdminController { // } // // AuthAdmin authAdmin = new AuthAdmin(); -// BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); +// BeanUtil.copyProperties(authAdminSaveRequest, authAdmin); // if (authAdmin.getPassWord() != null) { // authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); // } @@ -317,7 +318,7 @@ public class AuthAdminController { // authAdminSaveRequest.setLocInvCode(invSubWarehouseEntity.getParentId()); // } // AuthAdmin authAdmin = new AuthAdmin(); -// BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); +// BeanUtil.copyProperties(authAdminSaveRequest, authAdmin); // authAdmin.setLastModifyTime(new Date()); // boolean b = authAdminService.updateAuthAdmin(authAdmin); // if (!b) { diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 4f5fc287..eaf5d7a1 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -45,7 +46,7 @@ public class AuthUserController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } AuthAdmin authAdmin = new AuthAdmin(); - BeanUtils.copyProperties(authUserSaveRequest, authAdmin); + BeanUtil.copyProperties(authUserSaveRequest, authAdmin); authAdmin.setId(getUserId()); authAdmin.setLastModifyTime(new Date()); boolean b = authAdminService.updateAuthAdmin(authAdmin); diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index f88b1c13..77f65455 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -218,7 +219,7 @@ public class LoginController extends BaseController { Long id = Long.valueOf(adminId); AuthAdmin authAdmin = authAdminService.findById(id); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); - BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); + BeanUtil.copyProperties(authAdmin, loginUserInfoResponse); DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode()); loginUserInfoResponse.setLocDeptName(deptEntity.getName()); @@ -236,7 +237,7 @@ public class LoginController extends BaseController { Long id = Long.valueOf(adminId); AuthAdmin authAdmin = authAdminService.findById(id); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); - BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); + BeanUtil.copyProperties(authAdmin, loginUserInfoResponse); CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId()); if ("110".equals(authAdmin.getCustomerId())) { loginUserInfoResponse.setCompanyName(authAdmin.getEmployeeName()); diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 1c0073e6..76736556 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -2,6 +2,7 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -72,7 +73,7 @@ public class SysUserController extends BaseController { //查询对应角色和部门 List authAdminResponseList = authAdminList.stream().map(item -> { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); - BeanUtils.copyProperties(item, authAdminResponse); + BeanUtil.copyProperties(item, authAdminResponse); List roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId()); List deptUserResponses = null; if ("key".equals(filterAuthUserRequest.getKey())) { @@ -184,7 +185,7 @@ public class SysUserController extends BaseController { return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在"); } AuthAdmin authAdmin = new AuthAdmin(); - BeanUtils.copyProperties(authUserSaveRequest, authAdmin); + BeanUtil.copyProperties(authUserSaveRequest, authAdmin); if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } @@ -281,7 +282,7 @@ public class SysUserController extends BaseController { } AuthAdmin authAdmin = new AuthAdmin(); - BeanUtils.copyProperties(authUserSaveRequest, authAdmin); + BeanUtil.copyProperties(authUserSaveRequest, authAdmin); if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index d6f3ed16..14109a28 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -350,7 +350,7 @@ public class BasicBussinessTypeController extends BaseController { List bussinessTypeEntities = basicBussinessTypeService.findList(bussinessTypeFilterRequest); for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { BussinessTypExportResponse bussinessTypExportResponse = new BussinessTypExportResponse(); - BeanUtils.copyProperties(bussinessTypeEntity, bussinessTypExportResponse); + BeanUtil.copyProperties(bussinessTypeEntity, bussinessTypExportResponse); bussinessTypExportResponses.add(bussinessTypExportResponse); } String json = JSONObject.toJSON(bussinessTypExportResponses).toString(); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 983915f8..f24ca531 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -123,7 +124,7 @@ public class BasicCorpController { } BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); - BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); + BeanUtil.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); basicUnitMaintainEntity.setErpId(CustomUtil.getId()); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); basicUnitMaintainEntity.setUpdateTime(new Date()); @@ -168,7 +169,7 @@ public class BasicCorpController { List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> { BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); - BeanUtils.copyProperties(item, basicUnitMaintainResponse); + BeanUtil.copyProperties(item, basicUnitMaintainResponse); basicUnitMaintainResponse.setUnitId(item.getErpId()); return basicUnitMaintainResponse; }).collect(Collectors.toList()); @@ -195,7 +196,7 @@ public class BasicCorpController { List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> { BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); - BeanUtils.copyProperties(item, basicUnitMaintainResponse); + BeanUtil.copyProperties(item, basicUnitMaintainResponse); basicUnitMaintainResponse.setUnitId(item.getErpId()); return basicUnitMaintainResponse; }).collect(Collectors.toList()); @@ -392,14 +393,14 @@ public class BasicCorpController { // // } else { // FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); -// BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); +// BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); // filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); // List thrCorpEntities // = thrCorpService.filterThrCorps(filterThrCorpRequest); // List thrCorpEntityList = thrCorpEntities.stream().map(item -> // { // ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); -// BeanUtils.copyProperties(item, thrCorpEntity); +// BeanUtil.copyProperties(item, thrCorpEntity); // BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys()); // if (basicUnitMaintainEntity != null) { // thrCorpEntity.setChecked(true); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java index 559545cf..fb79d466 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -188,7 +189,7 @@ public class BasicProductsExportLogController { List udiRlDlResponses = udiRelevanceResponses.stream().map(item -> { UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse(); - BeanUtils.copyProperties(item, udiRlDlResponse); + BeanUtil.copyProperties(item, udiRlDlResponse); return udiRlDlResponse; }).collect(Collectors.toList()); PageInfo pageInfo; @@ -227,7 +228,7 @@ public class BasicProductsExportLogController { List udiRlDlResponses = udiRelevanceResponses.stream().map(item -> { UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse(); - BeanUtils.copyProperties(item, udiRlDlResponse); + BeanUtil.copyProperties(item, udiRlDlResponse); return udiRlDlResponse; }).collect(Collectors.toList()); PageInfo pageInfo; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index ffcb9a99..7e9b749e 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -306,7 +307,7 @@ public class UdiContrastController { ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), thrSystemEntity.getThirdId()); UdiProductEntity UdiInfoRequest = new UdiProductEntity(); - BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest); + BeanUtil.copyProperties(thrProductsEntity, UdiInfoRequest); UdiInfoRequest.setNameCode(thrProductsEntity.getCode()); UdiInfoRequest.setCpmctymc(thrProductsEntity.getName()); UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory()); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 500ef983..2298eccc 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -232,8 +233,8 @@ public class UdiRelevanceController extends BaseController { if (CollUtil.isNotEmpty(udiInfoEntities)) { for (UdiProductEntity udiProductEntity : udiInfoEntities) { UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); - BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse); - BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse); + BeanUtil.copyProperties(udiProductEntity, udiRelevanceResponse); + BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse); udiRelevanceResponses.add(udiRelevanceResponse); } } @@ -312,7 +313,7 @@ public class UdiRelevanceController extends BaseController { //更新关联表 UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); - BeanUtils.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity); + BeanUtil.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity); udiRelevanceEntity.setId(udiRelevanceSaveRequest.getId()); udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceEntity.setModifyTime(new Date()); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 79096d18..8718cae0 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -244,7 +245,7 @@ public class UdiRlSupController extends BaseController { udiRelevanceEntity.setLockStatus(1); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity); + BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity); udiProductEntity.setId(IdUtil.getSnowflakeNextId()); udiProductService.insertUdiInfo(udiProductEntity); return ResultVOUtils.success("选入成功！"); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index 6bca61bb..c1ba51f5 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -58,7 +59,7 @@ public class UdiSyncController { nameCode = filterUdiRelRequest.getNameCode(); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); - BeanUtils.copyProperties(filterUdiRelRequest, productInfoFilterRequest); + BeanUtil.copyProperties(filterUdiRelRequest, productInfoFilterRequest); if (StrUtil.isNotEmpty(nameCode)) { productInfoFilterRequest.setNameCode(nameCode); } else { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index b2e2a499..67392b1c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -370,7 +370,7 @@ public class IoOrderController extends BaseController { orderDetailBizService.deleteByOrderId(addOrderRequest.getBillNo()); for (IoOrderDetailCodeEntity orderDetailCodeEntity : orderDetailCodeEntities) { IoOrderDetailBizEntity orderDetailBizEntity = new IoOrderDetailBizEntity(); - BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); + BeanUtil.copyProperties(orderDetailCodeEntity, orderDetailBizEntity); orderDetailBizEntity.setId(null); getSomeBiz(orderDetailBizEntities, orderDetailBizEntity); orderDetailBizService.insert(orderDetailBizEntity); @@ -524,7 +524,7 @@ public class IoOrderController extends BaseController { if (CollUtil.isNotEmpty(orderResponses)) { for (IoOrderResponse orderResponse : orderResponses) { PdaBusOrderResponse pdaBusOrderResponse = new PdaBusOrderResponse(); - BeanUtils.copyProperties(orderResponse, pdaBusOrderResponse); + BeanUtil.copyProperties(orderResponse, pdaBusOrderResponse); FilterOrderDetailBizRequest filterOrderDetailBizRequest = new FilterOrderDetailBizRequest(); filterOrderDetailBizRequest.setOrderIdFk(orderResponse.getBillNo()); List orderDetailBizEntities = orderDetailBizService.filterList(filterOrderDetailBizRequest); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 77c7b486..8ab2644b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -156,7 +157,7 @@ public class PurApplyController { Long userId = customerService.getUserId(); PurApplyEntity purApplyEntity = new PurApplyEntity(); - BeanUtils.copyProperties(purApplyRequest, purApplyEntity); + BeanUtil.copyProperties(purApplyRequest, purApplyEntity); purApplyEntity.setUpdateTime(new Date()); purApplyEntity.setAuditTime(new Date()); purApplyEntity.setAuditUser(userId + ""); @@ -190,7 +191,7 @@ public class PurApplyController { if (CollUtil.isNotEmpty(purApplyDetailEntities)) { for (PurApplyDetailEntity purApplyDetailEntity : purApplyDetailEntities) { PurPlanDetailEntity purPlanDetailEntity = new PurPlanDetailEntity(); - BeanUtils.copyProperties(purApplyDetailEntity, purPlanDetailEntity); + BeanUtil.copyProperties(purApplyDetailEntity, purPlanDetailEntity); purPlanDetailEntity.setOrderIdFk(purPlanEntity.getId() + ""); purPlanDetailService.insert(purPlanDetailEntity); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java index 77e63653..f3034563 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -463,7 +464,7 @@ public class PurDeliveryController extends BaseController { List purDeliveryDetailEntities = purOrderDetailEntities.stream() .map(e -> { PurDeliveryDetailEntity d = new PurDeliveryDetailEntity(); - BeanUtils.copyProperties(e, d); + BeanUtil.copyProperties(e, d); return d; }) .collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index f165e2e2..6f2e5f83 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -335,7 +336,7 @@ public class PurOrderController { List purOrderDetailEntityList = purApplyDetailEntityList.stream() .map(e -> { PurOrderDetailEntity d = new PurOrderDetailEntity(); - BeanUtils.copyProperties(e, d); + BeanUtil.copyProperties(e, d); return d; }) .collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index fba32b1c..03771ef7 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -288,7 +289,7 @@ public class PurPlanController { List purPlanDetailEntityList = purApplyDetailEntityList.stream() .map(e-> { PurPlanDetailEntity d = new PurPlanDetailEntity(); - BeanUtils.copyProperties(e, d); + BeanUtil.copyProperties(e, d); return d; }) .collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 1de6dcae..c13d5522 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -305,7 +306,7 @@ public class SupCertController { @Log(title = "资质证书", businessType = BusinessType.UPDATE) public BaseResponse updateCompanyCert(@RequestBody PostSupCertRequest postSupCertRequest) { SupCertEntity supCertEntity = new SupCertEntity(); - BeanUtils.copyProperties(postSupCertRequest, supCertEntity); + BeanUtil.copyProperties(postSupCertRequest, supCertEntity); if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) { diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 7ed9805c..7796194e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -162,7 +163,7 @@ public class SupProductController { return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); } else { supProductEntity = new SupProductEntity(); - BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + BeanUtil.copyProperties(udiRelevanceResponse, supProductEntity); supProductEntity.setProductId(selectProductBindRequest.getProductId()); supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); diff --git a/src/main/java/com/glxp/api/controller/sup/CustomerController.java b/src/main/java/com/glxp/api/controller/sup/CustomerController.java index 393b260d..eff95b6f 100644 --- a/src/main/java/com/glxp/api/controller/sup/CustomerController.java +++ b/src/main/java/com/glxp/api/controller/sup/CustomerController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.sup; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -103,7 +104,7 @@ public class CustomerController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity(); - BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity); + BeanUtil.copyProperties(customerDetailEntity, customerInfoEntity); customerInfoEntity.setCustomerId((Long.valueOf(customerDetailEntity.getCustomerId()))); boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity); //同时修改用户关联的角色 @@ -155,11 +156,11 @@ public class CustomerController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity(); - BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity); + BeanUtil.copyProperties(customerDetailEntity, customerInfoEntity); boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity); CustomerContactEntity customerContactEntity = new CustomerContactEntity(); - BeanUtils.copyProperties(customerDetailEntity, customerContactEntity); + BeanUtil.copyProperties(customerDetailEntity, customerContactEntity); boolean c = customerContactService.updateCustomerContact(customerContactEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index d9ba62af..141fd308 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.sync; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Dict; @@ -689,7 +690,7 @@ public class SpsSyncDownloadController { for (IoCodeEntity warehouseEntity : warehouseEntityList) { if (warehouseEntity.getOrderId().equals(orderEntity.getBillNo())) { IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); - BeanUtils.copyProperties(warehouseEntity, codeTempEntity); + BeanUtil.copyProperties(warehouseEntity, codeTempEntity); codeTempEntity.setId(null); codeMappert.insert(codeTempEntity); } diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index ec963c47..f2eabd42 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.system; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -67,7 +68,7 @@ public class SysMenuHelpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); - BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); + BeanUtil.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); sysMenuHelpService.insertMenuHelp(sysMenuHelpEntity); return ResultVOUtils.success("成功"); } @@ -81,7 +82,7 @@ public class SysMenuHelpController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } SysMenuHelpEntity sysMenuHelpEntity = new SysMenuHelpEntity(); - BeanUtils.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); + BeanUtil.copyProperties(sysMenuHelpRequest,sysMenuHelpEntity); sysMenuHelpService.updateMenuHelp(sysMenuHelpEntity); return ResultVOUtils.success("成功"); } diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 95a1f10e..86e32b00 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.system; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import com.github.pagehelper.PageInfo; @@ -54,7 +55,7 @@ public class SysParamConfigController { List systemParamConfigEntityList = systemParamConfigService.queryPage(filterParamConfigRequest); List systemParamConfigResponseList = systemParamConfigEntityList.stream().map(item -> { SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse(); - BeanUtils.copyProperties(item, systemParamConfigResponse); + BeanUtil.copyProperties(item, systemParamConfigResponse); return systemParamConfigResponse; }).collect(Collectors.toList()); @@ -76,7 +77,7 @@ public class SysParamConfigController { } SystemParamConfigEntity systemParamConfigEntity = new SystemParamConfigEntity(); - BeanUtils.copyProperties(sysParamConfigSaveRequest, systemParamConfigEntity); + BeanUtil.copyProperties(sysParamConfigSaveRequest, systemParamConfigEntity); boolean b = systemParamConfigService.insert(systemParamConfigEntity); if (!b) { diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index c1d27d4d..9f633d08 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.system; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -57,7 +58,7 @@ public class SysPdfModuleController { List systemPDFModuleEntityList = systemPDFModuleService.queryPage(filterPDFModuleRequest); List systemPDFModuleResponseList = systemPDFModuleEntityList.stream().map(item -> { SystemPDFModuleResponse systemPDFModuleResponse = new SystemPDFModuleResponse(); - BeanUtils.copyProperties(item, systemPDFModuleResponse); + BeanUtil.copyProperties(item, systemPDFModuleResponse); if (item.getTemplateId() != 0) { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(item.getTemplateId())); @@ -133,7 +134,7 @@ public class SysPdfModuleController { pageSimpleResponse.setTotal(pageInfo.getTotal()); List systemPDFModuleSelectResponses = systemPDFModuleEntityList.stream().map(e -> { SystemPDFModuleSelectResponse systemPDFModuleSelectResponse = new SystemPDFModuleSelectResponse(); - BeanUtils.copyProperties(e, systemPDFModuleSelectResponse); + BeanUtil.copyProperties(e, systemPDFModuleSelectResponse); systemPDFModuleSelectResponse.setIdStr(String.valueOf(e.getId())); return systemPDFModuleSelectResponse; }).collect(Collectors.toList()); @@ -154,7 +155,7 @@ public class SysPdfModuleController { } SystemPDFModuleEntity systemPDFModuleEntity = new SystemPDFModuleEntity(); - BeanUtils.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity); + BeanUtil.copyProperties(sysPdfModuleSaveRequest, systemPDFModuleEntity); systemPDFModuleEntity.setCreate_time(new Date()); systemPDFModuleEntity.setUpdate_time(new Date()); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index d49caad4..358447dd 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; @@ -211,13 +212,13 @@ public class ThrCorpExportLogController { return udiDlDeviceResponse; } else { FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); + BeanUtil.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); List thrCorpEntityList = thrCorpEntities.stream().map(item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; }).collect(Collectors.toList()); PageInfo pageInfo; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java index bf25f95e..863c6285 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; @@ -124,8 +125,8 @@ public class ThrOrderController { if (subErpOrders != null && subErpOrders.size() > 0) { for (ThrOrderResponse.SubErpOrder subErpOrder : subErpOrders) { ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); - BeanUtils.copyProperties(erpOrderResponse, thrOrderDetailEntity); - BeanUtils.copyProperties(subErpOrder, thrOrderDetailEntity); + BeanUtil.copyProperties(erpOrderResponse, thrOrderDetailEntity); + BeanUtil.copyProperties(subErpOrder, thrOrderDetailEntity); thrOrderDetailEntity.setGenKeyFk(finalGenKey); thrOrderDetailEntity.setThirdSysFk(postThrOrderRequest.getThirdSys()); thrOrderDetailEntity.setUpdateTime(new Date()); @@ -331,7 +332,7 @@ public class ThrOrderController { for (String id : ids) { ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id)); UploadSmpRequest uploadSmpRequest = new UploadSmpRequest(); - BeanUtils.copyProperties(thrOrderEntity, uploadSmpRequest); + BeanUtil.copyProperties(thrOrderEntity, uploadSmpRequest); uploadSmpRequest.setType(1); FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); filterThrOrderDetailRequest.setOrderIdFk(id); @@ -340,7 +341,7 @@ public class ThrOrderController { List subErpOrders = new ArrayList<>(); for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { UploadSmpRequest.SubErpOrder subErpOrder = new UploadSmpRequest.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } uploadSmpRequest.setSubErpOrders(subErpOrders); @@ -386,7 +387,7 @@ public class ThrOrderController { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); + BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); List erpOrderResponses = new ArrayList<>(); @@ -397,12 +398,12 @@ public class ThrOrderController { filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); List subErpOrders = new ArrayList<>(); if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } } @@ -434,7 +435,7 @@ public class ThrOrderController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); + BeanUtil.copyProperties(filterErpOrderRequest, filterThrOrderRequest); filterThrOrderRequest.setPage(filterErpOrderRequest.getPage()); filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit()); @@ -447,12 +448,12 @@ public class ThrOrderController { List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); List subErpOrders = new ArrayList<>(); if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrder.setCount(thrOrderDetailEntity.getCount()); subErpOrder.setReCount(thrOrderDetailEntity.getReCount()); subErpOrders.add(subErpOrder); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 5bbd6b15..6891aa11 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -128,7 +129,7 @@ public class ThrProductsAddDiController { } SupplementRequest supplementRequest = new SupplementRequest(); - BeanUtils.copyProperties(addThrDiProductsRequest, supplementRequest); + BeanUtil.copyProperties(addThrDiProductsRequest, supplementRequest); String vailResult = supplementVailUtil.vail(supplementRequest, SupplementVailUtil.SUP_ADD); if (vailResult != null) return ResultVOUtils.error(500, vailResult); @@ -187,7 +188,7 @@ public class ThrProductsAddDiController { //第三方产品审核通过 if (thrProductsAddDiEntity.getType() == 2) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - BeanUtils.copyProperties(thrProductsAddDiEntity, thrProductsEntity); + BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity); thrProductsService.insertThrProducts(thrProductsEntity); ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys(); if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk())) @@ -228,7 +229,7 @@ public class ThrProductsAddDiController { udiProductEntity.setNameCode(null); udiProductService.updateUdiInfoByUuid(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceEntity1); + BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceEntity1); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity1); // udiInfoService.updateUdiInfo(udiInfoEntity); //回填关联关系到关联表 @@ -323,7 +324,7 @@ public class ThrProductsAddDiController { String customerId = getCustomerId() + ""; if (customerId.equals("110")) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - BeanUtils.copyProperties(thrProductsAdddiEntity, thrProductsEntity); + BeanUtil.copyProperties(thrProductsAdddiEntity, thrProductsEntity); thrProductsService.insertThrProducts(thrProductsEntity); } else { @@ -333,7 +334,7 @@ public class ThrProductsAddDiController { if (StrUtil.isNotEmpty(thrProductsAdddiEntity.getRelId())) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(Long.valueOf(thrProductsAdddiEntity.getRelId())); if (udiRelevanceResponse != null) { - BeanUtils.copyProperties(udiRelevanceResponse, thrProductsAdddiEntity); + BeanUtil.copyProperties(udiRelevanceResponse, thrProductsAdddiEntity); thrProductsAdddiEntity.setName(udiRelevanceResponse.getCpmctymc()); thrProductsAdddiEntity.setManufactory(udiRelevanceResponse.getYlqxzcrbarmc()); thrProductsAdddiEntity.setSpec(udiRelevanceResponse.getGgxh()); @@ -383,7 +384,7 @@ public class ThrProductsAddDiController { //第三方产品审核通过 if (thrProductsAddDiEntity.getType() == 2) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - BeanUtils.copyProperties(thrProductsAddDiEntity, thrProductsEntity); + BeanUtil.copyProperties(thrProductsAddDiEntity, thrProductsEntity); thrProductsService.insertThrProducts(thrProductsEntity); ThrSystemEntity basicThirdSysEntity = thrSystemService.selectMainThrSys(); if (basicThirdSysEntity.getThirdId().equals(thrProductsAddDiEntity.getThirdSysFk())) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 234742ef..c47a5fa9 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -136,7 +137,7 @@ public class ThrProductsController { if (null == thrProductsEntity) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - BeanUtils.copyProperties(thrProductsEntity, filterThrProductsRequest); + BeanUtil.copyProperties(thrProductsEntity, filterThrProductsRequest); List thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest); if (thrProductsEntities.size() == 0) { thrProductsEntity.setUpdateUser(String.valueOf(customerService.getUserId())); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index b3554947..e7b7cd39 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -85,7 +86,7 @@ public class ThrSystemController { List basicThirdSysResponses = basicThirdSysEntities.stream().map(item -> { BasicThirdSysResponse basicThirdSysResponse = new BasicThirdSysResponse(); - BeanUtils.copyProperties(item, basicThirdSysResponse); + BeanUtil.copyProperties(item, basicThirdSysResponse); return basicThirdSysResponse; }).collect(Collectors.toList()); basicThirdSysResponses.add(new BasicThirdSysResponse("ybbm", "医保编码")); diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 122cbbd8..a01dbe85 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -1,5 +1,6 @@ package com.glxp.api.http; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -38,7 +39,7 @@ public class ErpBasicClient { //获取往来单位 public BaseResponse> getErpCrop(ThrUnitMaintainFilterRequest thrUnitMaintainFilterRequest) { UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); - BeanUtils.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest); + BeanUtil.copyProperties(thrUnitMaintainFilterRequest, udiwmsUnitRequest); udiwmsUnitRequest.setUnitId(thrUnitMaintainFilterRequest.getErpId()); ThrSystemEntity thrSystemEntity = basicThirdSysService.selectByThirdId(thrUnitMaintainFilterRequest.getThirdSys()); diff --git a/src/main/java/com/glxp/api/http/NmpaUdiClient.java b/src/main/java/com/glxp/api/http/NmpaUdiClient.java index 1cdd310d..700a1e79 100644 --- a/src/main/java/com/glxp/api/http/NmpaUdiClient.java +++ b/src/main/java/com/glxp/api/http/NmpaUdiClient.java @@ -1,5 +1,6 @@ package com.glxp.api.http; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.ProductInfoEntity; @@ -38,7 +39,7 @@ public class NmpaUdiClient { String myUuid = UuidUtils.getUUId(); for (ProductInfoEntity productInfoEntity : productInfoEntityList) { UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(productInfoEntity, udiProductEntity); + BeanUtil.copyProperties(productInfoEntity, udiProductEntity); udiProductEntity.setUuid(myUuid); udiProductEntity.setOriginUuid(productInfoEntity.getUuid()); udiProductEntity.setQxlb(productInfoEntity.getCplx()); @@ -81,7 +82,7 @@ public class NmpaUdiClient { List udiInfoEntities = new ArrayList<>(); for (ProductInfoEntity productInfoEntity : datas) { UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(productInfoEntity, udiProductEntity); + BeanUtil.copyProperties(productInfoEntity, udiProductEntity); udiProductEntity.setQxlb(productInfoEntity.getCplx()); udiProductEntity.setCplb(productInfoEntity.getHchzsb()); udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI); diff --git a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java index 773aaf06..ffbc6a28 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; @@ -64,7 +65,7 @@ public class BasicUpdateProductService { if (thrProductsEntities != null && thrProductsEntities.size() > 0) { ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0); UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); + BeanUtil.copyProperties(thrProductsEntity, udiProductEntity); udiProductEntity.setNameCode(thrProductsEntity.getCode()); udiProductEntity.setCpmctymc(thrProductsEntity.getName()); udiProductEntity.setManufactory(thrProductsEntity.getManufactory()); diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java index eb154d88..724550ac 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; @@ -39,8 +40,8 @@ public class CompanyProductsRelService { UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); udiInfoRequest.setUuid(udiRelevanceEntity.getUuid()); SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest(); - BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); - BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity); + BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest); + BeanUtil.copyProperties(supplementRequest, udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiProductService.updateUdiInfoNotAll(udiInfoRequest); companyProductRelevanceEntity.setCreateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index 4fef3ba0..f27701de 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic.impl; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.ProductInfoDao; import com.glxp.api.entity.basic.ProductInfoEntity; @@ -140,7 +141,7 @@ public class ProductInfoServiceImpl implements ProductInfoService { public Long filterUdiNoPageCount(ProductInfoFilterRequest request) { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); - BeanUtils.copyProperties(request, productInfoFilterRequest); + BeanUtil.copyProperties(request, productInfoFilterRequest); if (productInfoFilterRequest.getPage() != null) { int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java index d8e66fec..9cd02f0b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inout.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -43,7 +44,7 @@ public class IoOrderInvoiceService extends ServiceImpl 0; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index bcb36fcc..937b82c7 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -515,7 +515,7 @@ public class IoOrderServiceImpl implements IoOrderService { List codeTempEntities = new ArrayList<>(); for (IoCodeEntity codeEntity : codeEntityList) { IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); - BeanUtils.copyProperties(codeEntity, codeTempEntity); + BeanUtil.copyProperties(codeEntity, codeTempEntity); codeTempEntity.setId(null); codeTempEntities.add(codeTempEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index 3964e11c..fdc9f678 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.file.FileWriter; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -77,7 +78,7 @@ public class ThrCorpsDlService { thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( item -> { ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); thrCorpEntity.setUnitId(item.getUnitId()); thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setCreateTime(new Date()); @@ -95,7 +96,7 @@ public class ThrCorpsDlService { List thrCorpEntities = temps.stream().map( item -> { ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setThirdSysFk(thirdSys); thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setCreateTime(new Date()); @@ -135,7 +136,7 @@ public class ThrCorpsDlService { List thrCorpEntities = thrCorpImportDetailEntities.stream().map( item -> { ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setUpdateTime(new Date()); thrProductsEntity.setThirdSysFk(thirdSys); return thrProductsEntity; @@ -206,7 +207,7 @@ public class ThrCorpsDlService { } else { //根据查询条件一键导出数据库往来单位 FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest); filterThrCorpRequest.setPage(null); List> genDatas = genExcelData(filterThrCorpRequest); if (genDatas != null && genDatas.size() > 0) { @@ -234,7 +235,7 @@ public class ThrCorpsDlService { thrCorpImportDetailEntities = thrCorpsResponseList.stream().map( item -> { ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setThirdSysFk(thirdSys); @@ -245,7 +246,7 @@ public class ThrCorpsDlService { thrCorpEntities = thrCorpImportDetailEntities.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); // thrCorpEntity.setUnitId(item.getId()); thrCorpEntity.setUpdateTime(new Date()); thrCorpEntity.setThirdSysFk(thirdSys); @@ -280,7 +281,7 @@ public class ThrCorpsDlService { thrCorpImportDetailEntities = erpUnitsResponses.stream().map( item -> { ThrCorpImportDetailEntity thrCorpEntity = new ThrCorpImportDetailEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); thrCorpEntity.setUnitId(item.getUnitId()); thrCorpEntity.setGenKeyFk(finalGenKey); thrCorpEntity.setUpdateTime(new Date()); @@ -340,7 +341,7 @@ public class ThrCorpsDlService { List thrCorpEntities = erpUnitsResponses.stream().map( item -> { ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setUnitId(item.getId()); return thrProductsEntity; } @@ -359,7 +360,7 @@ public class ThrCorpsDlService { thrCorpEntityList = thrCorpsResponseList.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; } ).collect(Collectors.toList()); @@ -421,14 +422,14 @@ public class ThrCorpsDlService { //根据查询条件一键导出数据库往来单位 List thrCorpEntityList = new ArrayList<>(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest); filterThrCorpRequest.setPage(null); List thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); if (thrCorpsResponseList.size() > 0) { thrCorpEntityList = thrCorpsResponseList.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; } ).collect(Collectors.toList()); @@ -478,14 +479,14 @@ public class ThrCorpsDlService { //根据查询条件一键导出数据库往来单位 List thrCorpEntityList = new ArrayList<>(); FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(thrCorpExportRequest, filterThrCorpRequest); + BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest); filterThrCorpRequest.setPage(null); List thrCorpsResponseList = thrCorpService.filterThrCorps(filterThrCorpRequest); if (thrCorpsResponseList.size() > 0) { thrCorpEntityList = thrCorpsResponseList.stream().map( item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); - BeanUtils.copyProperties(item, thrCorpEntity); + BeanUtil.copyProperties(item, thrCorpEntity); return thrCorpEntity; } ).collect(Collectors.toList()); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java index 9c1c42a9..4e364cdc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDataService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.thrsys.ThrProductsEntity; @@ -52,7 +53,7 @@ public class ThrDataService { List erpProductsResponses = udiDlDeviceResponse.getData().getList(); if (erpProductsResponses != null) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); - BeanUtils.copyProperties(erpProductsResponses.get(0), thrProductsEntity); + BeanUtil.copyProperties(erpProductsResponses.get(0), thrProductsEntity); return thrProductsEntity; } } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java index 2019d432..d5b6122d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.thrsys; +import cn.hutool.core.bean.BeanUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; @@ -57,7 +58,7 @@ public class ThrInvProductsDlService { List thrProductsEntities = ThrInvProductResponses.stream().map( item -> { ThrInvProductsImportDetailEntity thrProductsEntity = new ThrInvProductsImportDetailEntity(); - BeanUtils.copyProperties(item, thrProductsEntity); + BeanUtil.copyProperties(item, thrProductsEntity); thrProductsEntity.setInventoryCode(item.getCode()); thrProductsEntity.setInventoryName(item.getName()); thrProductsEntity.setGenKeyFk(genKey); @@ -78,7 +79,7 @@ public class ThrInvProductsDlService { List thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map( item -> { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); - BeanUtils.copyProperties(item, thrInvProductsEntity); + BeanUtil.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); thrInvProductsEntity.setCreateTime(new Date()); thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); @@ -114,7 +115,7 @@ public class ThrInvProductsDlService { List thrInvProductsEntities = thrInvProductsImportDetailEntities.stream().map( item -> { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); - BeanUtils.copyProperties(item, thrInvProductsEntity); + BeanUtil.copyProperties(item, thrInvProductsEntity); thrInvProductsEntity.setUpdateTime(new Date()); thrInvProductsEntity.setCreateTime(new Date()); thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index cd6a6c7b..22bb1f32 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys.impl; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.dao.thrsys.ThrOrderImportLogDao; @@ -95,7 +96,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { for (List datas : map.values()) { ThrOrderImportDetailEntity thrOrderImportDetailEntity = datas.get(0); ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); + BeanUtil.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); thrOrderEntity.setUpdateTime(new Date()); // BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(thrOrderEntity.getBillType()); // if (bussinessTypeEntity != null) { @@ -108,7 +109,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { { ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); thrOrderDetailEntity.setUpdateTime(new Date()); - BeanUtils.copyProperties(item, thrOrderDetailEntity); + BeanUtil.copyProperties(item, thrOrderDetailEntity); thrOrderDetailEntity.setOrderIdFk(finalThrOrderEntity.getId() + ""); return thrOrderDetailEntity; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index 27839a21..9b9d3c66 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; @@ -59,8 +60,8 @@ public class ThrOrderServiceImpl implements ThrOrderService { if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrErpOrderResponse thrErpOrderResponse = new ThrErpOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, thrErpOrderResponse); - BeanUtils.copyProperties(thrOrderDetailEntity, thrErpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, thrErpOrderResponse); + BeanUtil.copyProperties(thrOrderDetailEntity, thrErpOrderResponse); thrErpOrderResponse.setCompanyid(thrOrderEntity.getCorpId()); thrErpOrderResponse.setCompanyname(thrOrderEntity.getCorpName()); thrErpOrderResponse.setErpOrderId(thrOrderEntity.getBillNo()); @@ -93,12 +94,12 @@ public class ThrOrderServiceImpl implements ThrOrderService { filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); List subErpOrders = new ArrayList<>(); if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); subErpOrders.add(subErpOrder); } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 6afe1238..5ae606ac 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.thrsys.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -93,7 +94,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { for (String uuid : uuids) { ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0); ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity(); - BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); + BeanUtil.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); thrProductsAddDiEntity.setCustomerId(customerId + ""); thrProductsAddDiEntity.setUuid(uuid); thrProductsAddDiEntity.setType(1);