From b45822f1050a62dec33000341ef75bec13d62be0 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 3 Mar 2025 16:08:15 +0800 Subject: [PATCH] =?UTF-8?q?service=20=E5=B1=82=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/constant/AliConstants.java | 57 +-- .../inv/DeviceReceiveDetailController.java | 19 +- .../inv/InvCountOrderController.java | 16 +- .../api/service/auth/AuthAdminService.java | 8 - .../api/service/auth/AuthAliUserService.java | 4 - .../service/auth/AuthRoleAdminService.java | 5 - .../api/service/auth/AuthRoleService.java | 31 +- .../api/service/auth/DeptUserService.java | 2 - .../api/service/auth/ISysDictDataService.java | 10 +- .../api/service/auth/ISysDictTypeService.java | 25 -- .../api/service/auth/InvBusUserService.java | 6 - .../api/service/auth/InvWarehouseService.java | 10 +- .../api/service/auth/SysPdaKeyService.java | 2 - .../auth/WarehouseBussinessTypeService.java | 7 - .../service/auth/WarehouseUserService.java | 15 +- .../auth/impl/AuthAdminServiceImpl.java | 27 -- .../auth/impl/AuthRoleAdminServiceImpl.java | 44 --- .../auth/impl/AuthRoleServiceImpl.java | 97 ----- .../auth/impl/DeptUserServiceImpl.java | 13 - .../auth/impl/InvBusUserServiceImpl.java | 24 -- .../auth/impl/InvWarehouseServiceImpl.java | 15 - .../auth/impl/SysDictDataServiceImpl.java | 13 - .../auth/impl/SysDictTypeServiceImpl.java | 85 ----- .../auth/impl/SysPdaKeyServiceImpl.java | 5 - .../WarehouseBussinessTypeServiceImpl.java | 7 - .../auth/impl/WarehouseUserServiceImpl.java | 47 --- .../basic/BasicBackUpdateProductService.java | 147 ------- .../api/service/basic/BasicCorpService.java | 6 - .../basic/BasicNewUploadDiService.java | 3 - .../BasicProductsImportDetailService.java | 2 - .../basic/BasicUnitMaintainService.java | 6 - .../basic/CompanyProductRelevanceService.java | 2 - .../api/service/basic/EntrustReceService.java | 2 - .../basic/IBasicBusTypePreService.java | 2 - .../api/service/basic/ProductInfoService.java | 23 -- .../api/service/basic/SyncUdiService.java | 31 -- .../api/service/basic/UdiCompanyService.java | 6 - .../api/service/basic/UdiContrastService.java | 117 ------ .../api/service/basic/UdiProductService.java | 9 - .../service/basic/UdiRelevanceService.java | 17 - .../api/service/basic/UdiRlSupService.java | 6 - .../impl/BasicBusTypePreServiceImpl.java | 5 - .../basic/impl/BasicCorpServiceImpl.java | 10 - .../impl/BasicNewUploadDiServiceImpl.java | 19 - .../BasicProductsImportDetailServiceImpl.java | 11 - .../impl/BasicUnitMaintainServiceImpl.java | 10 - .../CompanyProductRelevanceServiceImpl.java | 6 - .../basic/impl/EntrustReceServiceImpl.java | 5 - .../basic/impl/ProductInfoServiceImpl.java | 95 ----- .../basic/impl/UdiCompanyServiceImpl.java | 14 - .../basic/impl/UdiProductServiceImpl.java | 20 - .../basic/impl/UdiRelevanceServiceImpl.java | 45 --- .../basic/impl/UdiRlSupServiceImpl.java | 17 - .../service/collect/RelCodeBatchService.java | 2 - .../dev/DeviceCheckDetailItemService.java | 2 +- .../api/service/dev/DeviceInfoService.java | 14 - .../api/service/dev/DeviceUpkeepService.java | 10 - .../dev/impl/DeviceInfoServiceImpl.java | 32 -- .../DeviceRepairApplyDetailServiceImpl.java | 3 +- .../service/info/impl/SetupServiceImpl.java | 27 -- .../api/service/inout/IoAddInoutService.java | 2 - .../service/inout/IoChangeInoutService.java | 26 -- .../service/inout/IoCheckInoutService.java | 39 -- .../api/service/inout/IoGenInvService.java | 24 +- .../inout/IoOrderDetailBizService.java | 4 - .../inout/IoOrderDetailCodeService.java | 2 +- .../api/service/inout/IoOrderService.java | 4 - .../api/service/inout/impl/IoCodeService.java | 11 - .../service/inout/impl/IoCodeTempService.java | 34 -- .../impl/IoOrderDetailBizServiceImpl.java | 26 -- .../inout/impl/IoOrderInvoiceService.java | 4 - .../inout/impl/IoOrderServiceImpl.java | 17 - .../inv/DeviceInspectTaskDetailService.java | 4 - .../inv/DeviceReceiveOrderDetailService.java | 7 - .../api/service/inv/InvCountOrderService.java | 9 - .../inv/InvInnerOrderPrintService.java | 1 - .../service/inv/InvMAOrderDetailService.java | 7 - .../api/service/inv/InvPreProductService.java | 7 - .../service/inv/InvPreinDetailService.java | 6 - .../api/service/inv/InvPreinOrderService.java | 2 +- .../inv/InvPreinProductDetailService.java | 7 - .../service/inv/InvPreinProductService.java | 8 - .../DeviceReceiveOrderDetailServiceImpl.java | 134 +------ .../inv/impl/InvCountCodesServiceImpl.java | 2 - .../inv/impl/InvCountOrderServiceImpl.java | 211 ----------- .../impl/InvInnerOrderPrintServiceImpl.java | 11 - .../inv/impl/InvMAOrderDetailServiceImpl.java | 77 ---- .../InvPreInProductDetailServiceImpl.java | 5 - .../inv/impl/InvPreProductServiceImpl.java | 11 - .../inv/impl/InvPreinDetailServiceImpl.java | 25 -- .../inv/impl/InvPreinProductServiceImpl.java | 11 - .../inv/impl/InvProductServiceNew.java | 138 ------- .../service/monitor/ISysOperLogService.java | 2 +- .../purchase/CustomerContactService.java | 2 - .../purchase/PurApplyDetailService.java | 2 +- .../purchase/PurArrivalDetailService.java | 2 - .../service/purchase/PurArrivalService.java | 1 - .../purchase/PurDeliveryCodeService.java | 2 +- .../purchase/PurDeliveryDetailService.java | 2 - .../purchase/PurReturnedDetailService.java | 2 - .../api/service/purchase/SupCertService.java | 1 - .../service/purchase/SupCompanyService.java | 5 - .../service/purchase/SupProductService.java | 15 - .../impl/CustomerContactServiceImpl.java | 16 - .../impl/PurArrivalDetailServiceImpl.java | 4 - .../purchase/impl/PurArrivalServiceImpl.java | 5 +- .../impl/PurDeliveryDetailServiceImpl.java | 5 - .../impl/PurReturnedDetailServiceImpl.java | 10 - .../purchase/impl/SupCertRemindMsgImpl.java | 3 +- .../purchase/impl/SupCertServiceImpl.java | 5 - .../purchase/impl/SupCompanyServiceImpl.java | 40 -- .../purchase/impl/SupProductServiceImpl.java | 79 +--- .../service/sync/BasicDownloadService.java | 1 - .../service/sync/SpsSyncDownloadService.java | 125 ------ .../api/service/sync/SyncEditLogService.java | 4 - .../api/service/sync/SyncEditTypeService.java | 4 - .../sync/impl/BasicDownloadServiceImpl.java | 11 - .../api/service/system/CompanyService.java | 10 - .../system/SyncUploadDataSetService.java | 3 - .../SystemPDFTemplateRelevanceService.java | 10 - .../system/SystemPDFTemplateService.java | 2 - .../system/SystemParamConfigService.java | 6 - .../system/impl/CompanyServiceImpl.java | 37 +- .../impl/SyncUploadDataSetServiceImpl.java | 5 - .../system/impl/SysServerLogServiceImpl.java | 10 - ...SystemPDFTemplateRelevanceServiceImpl.java | 62 --- .../impl/SystemPDFTemplateServiceImpl.java | 4 - .../impl/SystemParamConfigServiceImpl.java | 16 - .../java/com/glxp/api/service/thrsys/App.java | 74 ---- .../thrsys/IThrBusTypeOriginService.java | 23 -- .../service/thrsys/ThirdAliDrugService.java | 53 --- .../thrsys/ThrCorpImportDetailService.java | 3 - .../api/service/thrsys/ThrCorpService.java | 4 - .../api/service/thrsys/ThrCorpsDlService.java | 70 ---- .../api/service/thrsys/ThrDeptService.java | 6 - .../thrsys/ThrInvProductsDetailService.java | 3 - .../service/thrsys/ThrInvProductsService.java | 3 - .../thrsys/ThrInvWarehouseService.java | 11 - .../thrsys/ThrManufacturerService.java | 43 --- .../service/thrsys/ThrOrderDetailService.java | 3 - .../thrsys/ThrOrderImportDetailService.java | 4 - .../api/service/thrsys/ThrOrderService.java | 8 - .../service/thrsys/ThrOrdersDlService.java | 84 ---- .../service/thrsys/ThrProductsAddService.java | 5 - .../service/thrsys/ThrProductsDlService.java | 358 ------------------ .../ThrProductsImportDetailService.java | 6 - .../thrsys/ThrProductsImportLogService.java | 3 - .../thrsys/ThrSystemBusApiService.java | 2 - .../api/service/thrsys/ThrSystemService.java | 3 +- .../impl/ThrBusTypeOriginServiceImpl.java | 27 -- .../impl/ThrCorpExportLogServiceImpl.java | 5 - .../impl/ThrCorpImportDetailServiceImpl.java | 20 - .../thrsys/impl/ThrCorpServiceImpl.java | 10 - .../thrsys/impl/ThrDeptServiceImpl.java | 26 -- .../impl/ThrInvProductsDetailServiceImpl.java | 20 - .../impl/ThrInvProductsServiceImpl.java | 20 - .../impl/ThrInvWarehouseServiceImpl.java | 27 -- .../impl/ThrOrderDetailServiceImpl.java | 8 - .../impl/ThrOrderImportDetailServiceImpl.java | 10 - .../impl/ThrOrderImportLogServiceImpl.java | 6 - .../thrsys/impl/ThrOrderServiceImpl.java | 88 ----- .../thrsys/impl/ThrProductsAddDiService.java | 91 ----- .../impl/ThrProductsAddServiceImpl.java | 18 - .../ThrProductsImportDetailServiceImpl.java | 15 - .../impl/ThrProductsImportLogServiceImpl.java | 11 - .../impl/ThrSystemBusApiServiceImpl.java | 4 - .../thrsys/impl/ThrSystemServiceImpl.java | 5 - .../api/util/alihealth/AlihealthUtils.java | 3 - src/main/resources/application-dev.yml | 6 +- 169 files changed, 25 insertions(+), 3873 deletions(-) delete mode 100644 src/main/java/com/glxp/api/service/info/impl/SetupServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java delete mode 100644 src/main/java/com/glxp/api/service/thrsys/App.java diff --git a/src/main/java/com/glxp/api/constant/AliConstants.java b/src/main/java/com/glxp/api/constant/AliConstants.java index 97b04afb..5afa9cda 100644 --- a/src/main/java/com/glxp/api/constant/AliConstants.java +++ b/src/main/java/com/glxp/api/constant/AliConstants.java @@ -1,66 +1,11 @@ package com.glxp.api.constant; public class AliConstants { - public static final String APP_KEY = "app_key"; - public static final String FORMAT = "format"; - public static final String METHOD = "method"; + public static final String TIMESTAMP = "timestamp"; - public static final String VERSION = "v"; - public static final String SIGN = "sign"; - public static final String SIGN_METHOD = "sign_method"; - public static final String PARTNER_ID = "partner_id"; - public static final String SESSION = "session"; - public static final String SIMPLIFY = "simplify"; - public static final String TARGET_APP_KEY = "target_app_key"; - public static final String ERROR_RESPONSE = "error_response"; - public static final String ERROR_CODE = "code"; - public static final String ERROR_MSG = "msg"; - public static final String ERROR_SUB_CODE = "sub_code"; - public static final String ERROR_SUB_MSG = "sub_msg"; - public static final String QIMEN_CLOUD_ERROR_RESPONSE = "response"; - public static final String QM_ROOT_TAG = "request"; - public static final String QM_CUSTOMER_ID = "customerId"; - public static final String QM_CONTENT_TYPE = "text/xml;charset=utf-8"; - public static final String QM_CONTENT_TYPE_JSON = "application/json;charset=utf-8"; - public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; - public static final String DATE_TIMEZONE = "GMT+8"; public static final String CHARSET_UTF8 = "UTF-8"; - public static final String METHOD_POST = "POST"; - public static final String METHOD_GET = "GET"; - public static final String CTYPE_FORM_DATA = "application/x-www-form-urlencoded"; - public static final String CTYPE_FILE_UPLOAD = "multipart/form-data"; - public static final String CTYPE_TEXT_XML = "text/xml"; - public static final String CTYPE_APPLICATION_XML = "application/xml"; - public static final String CTYPE_TEXT_PLAIN = "text/plain"; - public static final String CTYPE_APP_JSON = "application/json"; - public static final String CHARSET_GBK = "GBK"; - public static final String FORMAT_JSON = "json"; - public static final String FORMAT_XML = "xml"; - public static final String FORMAT_JSON2 = "json2"; - public static final String FORMAT_XML2 = "xml2"; public static final String SIGN_METHOD_MD5 = "md5"; public static final String SIGN_METHOD_HMAC = "hmac"; - public static final String SIGN_METHOD_HMAC_SHA256 = "hmac-sha256"; - public static final String SDK_VERSION = "top-sdk-java-20201231"; - public static final String SDK_VERSION_CLUSTER = "top-sdk-java-cluster-20201231"; - public static final String SDK_VERSION_HTTPDNS = "top-sdk-java-httpdns-20201231"; - public static final String QIMEN_SDK_VERSION_HTTPDNS = "top-qimen-sdk-java-httpdns"; - public static final String ACCEPT_ENCODING = "Accept-Encoding"; - public static final String CONTENT_ENCODING = "Content-Encoding"; - public static final String CONTENT_ENCODING_GZIP = "gzip"; - public static final String MIME_TYPE_DEFAULT = "application/octet-stream"; - public static final int READ_BUFFER_SIZE = 4096; - public static final String TOP_HTTP_DNS_HOST = "TOP_HTTP_DNS_HOST"; - public static final String CONTENT_TYPE_XML = "xml"; - public static final String CONTENT_TYPE_JSON = "json"; - public static final String CONTENT_TYPE_FORM = "form"; - public static final String RESPONSE_TYPE_TOP = "top"; - public static final String RESPONSE_TYPE_QIMEN = "qimen1"; - public static final String RESPONSE_TYPE_QIMEN2 = "qimen2"; - public static final String RESPONSE_TYPE_DINGTALK_OAPI = "dingtalk"; - public static final String CALL_TYPE_TOP = "top"; - public static final String CALL_TYPE_OAPI = "oapi"; - public AliConstants() { } } diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java index 150d5eee..fc1933e3 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java @@ -59,24 +59,7 @@ public class DeviceReceiveDetailController { return detailService.checkCode(code); } - /** - * 添加领用记录详情 - * - * @param addDetailRequest - * @param bindingResult - * @return - */ - @PostMapping("/device/receive/order/detail/addOrderDetail") - @Log(title = "设备领用", businessType = BusinessType.INSERT) - public BaseResponse addOrderDetail(@RequestBody AddDeviceReceiveOrderDetailRequest addDetailRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } - if (null == addDetailRequest || StrUtil.isBlank(addDetailRequest.getOrderIdFk())) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return detailService.addOrderDetail(addDetailRequest); - } + /** * 更新设备领用记录详情 diff --git a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java index 5b4141cf..67a75cbe 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvCountOrderController.java @@ -118,21 +118,7 @@ public class InvCountOrderController { return invCountOrderService.submitAudit(id); } - /** - * 更新盘点单据状态 - * - * @param filterInvCountOrderRequest - * @return - */ - @AuthRuleAnnotation("") - @PostMapping("/inv/count/order/updateCountOrderStatus") - @Log(title = "盘点单据", businessType = BusinessType.UPDATE) - public BaseResponse updateCountOrderStatus(@RequestBody FilterInvCountOrderRequest filterInvCountOrderRequest) { - if (null == filterInvCountOrderRequest || StrUtil.isBlank(filterInvCountOrderRequest.getId()) || null == filterInvCountOrderRequest.getStatus()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - } - return invCountOrderService.updateCountOrderStatus(filterInvCountOrderRequest.getId(), filterInvCountOrderRequest.getStatus()); - } + /** * 校验模板文件 diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index 8a0f3093..cbb25cd4 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -22,8 +22,6 @@ public interface AuthAdminService { AuthAdmin findById(Long id); - AuthAdmin findPwdById(Long id); - boolean insertAuthAdmin(AuthAdmin authAdmin); boolean updateAuthAdmin(AuthAdmin authAdmin); @@ -49,11 +47,5 @@ public interface AuthAdminService { void insertUserAuth(Long userId, List roleIds); - void insertUserAuth1(SysUserRole sysUserRole); - - List findByCustomerId(String customerId); - - SysUserRole selectByAuthId(Long id); - } diff --git a/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java b/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java index 487bd0e2..f2df0c1f 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAliUserService.java @@ -6,12 +6,8 @@ import com.glxp.api.dao.auth.AuthAliUserDao; import com.glxp.api.entity.auth.AuthAliUser; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - @Service public class AuthAliUserService extends ServiceImpl { - @Resource - private AuthAliUserDao authAliUserDao; public AuthAliUser getOne(){ AuthAliUser authAliUser = this.getOne(new QueryWrapper() .last("limit 1") diff --git a/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java index 36086ad2..178a7a51 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java @@ -10,16 +10,11 @@ public interface AuthRoleAdminService { List listByAdminId(Long adminId); - List listByAdminIdIn(List adminIds); - - List listByRoleId(Long roleId); int insertAuthRoleAdminAll(List authRoleAdminList); int insertRolesAdminIdAll(List roles, Long adminId); - boolean deleteByAdminId(Long adminId); boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin); - List listAdminRole(Long adminId); } diff --git a/src/main/java/com/glxp/api/service/auth/AuthRoleService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java index ec122a7f..04907af1 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthRoleService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java @@ -8,40 +8,11 @@ import com.glxp.api.req.auth.AuthRoleQueryRequest; import java.util.List; public interface AuthRoleService { - - List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest); - - List listAuthAdminRolePage(Integer page, Integer limit, Integer status); - - AuthRole findByName(String name); - - boolean insertAuthRole(AuthRole authRole); - - boolean updateAuthRole(AuthRole authRole); - List listCustomerRoles(Integer page, Integer limit, Integer isCustomer); List getlistCustomerRoles(Integer page, Integer limit, Integer isCustomer); - - - List listAuthRoles2(Integer page, Integer limit); - boolean deleteById(Long id); - /** - * 查询角色扫码单据授权数据 - * - * @param roleId - * @return - */ - List getBussinessTypeRole(Long roleId); - - /** - * 更新角色扫码单据类型授权数据 - * - * @param roleId - * @param actions - */ - void updateBussinessTypeRole(Long roleId, List actions); + } diff --git a/src/main/java/com/glxp/api/service/auth/DeptUserService.java b/src/main/java/com/glxp/api/service/auth/DeptUserService.java index b8ce4781..0a1a9313 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptUserService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptUserService.java @@ -17,7 +17,6 @@ public interface DeptUserService { List selectByUserIdKey(Long userId); - List getDeptById( List ids); List selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust); @@ -27,7 +26,6 @@ public interface DeptUserService { int deleteById(Integer id); - int deleteByList(List ids); int insertBatch(List list); diff --git a/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java b/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java index 3b59b35b..76156db9 100644 --- a/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysDictDataService.java @@ -15,19 +15,11 @@ public interface ISysDictDataService { /** * 根据条件分页查询字典数据 * - * @param dictData 字典数据信息 + * @param sysDictDataRequest 字典数据信息 * @return 字典数据集合信息 */ List selectDictDataList(SysDictDataRequest sysDictDataRequest); - /** - * 根据字典类型和字典键值查询字典数据信息 - * - * @param dictType 字典类型 - * @param dictValue 字典键值 - * @return 字典标签 - */ - String selectDictLabel(String dictType, String dictValue); /** * 根据字典数据ID查询信息 diff --git a/src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java b/src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java index 3c137514..7046f626 100644 --- a/src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java +++ b/src/main/java/com/glxp/api/service/auth/ISysDictTypeService.java @@ -38,14 +38,6 @@ public interface ISysDictTypeService { */ SysDictType selectDictTypeById(Long dictId); - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - SysDictType selectDictTypeByType(String dictType); - /** * 批量删除字典信息 * @@ -53,10 +45,6 @@ public interface ISysDictTypeService { */ void deleteDictTypeByIds(Long[] dictIds); - /** - * 重置字典缓存数据 - */ - void resetDictCache(); /** * 新增保存字典类型信息 @@ -81,17 +69,4 @@ public interface ISysDictTypeService { * @return 结果 */ String checkDictTypeUnique(SysDictType dictType); - - - String getDictLabel(String dictType, String dictValue, String separator); - - /** - * 根据字典类型和字典标签获取字典值 - * - * @param dictType 字典类型 - * @param dictLabel 字典标签 - * @param separator 分隔符 - * @return 字典值 - */ - String getDictValue(String dictType, String dictLabel, String separator); } diff --git a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java index d8fa4e3f..8460681b 100644 --- a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java +++ b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java @@ -15,8 +15,6 @@ public interface InvBusUserService extends IService { List filterUnSelect(FilterInvBusUserRequest filterInvBusUserRequest); - List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); - List selectByUnion(String userId, String subInvCode); boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); @@ -27,10 +25,6 @@ public interface InvBusUserService extends IService { boolean deleteByUnion(String userId, String subInvCode); - boolean deleteByscAction(String subInvCode, List selectedCodes); - boolean isExitByAction(String action); - boolean exitBus(String userId, String action); - } diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java index 86c97e5d..b872649e 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -20,8 +20,6 @@ public interface InvWarehouseService { List getByWarePcode(@Param("parentCode") String parentCode); - List getByWarePId(@Param("parentId") String parentId); - List filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); List filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest); @@ -38,9 +36,7 @@ public interface InvWarehouseService { boolean deleteById(String id); - boolean deleteByParentCode(String code); - - public boolean checkDuplicateName(String parentId, String name); + boolean checkDuplicateName(String parentId, String name); boolean updateCheckExit(InvWarehouseEntity invWarehouseEntity); @@ -95,9 +91,5 @@ public interface InvWarehouseService { List selectInvById(List InvList); - - List selectLowWarehouseAll(String pCode); - - InvWarehouseEntity findOneLevel(String code); } diff --git a/src/main/java/com/glxp/api/service/auth/SysPdaKeyService.java b/src/main/java/com/glxp/api/service/auth/SysPdaKeyService.java index d9b85710..0afadf5d 100644 --- a/src/main/java/com/glxp/api/service/auth/SysPdaKeyService.java +++ b/src/main/java/com/glxp/api/service/auth/SysPdaKeyService.java @@ -16,8 +16,6 @@ public interface SysPdaKeyService { void insertDeviceKey(SysPdaKeyEntity sysPdaKeyEntity); - void updateDeviceKeyByImei(SysPdaKeyEntity sysPdaKeyEntity); - void updateDeviceKey(SysPdaKeyEntity sysPdaKeyEntity); void deleteDeviceKey(DeleteRequest deleteRequest); diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java index e0df1f6c..ae263775 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java @@ -27,13 +27,6 @@ public interface WarehouseBussinessTypeService { */ void saveWarehouseBussinessType(String code, List bussinessTypResponseList); - /** - * 移除仓库信息关联单据类型 - * - * @param id - */ - void deleteWarehouseByssuinessType(Integer id); - boolean deleteByCode(String code); /** diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index 7e216450..c43a385f 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -14,17 +14,15 @@ public interface WarehouseUserService { /** * 查询仓库信息关联的用户数据 * - * @param code 仓位码 + * @param id 仓位码 * @return */ WarehouseUserEntity selectById(Long id); - List getListByCode(String code); List selectCodeByUser(String userId); - List filterWarehouseUsers(FilterInvUserRequest filterInvUserRequest); /** * 新增仓库字典，用户关联数据 @@ -34,15 +32,6 @@ public interface WarehouseUserService { */ void saveWarehouseUser(String code, List userList); - /** - * 设置主管 - * - * @param id - */ - void updateDirector(Long id); - - void updateDirector(WarehouseUserEntity warehouseUserEntity); - /** * 移除关联用户 * @@ -62,8 +51,6 @@ public interface WarehouseUserService { */ List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); - List selectNotSelectUserid(@Param("userIds") List userIds); - /** * 根据分仓编码，统计用户数量 * diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index b153f397..3fbf10ca 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -75,17 +75,6 @@ public class AuthAdminServiceImpl implements AuthAdminService { return authAdmin; } - /** - * 根据 id 获取密码字段 - * - * @param id - * @return - */ - @Override - public AuthAdmin findPwdById(Long id) { - return authAdminDao.findPwdById(id); - } - /** * 新增 * @@ -192,22 +181,6 @@ public class AuthAdminServiceImpl implements AuthAdminService { insertUserRole(userId, roleIds); } - @Override - public void insertUserAuth1(SysUserRole sysUserRole) { - sysUserRoleMapper.insert(sysUserRole); - } - - @Override - public List findByCustomerId(String customerId) { - return authAdminDao.findByCustomerId(customerId); - } - - @Override - public SysUserRole selectByAuthId(Long id) { - return sysUserRoleMapper.selectByAuthId(id); - } - - public void insertUserRole(Long userId, List roleIds) { if (ArrayUtil.isNotEmpty(roleIds)) { // 新增用户与角色管理 diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java index fb023998..e37f8771 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java @@ -30,31 +30,6 @@ public class AuthRoleAdminServiceImpl implements AuthRoleAdminService { return authRoleAdminDao.listByAdminId(adminId); } - /** - * 根据多个 adminId 查询角色列表 - * - * @param adminIds - * @return - */ - @Override - public List listByAdminIdIn(List adminIds) { - if (adminIds.isEmpty()) { - return Collections.emptyList(); - } - return authRoleAdminDao.listByAdminIdIn(adminIds); - } - - /** - * 根据 roleId 获取 管理员id - * - * @param roleId - * @return - */ - @Override - public List listByRoleId(Long roleId) { - return authRoleAdminDao.listByRoleId(roleId); - } - /** * 批量插入 * @@ -94,29 +69,10 @@ public class AuthRoleAdminServiceImpl implements AuthRoleAdminService { return 0; } - /** - * 根据 adminId 删除对应的权限 - * - * @param adminId - * @return - */ - @Override - public boolean deleteByAdminId(Long adminId) { - -// // 删除之前缓存权限规则 -// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId); -// CacheUtils.delete(aarKey); - - return authRoleAdminDao.deleteByAdminId(adminId); - } @Override public boolean updateAuthRoleAdmin(AuthRoleAdmin authRoleAdmin) { return authRoleAdminDao.updateAuthRoleAdmin(authRoleAdmin); } - @Override - public List listAdminRole(Long adminId) { - return authRoleAdminDao.listAdminRole(adminId); - } } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java index 5fb2a185..f02455de 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java @@ -24,75 +24,6 @@ public class AuthRoleServiceImpl implements AuthRoleService { @Resource private BasicBussinessTypeRoleDao basicBussinessTypeRoleDao; - /** - * 查询列表 - * - * @return - */ - @Override - public List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) { - int offset = (authRoleQueryRequest.getPage() - 1) * authRoleQueryRequest.getLimit(); - PageHelper.offsetPage(offset, authRoleQueryRequest.getLimit()); - List list = authRoleDao.listAdminPage(authRoleQueryRequest); - return list; - } - - /** - * 查询管理员页面的列表 - * - * @param page - * @param limit - * @param status - * @return - */ - @Override - public List listAuthAdminRolePage(Integer page, Integer limit, Integer status) { - page = page != null && page > 0 ? page : 1; - limit = limit != null && limit > 0 && limit < 100 ? limit : 100; - int offset = (page - 1) * limit; - PageHelper.offsetPage(offset, limit); - List list = authRoleDao.listAuthAdminRolePage(status); - return list; - } - - /** - * 根据名称查询 - * - * @param name - * @return - */ - @Override - public AuthRole findByName(String name) { - return authRoleDao.findByName(name); - } - - /** - * 插入 - * - * @param authRole - * @return - */ - @Override - public boolean insertAuthRole(AuthRole authRole) { - - authRole.setCreateTime(new Date()); - authRole.setUpdateTime(new Date()); - - return authRoleDao.insertAuthRole(authRole); - } - - /** - * 修改 - * - * @param authRole - * @return - */ - @Override - public boolean updateAuthRole(AuthRole authRole) { - authRole.setUpdateTime(new Date()); - return authRoleDao.updateAuthRole(authRole); - } - @Override public List listCustomerRoles(Integer page, Integer limit, Integer isCustomer) { page = page != null && page > 0 ? page : 1; @@ -113,15 +44,6 @@ public class AuthRoleServiceImpl implements AuthRoleService { return list; } - @Override - public List listAuthRoles2(Integer page, Integer limit) { - page = page != null && page > 0 ? page : 1; - limit = limit != null && limit > 0 && limit < 100 ? limit : 100; - int offset = (page - 1) * limit; - PageHelper.offsetPage(offset, limit); - List list = authRoleDao.listAuthRoles2(); - return list; - } /** * 删除 @@ -134,23 +56,4 @@ public class AuthRoleServiceImpl implements AuthRoleService { return authRoleDao.deleteById(id); } - @Override - public List getBussinessTypeRole(Long roleId) { - return basicBussinessTypeRoleDao.getListByRoleId(roleId); - } - - @Override - public void updateBussinessTypeRole(Long roleId, List actions) { - //删除之前的扫码单据类型授权数据 - basicBussinessTypeRoleDao.deleteByRoleId(roleId); - //添加新的扫码单据数据类型 - List data = new ArrayList<>(actions.size()); - actions.forEach(action -> { - BasicBussinessTypeRoleEntity entity = new BasicBussinessTypeRoleEntity(); - entity.setRole_id(roleId); - entity.setAction(action); - data.add(entity); - }); - basicBussinessTypeRoleDao.insert(data); - } } diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index 21ffddf5..f3538627 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -48,11 +48,6 @@ public class DeptUserServiceImpl implements DeptUserService { return deptUserDao.selectJoinDeptUserKey(filterDeptUserReqeust); } - @Override - public List getDeptById(List ids) { - return deptDao.getDeptById(ids); - } - @Override public List selectJoinDeptUser(FilterDeptUserReqeust filterDeptUserReqeust) { if (filterDeptUserReqeust.getPage() != null) { @@ -64,9 +59,6 @@ public class DeptUserServiceImpl implements DeptUserService { @Override public boolean delete(Long deptId, Long userId) { - - - return deptUserDao.deleteByDept(deptId, userId); } @@ -80,11 +72,6 @@ public class DeptUserServiceImpl implements DeptUserService { return deptUserDao.deleteById(id); } - @Override - public int deleteByList(List ids) { - return deptUserDao.deleteByList(ids); - } - @Override public int insertBatch(List list) { if (CollUtil.isNotEmpty(list)) diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java index f68d8822..9534bc2a 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java @@ -50,19 +50,6 @@ public class InvBusUserServiceImpl extends ServiceImpl filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) { - if (filterInvBusUserRequest == null) { - return Collections.emptyList(); - } - if (filterInvBusUserRequest.getPage() != null) { - int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit()); - } - return invBusUserDao.filterJoinInvBusUser(filterInvBusUserRequest); - } - @Override public List selectByUnion(String userId, String subInvCode) { @@ -99,21 +86,10 @@ public class InvBusUserServiceImpl extends ServiceImpl selectedCodes) { - if (CollectionUtils.isEmpty(selectedCodes) || StrUtil.isEmpty(subInvCode)) { - return false; - } - return invBusUserDao.deleteByscAction(subInvCode, selectedCodes); - } @Override public boolean isExitByAction(String action) { return invBusUserDao.exists(new QueryWrapper().eq("scAction", action)); } - @Override - public boolean exitBus(String userId, String action) { - return invBusUserDao.exists(new QueryWrapper().eq("userId", userId).eq("scAction", action)); - } } diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index e1350e8a..d84b198d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -65,11 +65,6 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return invWarehouseDao.getByWarePcode(parentCode); } - @Override - public List getByWarePId(String parentId) { - return invWarehouseDao.getByWarePId(parentId); - } - @Override public List filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { if (filterInvSubWarehouseRequest == null) { @@ -134,11 +129,6 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return invWarehouseDao.deleteById(id); } - @Override - public boolean deleteByParentCode(String code) { - return invWarehouseDao.deleteByParentCode(code); - } - @Override public boolean checkDuplicateName(String parentId, String name) { int count = invWarehouseDao.countByParentIdAndName(parentId, name); @@ -256,11 +246,6 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return invWarehouseDao.selectInvById(InvList); } - @Override - public List selectLowWarehouseAll(String pCode) { - return invWarehouseDao.selectLowWarehouseAll(pCode); - } - @Override public InvWarehouseEntity findOneLevel(String code) { int index = 1; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index 4ccded5b..c5cd7a33 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -35,19 +35,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService { } - @Override - public String selectDictLabel(String dictType, String dictValue) { - - SysDictDataRequest sysDictDataRequest = new SysDictDataRequest(); - sysDictDataRequest.setDictType(dictType); - sysDictDataRequest.setDictValue(dictValue); - List dictData = baseMapper.selectDictDataList(sysDictDataRequest); - if (CollUtil.isNotEmpty(dictData)) - return dictData.get(0).getDictLabel(); - else - return null; - } - @Override public SysDictData selectDictDataById(Long dictCode) { return baseMapper.selectById(dictCode); diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index 1d1c6998..d5692cd7 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -73,22 +73,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { return baseMapper.selectById(dictId); } - /** - * 根据字典类型查询信息 - * - * @param dictType 字典类型 - * @return 字典类型 - */ - @Override - public SysDictType selectDictTypeByType(String dictType) { - SysDictTypeRequest sysDictTypeRequest = new SysDictTypeRequest(); - sysDictTypeRequest.setDictType(dictType); - List sysDictTypes = baseMapper.selectDictTypeList(sysDictTypeRequest); - if (CollUtil.isNotEmpty(sysDictTypes)) { - return sysDictTypes.get(0); - } else - return null; - } /** * 批量删除字典类型信息 @@ -111,12 +95,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { baseMapper.deleteBatchIds(Arrays.asList(dictIds)); } - /** - * 重置字典缓存数据 - */ - @Override - public void resetDictCache() { - } /** * 新增保存字典类型信息 @@ -173,68 +151,5 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { return Constant.UNIQUE; } - /** - * 根据字典类型和字典值获取字典标签 - * - * @param dictType 字典类型 - * @param dictValue 字典值 - * @param separator 分隔符 - * @return 字典标签 - */ - @Override - public String getDictLabel(String dictType, String dictValue, String separator) { - StringBuilder propertyString = new StringBuilder(); - List datas = selectDictDataByType(dictType); - - if (StringUtils.containsAny(dictValue, separator) && CollUtil.isNotEmpty(datas)) { - for (SysDictData dict : datas) { - for (String value : dictValue.split(separator)) { - if (value.equals(dict.getDictValue())) { - propertyString.append(dict.getDictLabel() + separator); - break; - } - } - } - } else { - for (SysDictData dict : datas) { - if (dictValue.equals(dict.getDictValue())) { - return dict.getDictLabel(); - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } - - /** - * 根据字典类型和字典标签获取字典值 - * - * @param dictType 字典类型 - * @param dictLabel 字典标签 - * @param separator 分隔符 - * @return 字典值 - */ - @Override - public String getDictValue(String dictType, String dictLabel, String separator) { - StringBuilder propertyString = new StringBuilder(); - List datas = selectDictDataByType(dictType); - - if (StringUtils.containsAny(dictLabel, separator) && CollUtil.isNotEmpty(datas)) { - for (SysDictData dict : datas) { - for (String label : dictLabel.split(separator)) { - if (label.equals(dict.getDictLabel())) { - propertyString.append(dict.getDictValue() + separator); - break; - } - } - } - } else { - for (SysDictData dict : datas) { - if (dictLabel.equals(dict.getDictLabel())) { - return dict.getDictValue(); - } - } - } - return StringUtils.stripEnd(propertyString.toString(), separator); - } } diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java index f4fd660e..6123f150 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java @@ -48,11 +48,6 @@ public class SysPdaKeyServiceImpl implements SysPdaKeyService { sysPdaKeyDao.insertDeviceKey(sysPdaKeyEntity); } - @Override - public void updateDeviceKeyByImei(SysPdaKeyEntity sysPdaKeyEntity) { - sysPdaKeyDao.updateDeviceKeyByImei(sysPdaKeyEntity); - } - @Override public void updateDeviceKey(SysPdaKeyEntity sysPdaKeyEntity) { sysPdaKeyDao.updateDeviceKey(sysPdaKeyEntity); diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java index 023927b5..7ea78c5d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java @@ -74,13 +74,6 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType } } - @Override - public void deleteWarehouseByssuinessType(Integer id) { - if (null != id) { - warehouseBussinessTypeDao.deleteById(id); - } - } - @Override public boolean deleteByCode(String code) { return warehouseBussinessTypeDao.deleteByCode(code); diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index ac6c4387..2f05ed93 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -38,34 +38,12 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { return null; } - @Override - public List getListByCode(String code) { - List warehouseUserEntities = warehouseUserDao.selectListByCode(code); - if (CollUtil.isEmpty(warehouseUserEntities)) { - return Collections.emptyList(); - } - return warehouseUserEntities; - } @Override public List selectCodeByUser(String userId) { return warehouseUserDao.selectCodeByUser(userId); } - @Override - public List filterWarehouseUsers(FilterInvUserRequest filterInvUserRequest) { - if (filterInvUserRequest == null) { - return Collections.emptyList(); - } - if (filterInvUserRequest.getPage() != null) { - int offset = (filterInvUserRequest.getPage() - 1) * filterInvUserRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvUserRequest.getLimit()); - } - - return warehouseUserDao.filterList(filterInvUserRequest); - } - - @Override public void saveWarehouseUser(String code, List userList) { if (CollUtil.isNotEmpty(userList)) { @@ -81,25 +59,6 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { warehouseUserDao.insertBatch(warehouseUserEntities); } } - - @Override - public void updateDirector(Long id) { - if (null != id) { - WarehouseUserEntity warehouseUserEntity = warehouseUserDao.selectByPrimaryKey(id); - warehouseUserDao.updateDirector(warehouseUserEntity.getCode(), 0); - warehouseUserDao.updateDirectorById(id, 1); - } - } - - @Override - public void updateDirector(WarehouseUserEntity warehouseUserEntity) { - int value = 0; - if (warehouseUserEntity.isDirector()) { - value = 1; - } - warehouseUserDao.updateDirectorById(warehouseUserEntity.getId(), value); - } - @Override public void deleteWarehouseUser(Long id) { if (null != id) { @@ -130,12 +89,6 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } return warehouseUserDao.selectListkey(filterInvLinkDataRequest); } - - @Override - public List selectNotSelectUserid(List userIds) { - return warehouseUserDao.selectNotSelectUserid(userIds); - } - @Override public Integer countUserBySubInvCode(String subInvCode) { return warehouseUserDao.countByCode(subInvCode); diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index 60172288..a20c637e 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -30,149 +30,9 @@ public class BasicBackUpdateProductService { @Resource UdiRelevanceService udiRelevanceService; @Resource - UdiProductService udiProductService; - @Resource ThrProductsService thrProductsService; @Resource - SystemParamConfigService systemParamConfigService; - @Resource - ThrSystemService thrSystemService; - @Resource - private ErpBasicClient erpBasicClient; - @Resource RedisUtil redisUtil; - @Resource - GennerOrderUtils gennerOrderUtils; - - //定时或一键下载更新全部线上产品信息 - @Async - public void addAllProducts(FilterThrProductsRequest filterThrProductsRequest, String productUrl, String onHandUrl, String thirdSysId, Boolean isEnable) { - int page = 1; - if (filterThrProductsRequest == null) { - filterThrProductsRequest = new FilterThrProductsRequest(); - } - filterThrProductsRequest.setPage(1); - filterThrProductsRequest.setLimit(100); - while (page != -1) { - page = getAllProducts(filterThrProductsRequest, productUrl, onHandUrl, thirdSysId, isEnable); - } - } - - //定时或一键下载更新全部线上产品信息 - public int getAllProducts(FilterThrProductsRequest filterThrProductsRequest, String productUrl, String - onHandUrl, String thirdSysId, Boolean isEnable) { - - BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterThrProductsRequest); - List invmandocResponses = erpProducts.getData().getList(); - SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type"); - if (isEnable == null || isEnable == false) { - isUpdate.setParamValue("1"); - } - Map erpProductsMap = new HashMap<>(); - if (invmandocResponses != null && invmandocResponses.size() > 0) { - List inventoryCodes = new ArrayList<>(); -// if (filterThrProductsRequest.getCode() != null) { -// inventoryCodes.add(filterThrProductsRequest.getCode()); -// erpProductsMap.put(filterThrProductsRequest.getCode(), invmandocResponses.get(0)); -// } else { - for (ThrProductsResponse invmandocResponse : invmandocResponses) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode(), thirdSysId); - if (udiRelevanceEntity == null) { - inventoryCodes.add(invmandocResponse.getCode()); - erpProductsMap.put(invmandocResponse.getCode(), invmandocResponse); - if (isUpdate.getParamValue().equals("1")) {//不根据库存信息过滤 - UdiProductEntity udiProductEntity = new UdiProductEntity(); - udiProductEntity.setNameCode(invmandocResponse.getCode()); - udiProductEntity.setCpmctymc(invmandocResponse.getName()); - udiProductEntity.setGgxh(invmandocResponse.getSpec()); - udiProductEntity.setUuid(CustomUtil.getUUId()); - udiProductEntity.setDiType(1); - udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); - udiProductEntity.setManufactory(invmandocResponses.get(0).getManufactory()); - udiProductEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getManufactory()); - udiProductEntity.setZczbhhzbapzbh(invmandocResponses.get(0).getRegisterNo()); - udiProductService.insertUdiInfo(udiProductEntity); - UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - udiRelevanceEntity1.setUuid(udiProductEntity.getUuid()); - if ("thirdId".equals(thirdSysId)) { - udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); - } else if ("thirdId1".equals(thirdSysId)) { - udiRelevanceEntity1.setThirdId1(invmandocResponse.getCode()); - } else if ("thirdId2".equals(thirdSysId)) { - udiRelevanceEntity1.setThirdId4(invmandocResponse.getCode()); - } else if ("thirdId3".equals(thirdSysId)) { - udiRelevanceEntity1.setThirdId3(invmandocResponse.getCode()); - } else if ("thirdId4".equals(thirdSysId)) { - udiRelevanceEntity1.setThirdId4(invmandocResponse.getCode()); - } - ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); - String mainSys = thrSystemEntity.getThirdId(); - if (mainSys.equals("thirdId")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); - } else if (mainSys.equals("thirdId1")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); - } else if (mainSys.equals("thirdId2")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); - } else if (mainSys.equals("thirdId3")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); - } else if (mainSys.equals("thirdId4")) { - udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); - } - udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); - udiRelevanceEntity1.setUpdateTime(new Date()); - udiRelevanceEntity.setModifyTime(new Date()); - udiRelevanceEntity.setIsDisable(false); - if (udiProductEntity.getDiType() == ConstantStatus.DI_TYPE_SYDY) { - udiRelevanceEntity1.setIsUseDy(true); - } - udiRelevanceEntity1.setId(gennerOrderUtils.getRelId()); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); - } - } - -// } - } - - //若需要对照库存信息 - if (!isUpdate.getParamValue().equals("1")) { -// if (inventoryCodes.size() > 0) { -// ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); -// erpOnhandRequest.setInventoryCodes(inventoryCodes); -// List erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, onHandUrl); -// if (erpOnHandResponses != null) { -// Map> map = erpOnHandResponses.stream().collect(Collectors.groupingBy(ErpInvProductResponse::getCode)); -// for (List onHandResponses : map.values()) { -// if (onHandResponses != null && onHandResponses.size() > 0) { -// ErpInvProductResponse onhandQueryResponse = onHandResponses.get(0); -// if (isUpdate.getParamValue().equals("2")) { -// addRl(onhandQueryResponse, thirdSysId, erpProductsMap); -// } else if (isUpdate.getParamValue().equals("3")) { -// if (onhandQueryResponse.getCount() != null && onhandQueryResponse.getCount() > 0) { -// addRl(onhandQueryResponse, thirdSysId, erpProductsMap); -// } -// } else if (isUpdate.getParamValue().equals("4")) { -// if (onhandQueryResponse.getCount() == null || onhandQueryResponse.getCount() <= 0) { -// addRl(onhandQueryResponse, thirdSysId, erpProductsMap); -// } -// } -// -// } -// } -// } -// } - } - - filterThrProductsRequest.setPage(filterThrProductsRequest.getPage() + 1); - if (filterThrProductsRequest.getPage() * filterThrProductsRequest.getLimit() < erpProducts.getData().getTotal()) { - return filterThrProductsRequest.getPage(); - } - } else { - return -1; - } - - return -1; - } - @Resource UdiContrastService udiContrastService; @@ -181,7 +41,6 @@ public class BasicBackUpdateProductService { @Async public void loadLocal(FilterThrProductsRequest filterThrProductsRequest, String thirdSysId, String onHandUrl, Boolean isEnable) { - if (filterThrProductsRequest == null) { filterThrProductsRequest = new FilterThrProductsRequest(); } @@ -189,12 +48,6 @@ public class BasicBackUpdateProductService { BeanUtils.copyProperties(filterThrProductsRequest, filterThrInvProductsRequest); filterThrInvProductsRequest.setPage(null); List thrProductsEntities = thrProductsService.filterThrProducts(filterThrInvProductsRequest); - -// SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type"); -// if (isEnable == null || isEnable == false) { -// isUpdate.setParamValue("1"); -// } - if (thrProductsEntities != null && thrProductsEntities.size() > 0) { for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), thirdSysId); diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java index 82a432a4..ad552942 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -13,14 +13,10 @@ public interface BasicCorpService extends IService { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); - boolean insertBasicUnitMaintain(BasicCorpEntity basicCorpEntity); - boolean updateById(BasicCorpEntity basicCorpEntity); boolean insert(BasicCorpEntity basicUnitMaintainEntity); -// boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest); - boolean deleteById(String id); BasicCorpEntity selectByThirdId(String thirdId, String thirdSys); @@ -38,8 +34,6 @@ public interface BasicCorpService extends IService { List batchSelectByIds(List id); - List batchSelectByErpIds(List erpIds); - List batchSelectByErpIdsAndName(List erpIds, String name); /** diff --git a/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java b/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java index a186883f..c3bf3cfd 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java @@ -8,13 +8,10 @@ import java.util.List; public interface BasicNewUploadDiService { - List filterNewUploads(FilterBasicNewUploadDiRequest filterBasicNewUploadDiRequest); - boolean deleteById(Integer id); boolean insertNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity); - boolean updateNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity); } diff --git a/src/main/java/com/glxp/api/service/basic/BasicProductsImportDetailService.java b/src/main/java/com/glxp/api/service/basic/BasicProductsImportDetailService.java index cceb5fd0..cb802880 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicProductsImportDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicProductsImportDetailService.java @@ -18,8 +18,6 @@ public interface BasicProductsImportDetailService { boolean updateUdiInfoImport(BasicProductsImportDetailEntity udiInfoImportEntity); - boolean insertUdiInfoImports(List udiInfoImportEntities); - boolean deleteById(String id); boolean deleteByGenkey(String genKey); diff --git a/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java b/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java index b4b459fb..1a5d37cf 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUnitMaintainService.java @@ -10,24 +10,18 @@ public interface BasicUnitMaintainService { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); - boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity); - boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); boolean updateById(BasicUnitMaintainEntity basicUnitMaintainEntity); boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity); -// boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest); - boolean deleteById(String id); BasicUnitMaintainEntity selectByThirdId(String thirdId, String thirdSys); List batchSelectByIds(List id); - List batchSelectByErpIds(List erpIds); - BasicUnitMaintainEntity selectById(String id); BasicUnitMaintainEntity selectByErpId(String id); diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java index 809a9e6d..b711ed6a 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java @@ -17,8 +17,6 @@ public interface CompanyProductRelevanceService extends IService { int insertEntrustRec(EntrustReceEntity entrustReceEntity); - boolean replaceEntrustRec(EntrustReceEntity entrustReceEntity); - boolean deleteById(String id); boolean deleteAll(); diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java index c7e178e6..2cb22a18 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -63,8 +63,6 @@ public interface IBasicBusTypePreService extends IService */ List findByAction(String action); - List findByOiginActions(String originAction); - /** * 查询单据流转列表数据 * diff --git a/src/main/java/com/glxp/api/service/basic/ProductInfoService.java b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java index 961c5afb..15341ff6 100644 --- a/src/main/java/com/glxp/api/service/basic/ProductInfoService.java +++ b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java @@ -9,24 +9,8 @@ import java.util.List; public interface ProductInfoService { - //赋码用 - //获取产品名称通用名称 - List filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); - - List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); - List filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest); - List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest); - - List findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest); - - List filterUdi(ProductInfoFilterRequest productInfoFilterRequest); - List filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest); Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest); @@ -38,20 +22,13 @@ public interface ProductInfoService { List findAll(ProductInfoFilterRequest productInfoFilterRequest); - List selectByUpdateTime(String startDate, String endDate);//按更新时间查询 - - boolean insertProductInfo(ProductInfoEntity productInfoEntity); - boolean insertProductInfos(List productInfoEntities); - boolean updateProductByUuid(ProductInfoEntity productInfoEntity); boolean deleteById(String id); boolean deleteAll(List ids); - boolean updateProductInfo(ProductInfoEntity productInfoEntity); - ProductInfoEntity findByNameCode(String nameCode); diff --git a/src/main/java/com/glxp/api/service/basic/SyncUdiService.java b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java index 5908fa66..91ddf53e 100644 --- a/src/main/java/com/glxp/api/service/basic/SyncUdiService.java +++ b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java @@ -63,8 +63,6 @@ public class SyncUdiService { return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称"); } } - - if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals("")) && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals("")) && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals("")) @@ -129,39 +127,10 @@ public class SyncUdiService { return ResultVOUtils.error(500, "请输入完整的最小销售单元标识！"); } } - -// if (StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc()) && StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) { -// if (StrUtil.isNotEmpty(productInfoFilterRequest.getCpmctymc())) { -// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称"); -// } -// if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) { -// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称"); -// } -// if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) { -// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称"); -// } -// } - - -// if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals("")) -// && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals("")) -// && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals("")) -// -// ) { -// if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) { -// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称"); -// } -// if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) { -// return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称"); -// } -// } - if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) { return ResultVOUtils.error(500, "请输入完整的产品通用名称！"); } productInfoFilterRequest.setIsNewest(1); -// productInfoFilterRequest.setDiType("1"); - String keyCache = productInfoFilterRequest.toCacheKey(); if (StrUtil.isEmpty(keyCache)) { return ResultVOUtils.error(500, "查询条件不能为空！"); diff --git a/src/main/java/com/glxp/api/service/basic/UdiCompanyService.java b/src/main/java/com/glxp/api/service/basic/UdiCompanyService.java index 63b79b48..346f18f3 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiCompanyService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiCompanyService.java @@ -8,21 +8,15 @@ import java.util.List; public interface UdiCompanyService { - List selectAllTyshxyh(); - List syncDlCompany(UdiCompanyRequest udiCompanyRequest); List filterUdiCompany(UdiCompanyRequest udiCompanyRequest); - boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity); - boolean insertUdiCompanys(List udiCompanyEntities); boolean deleteById(String id); boolean deleteAll(List ids); - boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity); - } diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index db91c955..0f581d42 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -74,12 +74,6 @@ public class UdiContrastService { BasicInsMaterialService basicInsMaterialService; @Resource YbDrugService ybDrugService; - @Resource - private CustomerService customerService; - @Resource - private CustomerInfoService customerInfoService; - @Resource - private AlihealthUtils alihealthUtils; @Value("${UDI_SERVER_URL}") private String udiUrl; @Resource @@ -232,8 +226,6 @@ public class UdiContrastService { .orElse(null); } - @Resource - ThirdAliDrugService thirdAliDrugService; @Resource private AlihealthBusController alihealthBusController; @@ -272,7 +264,6 @@ public class UdiContrastService { } else { return ResultVOUtils.error(500, "未能查询到此医保编码"); -// udiProductEntity.setCpmctymc(thrProductsEntity.getName()); } if (StrUtil.isEmpty(ybDrug.getApprovalCode()) || StrUtil.isEmpty(ybDrug.getRegisteredProductName())) { return ResultVOUtils.success(); @@ -362,44 +353,6 @@ public class UdiContrastService { throw new JsonException(500, "系统繁忙,"); } return ResultVOUtils.success(); -// UdiProductEntity udiProductEntity = new UdiProductEntity(); -// BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); -// if (thrProductsEntity.getProductType() != 2){ -// //不是药品就设置namecode -// udiProductEntity.setNameCode(thrProductsEntity.getCode()); -// udiProductEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); -// udiProductEntity.setPackUnit(thrProductsEntity.getMeasname()); -// udiProductEntity.setGgxh(basicInsMaterialEntity != null ? basicInsMaterialEntity.getSpecification() : thrProductsEntity.getSpec()); -// udiProductEntity.setManufactory(basicInsMaterialEntity != null ? basicInsMaterialEntity.getManufacturerName() : thrProductsEntity.getManufactory()); -// } -// udiProductEntity.setBzgg(thrProductsEntity.getSpec()); -// udiProductEntity.setCpmctymc(thrProductsEntity.getName()); -// udiProductEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); -// -// //包装单位 -// udiProductEntity.setPrepnUnit(thrProductsEntity.getMeasname()); -// udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); -// udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); -// udiProductEntity.setDiType(1); -// udiProductEntity.setScbssfbhph("是"); -// udiProductEntity.setScbssfbhscrq("是"); -// udiProductEntity.setScbssfbhsxrq("是"); -// udiProductEntity.setScbssfbhxlh("否"); -// -// udiProductEntity.setProductsType(thrProductsEntity.getProductType()); -// if (thrProductsEntity.getProductType() == 2){ -// udiProductEntity.setRequireScanCode(1); -// udiProductEntity.setMajorStatus(1); -// }else { -// udiProductEntity.setRequireScanCode(0); -// } -// if (StrUtil.isEmpty(udiProductEntity.getPrice())) { -// udiProductEntity.setPrice(null); -// } -// udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); -// udiProductService.insertUdiInfo(udiProductEntity); -// udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity); -// udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } return ResultVOUtils.success(); @@ -410,8 +363,6 @@ public class UdiContrastService { BeanUtils.copyProperties(thrProductsEntity, udiProductEntity); // 数据处理 udiProductEntity.setId(IdUtil.getSnowflakeNextId()); -// udiProductEntity.setNameCode(thrProductsEntity.getCode()); - udiProductEntity.setUuid(udiRelevanceEntity.getUuid()); udiProductEntity.setDiType(1); udiProductEntity.setScbssfbhph("是"); @@ -429,16 +380,10 @@ public class UdiContrastService { } udiProductEntity.setUpdateTime(new Date()); udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity); - // 数据做处理好查询阿里接口 批准文号现在不做处理了 -// if (ybDrug.getApprovalCode().contains("(")) { -// String[] charArr = ybDrug.getRegisteredProductName().split("\\("); -// ybDrug.setApprovalCode(charArr[0]); -// } udiProductEntity.setPrepnSpec(ybDrug.getRealityOutlook()); udiProductEntity.setZczbhhzbapzbh(ybDrug.getApprovalCode()); udiProductEntity.setCpmctymc(ybDrug.getRegisteredProductName()); udiProductEntity.setSpmc(ybDrug.getGoodsName()); - udiProductEntity.setBzgg(String.valueOf(ybDrug.getFactor()) + ybDrug.getMinUnit() + "/" + ybDrug.getUnit()); udiProductEntity.setMatrial(ybDrug.getMaterialName()); udiProductEntity.setPackMatrial(ybDrug.getMaterialName()); @@ -516,9 +461,7 @@ public class UdiContrastService { } else { udiProductEntity.setDiType(1); } -// udiProductEntity.setPackUnit(thirdAliDrug.getPackUnitName()); udiProductEntity.setId(IdUtil.getSnowflakeNextId()); - // 多码融合表拼接参数 if (basicProductsCreateDto.isAddCodeRelMark()) { CodeRel codeRel = new CodeRel(); @@ -639,66 +582,6 @@ public class UdiContrastService { } - public List disposeYbDrugList(List thirdAliDrugList, YbDrug ybDrug, List codeIn) { - List list1 = new ArrayList<>(); - String result = null; - if (codeIn != null && codeIn.size() > 0) { - result = String.join(", ", codeIn); - - } - if (thirdAliDrugList != null && thirdAliDrugList.size() > 0) { - // List list2 = new ArrayList<>(); - for (ThirdAliDrug thirdAliDrug : thirdAliDrugList) { - String str = drugRulesVerify(ybDrug, thirdAliDrug); - if (StringUtils.isNotEmpty(str)) { - if (str.equals("1")) { - if (StringUtils.isNotEmpty(result)) { - if (!result.contains(thirdAliDrug.getNameCode())) { - list1.add(thirdAliDrug); - } - } else { - list1.add(thirdAliDrug); - - } - } - } - } -// if(list1 !=null && list1.size() >0){ -// return list1; -// }else if(list2 !=null && list2.size() >0){ -// return list2; -// } - } - - return list1; - } - - public String drugRulesVerify(YbDrug ybDrug, ThirdAliDrug thirdAliDrug) { - try { - Integer bzggInt = DimaUtil.trMinCount(thirdAliDrug.getBzgg()); - - // 医保规格和阿里制剂规格双方都去除特殊符号和空格之后进行精准匹配 - String realityOutlook = DimaUtil.specialCharactersRemover(ybDrug.getRealityOutlook()); - String formSpec = DimaUtil.specialCharactersRemover(thirdAliDrug.getFormSpec()); - - - // 按照医保数量与阿里包装规格对比 - if ((bzggInt == ybDrug.getFactor()) && realityOutlook.equals(formSpec)) { - return "1"; - } - -// // 医保的规格与阿里制剂规格完全匹配 -// if(thirdAliDrug.getFormSpec().equals(ybDrug.getRealityOutlook())){ -// return "3"; -// } - } catch (Exception e) { - log.error("药品校验出现错误===" + e.getMessage()); - return null; - } - return null; - - } - public void createOnlyApply(ThrProductsAddDiEntity thrProductsAddDiEntity) { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index b5f5455d..9bafc57a 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -22,8 +22,6 @@ public interface UdiProductService { UdiProductEntity findBySptm(String sptm); - List filterUdiInfo2(FilterUdiRelRequest filterUdiRelRequest); - List filterAllUdiInfo(FilterUdiRelRequest filterUdiRelRequest); UdiProductEntity findByNameCode(String nameCode); @@ -63,13 +61,6 @@ public interface UdiProductService { boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest); - /** - * 根据DI查询此产品是否允许无批次号 - * - * @param nameCode - * @return - */ - UdiProductEntity getAllowNoBatch(String nameCode); AddProductRequest addDrug(AddProductRequest addProductRequest); diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index 626687ff..a535bcd7 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -20,8 +20,6 @@ public interface UdiRelevanceService extends IService { List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); - List filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest); - UdiRelevanceResponse selectByNameCode(String nameCode); /** @@ -42,7 +40,6 @@ public interface UdiRelevanceService extends IService { List filterUdiGp(FilterUdiRelRequest filterUdiRelRequest); - boolean isExitByUuid(String uuid); List batchSelectByUuid(List uuids); @@ -62,8 +59,6 @@ public interface UdiRelevanceService extends IService { UdiRelevanceEntity selectUpdateByThirdId(String thirdId); - UdiRelevanceEntity selectByMainIdLimitOne(String mainId); - List selectByMainId(String mainId); UdiRelevanceResponse selectByMainIdOne(String mainId); @@ -76,8 +71,6 @@ public interface UdiRelevanceService extends IService { boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); - boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); - boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean deleteById(String id); @@ -86,14 +79,6 @@ public interface UdiRelevanceService extends IService { boolean deleteByUuid(String uuid); - /** - * 查询产品的uuid - * - * @param relId - * @return - */ - String findUuidById(String relId); - List selectGroupByNameCode(String nameCode, Boolean isDisable); @@ -105,8 +90,6 @@ public interface UdiRelevanceService extends IService { */ String getRelIdByUdiCode(String code); - Integer findPurType(Long relId); - UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity); UdiProductEntity getDiProduct(List udiInfoEntities); diff --git a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java index f13fabdd..3433337b 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRlSupService.java @@ -16,8 +16,6 @@ public interface UdiRlSupService { UdiRlSupEntity findCompanyProductRelevance(String CustomerId); - UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId); - UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId); UdiRlSupEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk); @@ -30,14 +28,10 @@ public interface UdiRlSupService { int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity); - int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity); - boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity); boolean deleteById(String id); - boolean deleteByRlId(String id); - /** * 查询供应商是否存在此配送产品 * diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java index 24fee631..64213f79 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -65,11 +65,6 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl findByOiginActions(String originAction) { - return basicBusTypePreDao.findByAction(null, originAction); - } - @Override public List filterBusTypePreResList(FilterBusTypePreRequest filterBusTypePreRequest) { if (null == filterBusTypePreRequest) { diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 599488b7..dbae519f 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -44,11 +44,6 @@ public class BasicCorpServiceImpl extends ServiceImpl batchSelectByErpIds(List erpIds) { - return basicCorpDao.batchSelectByErpIds(erpIds); - } - @Override public List batchSelectByErpIdsAndName(List erpIds, String name) { return basicCorpDao.batchSelectByErpIdsAndName(erpIds, name); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java index b165eca7..0a922929 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java @@ -18,20 +18,6 @@ public class BasicNewUploadDiServiceImpl implements BasicNewUploadDiService { @Resource BasicNewUploadDiDao newUploadDiDao; - @Override - public List filterNewUploads(FilterBasicNewUploadDiRequest filterNewUploadDiRequest) { - - if (filterNewUploadDiRequest == null) { - return Collections.emptyList(); - } - if (filterNewUploadDiRequest.getPage() != null) { - int offset = (filterNewUploadDiRequest.getPage() - 1) * filterNewUploadDiRequest.getLimit(); - PageHelper.offsetPage(offset, filterNewUploadDiRequest.getLimit()); - } - List data = newUploadDiDao.filterNewUploads(filterNewUploadDiRequest); - return data; - } - @Override public boolean deleteById(Integer id) { return newUploadDiDao.deleteById(id); @@ -41,9 +27,4 @@ public class BasicNewUploadDiServiceImpl implements BasicNewUploadDiService { public boolean insertNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity) { return newUploadDiDao.insertNewUploadDi(newUploadDiEntity); } - - @Override - public boolean updateNewUploadDi(BasicNewUploadDiEntity newUploadDiEntity) { - return newUploadDiDao.updateNewUploadDi(newUploadDiEntity); - } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java index 6b79eb11..6a8edd46 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java @@ -31,12 +31,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport @Resource BasicProductsImportDetailDao udiInfoImportDao; @Resource - UdiProductDao udiProductDao; - @Resource - UdiRelevanceDao udiRelevanceDao; - @Resource - ThrProductsDao thrProductsDao; - @Resource SqlSessionFactory sqlSessionFactory; @Override @@ -64,11 +58,6 @@ public class BasicProductsImportDetailServiceImpl implements BasicProductsImport return udiInfoImportDao.updateUdiInfoImport(udiInfoImportEntity); } - @Override - public boolean insertUdiInfoImports(List udiInfoImportEntities) { - return udiInfoImportDao.insertUdiInfoImports(udiInfoImportEntities); - } - @Override public boolean deleteById(String id) { return udiInfoImportDao.deleteById(id); diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java index ea308c56..9d989fdb 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -33,11 +33,6 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { return data; } - @Override - public boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity) { - return basicUnitMaintainDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity); - } - @Override public boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity) { return basicUnitMaintainDao.insertBasicUnitMaintain(basicUnitMaintainEntity); @@ -83,11 +78,6 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { return basicUnitMaintainDao.batchSelectByIds(ids); } - @Override - public List batchSelectByErpIds(List erpIds) { - return basicUnitMaintainDao.batchSelectByErpIds(erpIds); - } - @Override public BasicUnitMaintainEntity selectById(String id) { return basicUnitMaintainDao.selectById(id); diff --git a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java index ef595de4..adb940a2 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -59,12 +59,6 @@ public class CompanyProductRelevanceServiceImpl extends ServiceImpl().eq("udiRlIdFk", relId)); diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index 659daf63..19c85b04 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -96,11 +96,6 @@ public class EntrustReceServiceImpl extends ServiceImpl filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) { - if (productInfoFilterRequest == null) { - return Collections.emptyList(); - } - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - List data = productInfoDao.filterCpmctymc(productInfoFilterRequest); - return data; - } - - @Override - public List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest) { - if (productInfoFilterRequest == null) { - return Collections.emptyList(); - } - if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - } - - List data = productInfoDao.filterProductInfo(productInfoFilterRequest); - return data; - } - @Override public List filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest) { if (productInfoFilterRequest == null) { @@ -61,61 +36,6 @@ public class ProductInfoServiceImpl implements ProductInfoService { return data; } - @Override - public List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) { - - if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - } - return productInfoDao.filterUdiByTyshxydm(productInfoFilterRequest); - - } - - @Override - public List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest) { - if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - } - return productInfoDao.filterUdiByCreditNo(productInfoFilterRequest); - } - - @Override - public List filterUdiByNewest(ProductInfoFilterRequest productInfoFilterRequest) { - if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - } - return productInfoDao.filterUdiByNewest(productInfoFilterRequest); - } - - @Override - public List findAllByUuid(ProductInfoFilterRequest productInfoFilterRequest) { - if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - } - List uuids = productInfoDao.filterUuidByCreditNo(productInfoFilterRequest); - if (uuids != null && uuids.size() > 0) - return productInfoDao.selectAllByUuid(uuids); - else - return null; - } - - @Override - public List filterUdi(ProductInfoFilterRequest productInfoFilterRequest) { - if (productInfoFilterRequest == null) { - return Collections.emptyList(); - } - if (productInfoFilterRequest.getPage() != null) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); - } - - List data = productInfoDao.filterUdi(productInfoFilterRequest); - return data; - } @Override public List filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest) { @@ -177,26 +97,11 @@ public class ProductInfoServiceImpl implements ProductInfoService { return productInfoDao.selectByUpdateTime(startDate, endDate); } - @Override - public boolean insertProductInfo(ProductInfoEntity productInfoEntity) { - return productInfoDao.insertProductInfo(productInfoEntity); - } - @Override public boolean insertProductInfos(List productInfoEntities) { return productInfoDao.insertProductInfos(productInfoEntities); } - @Override - public boolean updateProductByUuid(ProductInfoEntity productInfoEntity) { - return productInfoDao.updateProductByUuid(productInfoEntity); - } - - @Override - public boolean updateProductInfo(ProductInfoEntity productInfoEntity) { - return productInfoDao.updateProductInfo(productInfoEntity); - } - @Override public ProductInfoEntity findByNameCode(String nameCode) { diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java index d441399c..8839d076 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java @@ -18,11 +18,6 @@ public class UdiCompanyServiceImpl implements UdiCompanyService { @Resource UdiCompanyDao udiCompanyDao; - @Override - public List selectAllTyshxyh() { - return udiCompanyDao.selectAllTyshxyh(); - } - @Override public List syncDlCompany(UdiCompanyRequest udiCompanyRequest) { int offset = (udiCompanyRequest.getPage() - 1) * udiCompanyRequest.getLimit() + 1; @@ -40,11 +35,6 @@ public class UdiCompanyServiceImpl implements UdiCompanyService { return udiCompanyDao.filterUdiCompany(udiCompanyRequest); } - @Override - public boolean insertUdiCompany(UdiCompanyEntity udiCompanyEntity) { - return udiCompanyDao.insertUdiCompany(udiCompanyEntity); - } - @Override public boolean insertUdiCompanys(List udiCompanyEntities) { return udiCompanyDao.insertUdiCompanys(udiCompanyEntities); @@ -60,8 +50,4 @@ public class UdiCompanyServiceImpl implements UdiCompanyService { return udiCompanyDao.deleteAll(ids); } - @Override - public boolean updateUdiCompany(UdiCompanyEntity udiCompanyEntity) { - return udiCompanyDao.updateUdiCompany(udiCompanyEntity); - } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 4268f993..40883d73 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -89,20 +89,6 @@ public class UdiProductServiceImpl implements UdiProductService { return null; } - @Override - public List filterUdiInfo2(FilterUdiRelRequest filterUdiRelRequest) { - if (filterUdiRelRequest == null) { - return Collections.emptyList(); - } - if (filterUdiRelRequest.getPage() != null) { - int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); - } - - List data = udiProductDao.filterUdiInfo2(filterUdiRelRequest); - return data; - } - @Override public List filterAllUdiInfo(FilterUdiRelRequest filterUdiRelRequest) { if (filterUdiRelRequest == null) { @@ -265,12 +251,6 @@ public class UdiProductServiceImpl implements UdiProductService { return udiProductDao.updateUdiInfoNotAll(udiInfoRequest); } - @Override - public UdiProductEntity getAllowNoBatch(String nameCode) { - String di = FilterUdiUtils.getDiStr(nameCode); - return udiProductDao.selectAllowNoBatch(di); - } - @Value("${UDI_SERVER_URL}") private String udiUrl; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 823e99bd..5f19f061 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -74,14 +74,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest) { - - List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); - return data; - } - @Override public List selectAllByNameCode(String nameCode) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); @@ -161,16 +153,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); return data; } - - @Override - public boolean isExitByUuid(String uuid) { - List udiRelevanceEntities = udiRelevanceDao.selectByUuid(uuid); - if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { - return true; - } - return false; - } - @Override public List batchSelectByUuid(List uuids) { return udiRelevanceDao.batchSelectByUuid(uuids); @@ -256,17 +238,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl selectByMainId(String mainId) { FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); @@ -359,10 +330,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl selectGroupByNameCode(String nameCode, Boolean isDisable) { return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable); @@ -417,12 +378,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl().select("purType").eq("id", relId).last("limit 1")); - return IntUtil.value(udiRelevanceEntity.getPurType()); - } - @Override public UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity) { if (udiProductEntity != null) { diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java index 76be752c..6f09aa7d 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java @@ -64,11 +64,6 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { return companyEntities; } - @Override - public UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId) { - return udiRlSupDao.findCompanyProductRelevanceByProductId(productId); - } - @Override public UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId) { return udiRlSupDao.findCompanyProductRelevanceByUdiRlIdFk(udiRlIdFk, customerId); @@ -104,12 +99,6 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { return udiRlSupDao.updateById(udiRlSupEntity); } - @Override - public int updateCompanyProductRelevanceByUdiFk(UdiRlSupEntity companyCertEntity) { - QueryWrapper ew = new QueryWrapper<>(); - ew.eq("udiRlIdFk", companyCertEntity.getUdiRlIdFk()); - return udiRlSupDao.update(companyCertEntity, ew); - } @Override public boolean insertCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) { @@ -120,12 +109,6 @@ public class UdiRlSupServiceImpl implements UdiRlSupService { public boolean deleteById(String id) { return udiRlSupDao.deleteById(id); } - - @Override - public boolean deleteByRlId(String id) { - return udiRlSupDao.deleteByRlId(id); - } - @Override public boolean findExist(CompanyProductRelevanceRequest companyProductRelevanceRequest) { Long count = udiRlSupDao.selectSupRlCount(companyProductRelevanceRequest); diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index d730fb58..09e26191 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -705,8 +705,6 @@ public class RelCodeBatchService extends ServiceImpl { - /** - * 变更设备归属，同时将状态改为正常 - * - * @param deviceCode 设备码 - * @param oldDeptCode 原部门 - * @param toDeptCode 目标部门 - * @param orderId 变更单id - */ - void changeDept(String deviceCode, String oldDeptCode, String toDeptCode, Long orderId); - /** * 修改设备状态 * @@ -94,12 +84,8 @@ public interface DeviceInfoService extends IService { List detail(DeviceInfoDetailByDeptCodeQuery query); - List listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status); - List listVoByCodes(List deviceCodes, String deptCode, List status); - boolean exitOrder(Long orderId, String deviceCode); - String genDeviceCode(); boolean updateOrderItem(DeviceInfoEntity entity); diff --git a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java index 1d935c05..b7318a54 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceUpkeepService.java @@ -33,14 +33,4 @@ public interface DeviceUpkeepService extends IService { List pageListDetail(DeviceUpkeepQuery query); - /** - * 完成一个保养设备 - * - * @param taskId 任务id - * @param deviceCode 设备编码 - * @return - */ -// void finishDevice(Long taskId, String deviceCode); - -// void finishUpkeep(String deviceCode, String deptCode, Long taskId, AuthAdmin user); } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java index d9248a55..4d632ff6 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java @@ -30,24 +30,6 @@ import java.util.List; public class DeviceInfoServiceImpl extends ServiceImpl implements DeviceInfoService { - @Override - @Transactional - public void changeDept(String deviceCode, String oldDeptCode, String toDeptCode, Long orderId) throws JsonException { - boolean updated = super.update(Wrappers.lambdaUpdate(DeviceInfoEntity.class) - .setSql("changeCount = changeCount +1") - .set(DeviceInfoEntity::getDeptCode, toDeptCode) - .set(DeviceInfoEntity::getLastChangeOrderId, orderId) - .set(DeviceInfoEntity::getStatus, DeviceStatusEnum.NORMAL) - .set(DeviceInfoEntity::getUpdateTime,LocalDateTime.now()) - .eq(DeviceInfoEntity::getDeptCode, oldDeptCode) - .eq(DeviceInfoEntity::getDeviceCode, deviceCode) - .eq(DeviceInfoEntity::getStatus, DeviceStatusEnum.CHANGE) - ); - if (!updated) { - throw new JsonException(String.format("设备[%s]变更归属失败，变更需要设备状态为[%s]且部门信息通过验证", deviceCode, DeviceStatusEnum.CHANGE.getDesc())); - } - } - @Override @Transactional public void changeStatus(String deviceCode, String deptCode, DeviceStatusEnum oldStatus, DeviceStatusEnum toStatus) throws JsonException { @@ -177,16 +159,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl listVoByProductIdAndStatus(Long productId, DeviceStatusEnum status) { - - List list = super.baseMapper.listVoByProductIdAndStatus(productId, status); -// List list = super.list(Wrappers.lambdaQuery(DeviceInfoEntity.class) -// .eq(DeviceInfoEntity::getProductId, productId) -// .eq(DeviceInfoEntity::getStatus, status) -// ); - return list; - } @Override public List listVoByCodes(List deviceCodes, String deptCode, List status) { @@ -195,10 +167,6 @@ public class DeviceInfoServiceImpl extends ServiceImpl().eq("deviceCode", deviceCode).ne("lastChangeOrderId", orderId)); - } @Override public String genDeviceCode() { diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java index d842f859..202a37bd 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java @@ -45,8 +45,7 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl resultLists = invProductServiceNew.selectByUnique(codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getSupId(), codeEntity.getDeptCode(), codeEntity.getInvCode()); - int invCount = 0; - if (CollUtil.isNotEmpty(resultLists)) { - for (InvProductNewVo invProductDetailEntity : resultLists) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - invCount = invCount - invProductDetailEntity.getReCount(); - } else { - invCount = invCount + invProductDetailEntity.getReCount(); - } - } - } - return invCount; - } - //生成单据 public void buildInOrder(BasicBusTypePreEntity bussinessChangeTypeEntity, List useInList, IoOrderEntity orderEntity, boolean isGenInovice) { @@ -141,7 +116,6 @@ public class IoChangeInoutService { } else { // 原先单据流程 filterSupMaps.put("test", useInList); -// filterSupMaps.put(bussinessChangeTypeEntity.getDefaultInvCode(), useInList); } //根据往来单位生成入库单 for (String corpName : filterSupMaps.keySet()) { diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index e8883402..a092fb25 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -80,8 +80,6 @@ public class IoCheckInoutService { @Resource IoOrderDetailCodeDao orderDetailCodeDao; - @Resource - InvPreinDetailService invPreinDetailService; @Resource IoGenInvService genInvService; @Resource @@ -229,39 +227,6 @@ public class IoCheckInoutService { } } - /** - * code列表中 有序列号的 进行唯一校验 - * 1、查找出临时code中 有 序列号的 code集合 - * 2、在正式code表里 对code分组sum库存 前提是 在待校验code集合中 校验出库存大于0抛出异常 - */ - private void serialNoUniquenessVerification(List codeTempEntities) { - if (CollUtil.isNotEmpty(codeTempEntities)) { - List codes = new ArrayList<>(codeTempEntities.size()); - codeTempEntities.stream().forEach(x -> { - if (StrUtil.isNotBlank(x.getSerialNo())) { - codes.add(x.getCode()); - } - }); - - if (CollUtil.isNotEmpty(codes)) { - //正式code表里 对code分组sum实际库存数量 - List codeSumReCountList = codeService.findByCodeSumReCount(codes); - if (codeSumReCountList.size() > 0) { - StringBuilder msg = new StringBuilder(); - codeSumReCountList.forEach(x -> { - if (x.getReCount() > 0) { - msg.append(x.getCode() + ","); - } - }); - if (StrUtil.isNotEmpty(msg)) { - msg.deleteCharAt(msg.length() - 1); - throw new JsonException(500, "产品UDI码：" + msg + "存库唯一性校验不通过！"); - } - } - } - } - - } @Resource IoCodeLostService codeLostService; @@ -490,10 +455,6 @@ public class IoCheckInoutService { checkThird(orderEntity); } - @Resource - IoOrderInvoiceService orderInvoiceService; - - //一次校验完成 public void checkFirstFinish(IoOrderEntity orderEntity, List codeTempEntities) { List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo()); diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 523c316f..566080ec 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -28,8 +28,6 @@ public class IoGenInvService { @Resource InvProductService invProductService; @Resource - InvProductServiceNew invProductServiceNew; - @Resource InvPreinOrderService invPreinOrderService; @Resource InvPreinDetailService invPreinDetailService; @@ -92,31 +90,11 @@ public class IoGenInvService { invProductEntity.setUpdateTime(new Date()); invProductService.update(invProductEntity); } - //TODO 120241022 之前关于详情表的删除修改操作去了 -// //生成库存码详情 -// List invProductDetailEntities = new ArrayList<>(); -// for (IoCodeEntity codeEntity : codeEnttities) { -// InvProductNewVo invProductDetailEntity = new InvProductNewVo(); -// BeanUtils.copyProperties(codeEntity, invProductDetailEntity); -// invProductDetailEntity.setRelIdFk(codeEntity.getRelId()); -// invProductDetailEntity.setUpdateTime(new Date()); -// invProductDetailEntity.setId(null); -// invProductDetailEntity.setPurchaseType(ConstantStatus.PRUCHASE_COMMON); -// if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { -// invProductDetailEntity.setInCount(invProductDetailEntity.getReCount()); -// } else if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { -// invProductDetailEntity.setOutCount(invProductDetailEntity.getReCount()); -// } -// -// invProductDetailEntities.add(invProductDetailEntity); -// } BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction()); if (basicBusTypePreEntity != null) { //进行单据流转 ioChangeInoutService.genNewOrder(orderEntity); } -// else { //生成库存结束 -// invProductDetailService.insertList(invProductDetailEntities); -// } + } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 99b1ac27..8f80eabd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -43,8 +43,6 @@ public interface IoOrderDetailBizService { List filterDrugList(FilterOrderDetailBizRequest orderDetailBizRequest); - List getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest); - List getfilterOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest); IoOrderDetailBizEntity selectByBatchNoAndBindRlFk(String batchNo, String bindRlFk); @@ -53,8 +51,6 @@ public interface IoOrderDetailBizService { List filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest); - List selectByorderIdFk(String orderIdFk); - IoOrderInvoiceResponse selectByinvoiceId(Long id); Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index 0f0a3792..08f4df78 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -39,7 +39,7 @@ public interface IoOrderDetailCodeService { */ int deleteByOrderId(String orderId); - public List checkOrderList(String orderId); + List checkOrderList(String orderId); boolean isExit(String orderId); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index de183755..c9d21524 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -14,8 +14,6 @@ import java.util.List; public interface IoOrderService { - List selectAll(); - List findAll(FilterOrderRequest filterOrderRequest); List isExitRepeat(String corpOrderId, String billNo); @@ -55,8 +53,6 @@ public interface IoOrderService { */ List filterList(FilterOrderRequest filterOrderRequest); - List getfilterList(FilterOrderRequest filterOrderRequest); - List getfilterOrderList(FilterOrderRequest filterOrderRequest); /** diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java index e4764449..af37ee84 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java @@ -96,21 +96,10 @@ public class IoCodeService extends ServiceImpl { public boolean isExitByRelId(String relId) { -// return ioCodeDao.selectList(new QueryWrapper().eq("relId", relId).last("limit 1")); return ioCodeDao.exists(new QueryWrapper().eq("relId", relId)); } - public List filterCodeList(FilterCodeRequest filterCodeRequest) { - if (null == filterCodeRequest) { - return Collections.emptyList(); - } - if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) { - PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit()); - } - return ioCodeDao.filterCodeList(filterCodeRequest); - } - public List filterList(FilterCodeRequest filterCodeRequest) { if (null == filterCodeRequest) { diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java index ab2b1592..c463f253 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java @@ -250,10 +250,6 @@ public class IoCodeTempService { AlihealthYljgUtils alihealthYljgUtils; @Resource AuthCompanyMapper authCompanyMapper; - @Resource - IoOrderDetailBizDao ioOrderDetailBizDao; - - public BaseResponse addDrugOrderWeb(AddOrderRequest addOrderRequest) { AddCodeResult addCodeResult = new AddCodeResult(); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction()); @@ -322,7 +318,6 @@ public class IoCodeTempService { } } - //批次号校验 //判断此产品是否开启允许无批次号 UdiProductEntity udiInfoEntity = udiProductService.findByNameCode(udiEntity.getUdi()); @@ -659,34 +654,6 @@ public class IoCodeTempService { relCodeBatchService.threadUpdateIoCodeTempEntity(code); } } - -// if(relCodeBatchOne!=null){ -// String mabeDate = relCodeBatchOne.getMadeDate(); -// String validateDate = relCodeBatchOne.getValidateDate(); -// -// -// if(mabeDate.length() > 10){ -// mabeDate =mabeDate.replace("-","").substring(2,8); -// -// } -// if(validateDate.length() > 10){ -// validateDate = validateDate.replace("-","").substring(2,8); -// -// } -// genDetaiEntity.setBatchNo(relCodeBatchOne.getBatchNo()); -// genDetaiEntity.setProduceDate(mabeDate); -// genDetaiEntity.setExpireDate(validateDate); -// -// IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); -// ioOrderDetailBizEntity.setBatchNo(relCodeBatchOne.getBatchNo()); -// ioOrderDetailBizEntity.setProductDate( mabeDate); -// ioOrderDetailBizEntity.setExpireDate(validateDate); -// -// ioOrderDetailBizDao.update(ioOrderDetailBizEntity, -// new QueryWrapper().eq("orderIdFk",orderEntity.getBillNo()) -// ); -//// genDetaiEntity.setExpireDate(relCodeBatchOne.getValidateDate()); -// } addCodeResult.setOrderId(orderId); transInoutService.genOrderDetailCode(orderEntity, genDetaiEntity); return ResultVOUtils.success(addCodeResult); @@ -779,7 +746,6 @@ public class IoCodeTempService { return drugCodeSelectEntity; } } -// UdiEntity originUdiEntity = FilterUdiUtils.getUdi(drugCodeSelectEntity.getCode()); if (!StrUtil.emptyIfNull(drugCodeSelectEntity.getNameCode()).equals(StrUtil.emptyIfNull(udiEntity.getUdi()))) { continue; } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index b8374ac6..4ae24ec4 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -65,10 +65,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource IoOrderDetailBizDao ioOrderDetailBizDao; - @Resource - IoOrderInvoiceMapper ioOrderInvoiceMapper; - @Resource - IoOrderDetailCodeDao orderDetailCodeDao; @Override public IoOrderDetailBizEntity selectById(Long id) { @@ -86,9 +82,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { if (StrUtil.isNotEmpty(orderId)) { ew.eq("orderIdFk", orderId); } -// if(chack){ -// ew.isNull("nameCode"); -// } List ioOrderDetailBizEntityList = ioOrderDetailBizDao.selectList(ew); return ioOrderDetailBizEntityList; } @@ -174,17 +167,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { return ioOrderDetailBizDao.filterDrugList(orderDetailBizRequest); } - @Override - public List getfilterList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { - if (null == OrderDetailCodeRequest) { - return Collections.emptyList(); - } - if (null != OrderDetailCodeRequest.getPage() && null != OrderDetailCodeRequest.getLimit()) { - PageHelper.offsetPage((OrderDetailCodeRequest.getPage() - 1) * OrderDetailCodeRequest.getLimit(), OrderDetailCodeRequest.getLimit()); - } - return ioOrderDetailBizDao.getfilterList(OrderDetailCodeRequest); - } - @Override public List getfilterOrderList(FilterOrderDetailCodeRequest OrderDetailCodeRequest) { if (null == OrderDetailCodeRequest) { @@ -255,12 +237,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest); } - - @Override - public List selectByorderIdFk(String orderIdFk) { - return ioOrderDetailBizDao.selectByorderIdFk(orderIdFk); - } - @Override public IoOrderInvoiceResponse selectByinvoiceId(Long id) { return ioOrderDetailBizDao.selectByinvoiceId(id); @@ -301,8 +277,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { @Resource SupProductService supProductService; @Resource - SystemParamConfigService systemParamConfigService; - @Resource SupCertService supCertService; @Resource IoOrderInvoiceService ioOrderInvoiceService; 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 9cd02f0b..b3f46042 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 @@ -109,10 +109,6 @@ public class IoOrderInvoiceService extends ServiceImpl filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) { if (orderInvoiceRequest.getPage() != null) { int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit(); 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 7bb4b8b9..b8b78a3d 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 @@ -105,12 +105,6 @@ public class IoOrderServiceImpl implements IoOrderService { private HttpOkClient httpOkClient; @Resource private BasicCorpDao basicCorpDao; - - @Override - public List selectAll() { - return orderDao.selectList(); - } - @Override public List findAll(FilterOrderRequest filterOrderRequest) { QueryWrapper queryWrapper = new QueryWrapper() @@ -558,17 +552,6 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.filterList(filterOrderRequest); } - @Override - public List getfilterList(FilterOrderRequest filterOrderRequest) { - if (null == filterOrderRequest) { - return Collections.emptyList(); - } - if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { - PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); - } - return orderDao.getfilterList(filterOrderRequest); - } - @Override public List getfilterOrderList(FilterOrderRequest filterOrderRequest) { if (null == filterOrderRequest) { diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java index 1ec783aa..62e1a6a5 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java @@ -26,10 +26,6 @@ public class DeviceInspectTaskDetailService extends ServiceImpl deviceInspectTaskDetailEntityList) { - deviceInspectTaskDetailMapper.insertBatch(deviceInspectTaskDetailEntityList); - return true; - } public List selectDeviceInspectTakeDetail(DeviceInspectTaskDetailEntity deviceInspectTaskDetailEntity) { diff --git a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java index 9b0596b6..745fb871 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java @@ -22,13 +22,6 @@ public interface DeviceReceiveOrderDetailService { */ List filterList(FilterDeviceReceiveOrderDetailRequest detailRequest); - /** - * 添加设备领用记录详情 - * - * @param addDetailRequest - * @return - */ - BaseResponse addOrderDetail(AddDeviceReceiveOrderDetailRequest addDetailRequest); /** * 更新设备领用记录详情 diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java index ae12cfbc..402008b3 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java @@ -43,15 +43,6 @@ public interface InvCountOrderService { */ BaseResponse submitAudit(String id); - /** - * 更新盘点单据状态 - * - * @param id - * @param status - * @return - */ - BaseResponse updateCountOrderStatus(String id, Integer status); - /** * 手持终端保存盘点单据 * diff --git a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java index a8bf10f2..51ff2bb5 100644 --- a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java +++ b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java @@ -11,7 +11,6 @@ import java.util.List; public interface InvInnerOrderPrintService { - List filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest); Boolean addOrderList(String orderIdFk); diff --git a/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java index ed78acac..b55ef30b 100644 --- a/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java @@ -37,13 +37,6 @@ public interface InvMAOrderDetailService { */ BaseResponse delete(Integer id); -// /** -// * 根据库存详情批量添加养护详情记录 -// * -// * @param addMAOrderDetailRequest -// * @return -// */ -// BaseResponse batchAddDetail(AddInvMAOrderDetailRequest addMAOrderDetailRequest); /** * 更新养护记录详情 diff --git a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java index a5485b40..f0593cee 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreProductService.java @@ -29,13 +29,6 @@ public interface InvPreProductService { */ List filterList(FilterInvPreProductRequest invPreProductRequest); - /** - * 查询寄售库存列表 - * - * @param invPreProductRequest - * @return - */ - List filterPreProductList(FilterInvPreProductRequest invPreProductRequest); /** * 根据ID查询寄售库存信息 diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java index d68c38eb..0e50312f 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java @@ -21,9 +21,6 @@ public interface InvPreinDetailService { List findByCode(String code); -// InvPreinDetailEntity findOneByCode(String code); - - List findUseByCode(String code); InvPreinDetailEntity findUseOneByCode(String code); @@ -38,7 +35,4 @@ public interface InvPreinDetailService { int update(InvPreinDetailEntity invPreinDetailEntity); - int updateBack(String orderId); - - int findCountByCode(String code); } diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java index 2ec9116a..5c955e71 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java @@ -13,7 +13,7 @@ public interface InvPreinOrderService { List filterList(FilterInvPreinRequest filterInvPreinRequest); - public void insert(InvPreinOrderEntity invPreinOrderEntity); + void insert(InvPreinOrderEntity invPreinOrderEntity); int deleteByOrderId(String orderId); diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java index 4187ad99..a7953c9d 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java @@ -46,13 +46,6 @@ public interface InvPreinProductDetailService { */ void setOrderInfo(InvPreProductDetailResponse response); - /** - * 删除寄售库存详情 - * - * @param detailRequest - */ - boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest); - int findCountByCode(String code); InvPreInProductDetailEntity findUseOneByCode(String code); diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java index b65ace80..37da0799 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java @@ -30,14 +30,6 @@ public interface InvPreinProductService { */ List filterList(FilterInvPreinProductRequest filterInvPreinDetailRequest); - /** - * 查询寄售库存列表 - * - * @param invPreProductRequest - * @return - */ - List filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest); - /** * 根据ID查询寄售库存信息 * diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java index 6864c218..e720089b 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -38,8 +38,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe private DeviceReceiveOrderDetailDao deviceReceiveOrderDetailDao; @Resource private InvProductNewDao invProductNewDao; - @Resource - private InvProductDao invProductDao; + @Override public List filterList(FilterDeviceReceiveOrderDetailRequest detailRequest) { @@ -56,137 +55,6 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe }); return list; } - //TODO 120241022 添加设备领用记录详情先注释 因为逻辑里面很多用码进行处理 - @Override - public BaseResponse addOrderDetail(AddDeviceReceiveOrderDetailRequest addDetailRequest) { - return null; -// if (null == addDetailRequest || StrUtil.isBlank(addDetailRequest.getOrderIdFk())) { -// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); -// } -// if (StrUtil.isBlank(addDetailRequest.getCode()) && CollUtil.isEmpty(addDetailRequest.getInvProductIds())) { -// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "请添加领用设备！"); -// } -// if (StrUtil.isNotBlank(addDetailRequest.getCode())) { -// //通过条码添加 -// //解析此条码，判断此条码是否已经存在 -// UdiEntity udi = FilterUdiUtils.getUdi(addDetailRequest.getCode()); -// if (StrUtil.isNotBlank(udi.getSerialNo())) { -// //条码为完整码，查询此条码在当前领用记录中是否存在，如果存在则无法添加 -// FilterDeviceReceiveOrderDetailRequest detailRequest = new FilterDeviceReceiveOrderDetailRequest(); -// detailRequest.setOrderIdFk(addDetailRequest.getOrderIdFk()); -// detailRequest.setCode(addDetailRequest.getCode()); -// List list = deviceReceiveOrderDetailDao.filterList(detailRequest); -// if (CollUtil.isNotEmpty(list)) { -// return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "条码重复！"); -// } -// } -// -// //设置库存详情查询参数 -// FilterInvProductDetailRequest invProductDetailRequest = new FilterInvProductDetailRequest(); -// invProductDetailRequest.setCode(addDetailRequest.getCode()); -// -// //判断是否有选入的仓库信息，如果没有，说明此条码仅存在一条仓库信息，直接使用即可 -// if (StrUtil.isNotBlank(addDetailRequest.getInvCode())) { -// invProductDetailRequest.setDeptCode(addDetailRequest.getDeptCode()); -// invProductDetailRequest.setInvCode(addDetailRequest.getInvCode()); -// invProductDetailRequest.setInvSpaceCode(addDetailRequest.getInvSpaceCode()); -// } -// //查询库存详情 -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest); -// InvProductNewVo invProductNewVo = invProductDetailEntities.get(0); -// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), addDetailRequest.getCode(), invProductNewVo); -// deviceReceiveOrderDetailDao.insert(orderDetail); -// } else { -// //通过选库存添加 -// //查询选中的库存信息 -// for (String invProductId : addDetailRequest.getInvProductIds()) { -// InvProductEntity invProductEntity = invProductDao.selectById(invProductId); -// //查询库存详情 -// FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); -// filterInvProductDetailRequest.setRelId(String.valueOf(invProductEntity.getRelIdFk())); -// filterInvProductDetailRequest.setBatchNo(invProductEntity.getBatchNo()); -// filterInvProductDetailRequest.setDeptCode(invProductEntity.getDeptCode()); -// filterInvProductDetailRequest.setInvCode(invProductEntity.getInvCode()); -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(filterInvProductDetailRequest); -// //计算出在仓库中的设备 -// //提取库存详情中不同的码 -// List codesList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).distinct().collect(Collectors.toList()); -// //初始化所有码数量集合 -// Map codeMap = new HashMap<>(codesList.size()); -// codesList.forEach(code -> codeMap.put(code, 0)); -// //计算库存详情中的码明细，得出所有存在于库存中的码 -// for (InvProductNewVo invProductNewVo : invProductDetailEntities) { -// Integer count = codeMap.get(invProductNewVo.getCode()); -// if (invProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) { -// //入库，数量 +1 -// count = count + 1; -// } else { -// //出库， 数量 -1 -// count = count - 1; -// } -// codeMap.put(invProductNewVo.getCode(), count); -// } -// -// //根据计算得出的，所有存在于库存中的码明细，生成设备领用记录详情 -// for (String code : codeMap.keySet()) { -// if (codeMap.get(code) > 0) { -// //查找此条码对应的库存详情数据，根据此库存详情数据，查找仓库货位等信息 -// InvProductNewVo invProductNewVo = new InvProductNewVo(); -// for (InvProductNewVo detailEntity : invProductDetailEntities) { -// if (detailEntity.getCode().equals(code)) { -// invProductNewVo = detailEntity; -// break; -// } -// } -// -// //此条码存在于库存中,解析条码生成设备领用记录详情 -// Integer count = codeMap.get(code); -// if (count > 1) { -// for (int i = 0; i < count; i++) { -// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), code, invProductNewVo); -// //插入设备领用记录详情 -// deviceReceiveOrderDetailDao.insert(orderDetail); -// } -// } else { -// DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), code, invProductNewVo); -// deviceReceiveOrderDetailDao.insert(orderDetail); -// } -// } -// } -// } -// } -// return ResultVOUtils.success("添加成功！"); - } - - /** - * 构造设备领用记录详情 - * - * @param orderIdFk 设备领用记录号 - * @param code 码 - * @param invProductNewVo 库存详情 - * @return - */ - private static DeviceReceiveOrderDetailEntity getDeviceReceiveOrderDetailEntity(String orderIdFk, String code, InvProductNewVo invProductNewVo) { - //此条码数量为多个，生成多条养护记录 - UdiEntity udi = FilterUdiUtils.getUdi(code); - DeviceReceiveOrderDetailEntity orderDetail = new DeviceReceiveOrderDetailEntity(); - orderDetail.setOrderIdFk(orderIdFk); - orderDetail.setOriginCode(code); - orderDetail.setRelId(invProductNewVo.getRelIdFk()); - orderDetail.setNameCode(udi.getUdi()); - orderDetail.setBatchNo(udi.getBatchNo()); - orderDetail.setProductionDate(udi.getProduceDate()); - orderDetail.setExpireDate(udi.getExpireDate()); - //判断有无序列号，如果有序列号，则可以通过udi码来判定唯一，直接使用udi码做唯一码 - if (StrUtil.isNotBlank(udi.getSerialNo())) { - orderDetail.setSerialNo(udi.getSerialNo()); - orderDetail.setCode(code); - } - Date date = new Date(); - orderDetail.setCreateTime(date); - orderDetail.setUpdateTime(date); - return orderDetail; - } @Override public BaseResponse updateOrderDetail(DeviceReceiveOrderDetailEntity detailEntity) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java index f859d11b..13c2a025 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java @@ -34,8 +34,6 @@ public class InvCountCodesServiceImpl implements InvCountCodesService { @Resource private InvCountOrderDetailDao invCountOrderDetailDao; @Resource - private UdiRelevanceDao udiRelevanceDao; - @Resource private UdiCalCountUtil udiCalCountUtil; @Override diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java index 8b784a95..8450d451 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java @@ -77,16 +77,12 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { @Resource private BasicBussinessTypeDao bussinessTypeDao; @Resource - private BasicCorpDao corpDao; - @Resource private IoOrderDao orderDao; @Resource private IoCodeTempDao codesTempDao; @Resource private InvCountCodesService invCountCodesService; @Resource - private IoCodeDao codesDao; - @Resource private UdiRlSupDao udiRlSupDao; @Resource private UdiCalCountUtil udiCalCountUtil; @@ -219,61 +215,6 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { return ResultVOUtils.success(); } - @Override - public BaseResponse updateCountOrderStatus(String id, Integer status) { - InvCountOrderEntity invCountOrder = invCountOrderDao.selectById(Integer.valueOf(id)); - invCountOrder.setStatus(status); - invCountOrder.setAuditUser(customerService.getUserBean().getUserName()); - invCountOrder.setAuditTime(new Date()); - invCountOrder.setUpdateTime(new Date()); - if (status == 0) { - //审核不通过 - //查询盘点单据详情，清空盘盈/盘亏数值 - invCountOrderDetailDao.resetCountFiledValue(invCountOrder.getOrderId()); - } else { - //审核通过 - //根据单据详情生成相关单据 - log.info("单据审核通过，开始生成扫码单据"); - ThreadUtil.execAsync(() -> { - countOrderTransfer(invCountOrder); - }); - } - invCountOrderDao.updateById(invCountOrder); - return ResultVOUtils.success(); - } - - /** - * 盘点单据转扫码单据 - * - * @param invCountOrder 盘点单据 - */ - private void countOrderTransfer(InvCountOrderEntity invCountOrder) { - //查询单据生成设置，是否已经配置对应单据类型，若未配置则结束转单流程 - List transferOrderSettings = getOrderSettings(); - if (CollUtil.isEmpty(transferOrderSettings)) { - log.error("未配置盘点转单设置，无法转单！"); - return; - } - - /** - * 生成盘盈和盘亏单据逻辑 - * 盘盈单据：1、找出盘点单据码详情比库存码详情多的产品 - * 2、判断条码是否包含批次号和序列号，如果不包含，根据 盘盈数量 / 实际数量 = 多出的条码数量 ，计算出盘盈单据此条码的扫码数量 - * 3、生成条码，保存单据 - * - * 盘亏单据：1、找出库存有，而盘点不存在的条码 - * 2、判断此库存详情是否包含批次号，如果不包含，盘亏数量 / 实际数量 = 少的条码数量，计算出盘亏单据扫码数量 - * 3、生成条码，保存单据 - */ - - //获取出入库码明细 - List inCodes = getOrderCodes(invCountOrder, "in"); - List outCodes = getOrderCodes(invCountOrder, "out"); - - //生成盘盈/盘亏单据 - createNewOrder(invCountOrder, inCodes, outCodes, transferOrderSettings); - log.info("盘点转单完成"); - } /** * 生成盘盈/盘亏单据 @@ -356,160 +297,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService { } return null; } - //TODO 120241022 获取入库或出库的条码列表 要用code做逻辑处理 - /** - * 获取入库或出库的条码列表 - * - * @param invCountOrder 盘点单据 - * @param type 出入库类型 in/out - * @return - */ - private List getOrderCodes(InvCountOrderEntity invCountOrder, String type) { - return null; -// //构造库存详情查询参数 -// FilterInvProductDetailRequest invProductDetailRequest = new FilterInvProductDetailRequest(); -// invProductDetailRequest.setDeptCode(invCountOrder.getDeptCode()); -// invProductDetailRequest.setInvCode(invCountOrder.getInvCode()); -// //锁库存，查询库存更新时间早于或等于盘点单创建时间的数据 -// invProductDetailRequest.setUpdateTime(DateUtil.toDateStr(invCountOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); -// //判断是否是按货位盘点的单据，如果是，则查询库存详情的参数需要添加货位 -// invProductDetailRequest.setInvSpaceCode(invCountOrder.getInvSpaceCode()); -// -// //查询盘点单据详情 -// FilterInvCountOrderDetailRequest countOrderDetailRequest = new FilterInvCountOrderDetailRequest(); -// countOrderDetailRequest.setOrderIdFk(invCountOrder.getOrderId()); -// countOrderDetailRequest.setStatus(type.equals("in") ? 1 : 0); -// List detailList = invCountOrderDetailDao.filterList(countOrderDetailRequest); -// -// List codeList = new ArrayList<>(); -// //查找条码列表 -// if (type.equals("in")) { -// log.info("开始生成盘盈单据码明细"); -// //查找盘盈条码列表 -// detailList.forEach(invCountOrderDetailEntity -> { -// invProductDetailRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId())); -// invProductDetailRequest.setBatchNo(invProductDetailRequest.getBatchNo()); -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest); -// //查询盘点码明细 -// FilterInvCountCodesRequest countCodesRequest = new FilterInvCountCodesRequest(); -// countCodesRequest.setOrderIdFk(invCountOrder.getOrderId()); -// countCodesRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId())); -// countCodesRequest.setBatchNo(invCountOrderDetailEntity.getBatchNo()); -// List countCodeList = invCountCodesDao.selectCodes(countCodesRequest); -// List invProductDetailCodes = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList()); -// List profitCodes = CollUtil.subtractToList(countCodeList, invProductDetailCodes); -// if (CollUtil.isNotEmpty(invProductDetailCodes) && CollUtil.isEmpty(profitCodes)) { -// /** -// * 盘点条码不为空，且库存条码也不为空，但是计算的条码差集为空 -// * 说明盘点的条码和库存的条码是相同的条码，直接根据盘盈数量计算出扫码数量，生成一个条码即可 -// */ -// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, countCodeList.get(0), invCountOrderDetailEntity); -// codeList.add(codeTempEntity); -// } else { -// for (String code : profitCodes) { -// if (!verifyCodeExist(codeList, code)) { -// //生成码明细 -// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, code, invCountOrderDetailEntity); -// codeList.add(codeTempEntity); -// } -// } -// } -// }); -// log.info("盘盈单据码明细生成成功"); -// } else { -// log.info("开始生成盘亏单据码明细"); -// -// detailList.forEach(invCountOrderDetailEntity -> { -// invProductDetailRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId())); -// invProductDetailRequest.setBatchNo(invCountOrderDetailEntity.getBatchNo()); -// //查询库存详情 -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(invProductDetailRequest); -// //查询盘点码明细 -// FilterInvCountCodesRequest countCodesRequest = new FilterInvCountCodesRequest(); -// countCodesRequest.setOrderIdFk(invCountOrder.getOrderId()); -// countCodesRequest.setRelId(String.valueOf(invCountOrderDetailEntity.getRelId())); -// countCodesRequest.setBatchNo(invCountOrderDetailEntity.getBatchNo()); -// List countCodeList = invCountCodesDao.selectCodes(countCodesRequest); -// List invProductDetailCodes = invProductDetailEntities.stream().map(InvProductNewVo::getCode).collect(Collectors.toList()); -// List lossCodes = CollUtil.subtractToList(invProductDetailCodes, countCodeList); -// if (CollUtil.isNotEmpty(countCodeList) && CollUtil.isEmpty(lossCodes)) { -// //盘点的码不为空，但是盘点数量和库存数量不一样，比对差集结果为空，说明是同一个条码，数量不同，直接根据盘亏数量计算生成一个扫码单据的码明细 -// //生成码详情 -// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, countCodeList.get(0), invCountOrderDetailEntity); -// codeList.add(codeTempEntity); -// } else { -// for (InvProductNewVo invProductNewVo : invProductDetailEntities) { -// if (!countCodeList.contains(invProductNewVo.getCode()) && !verifyCodeExist(codeList, invProductNewVo.getCode())) { -// InvCountOrderDetailEntity orderDetailEntity = new InvCountOrderDetailEntity(); -// orderDetailEntity.setRelId(invCountOrderDetailEntity.getRelId()); -// orderDetailEntity.setStatus(0); -// IoCodeTempEntity codeTempEntity = buildCodeTempEntity(invCountOrder, invProductNewVo.getCode(), orderDetailEntity); -// codeList.add(codeTempEntity); -// } -// } -// } -// }); -// log.info("盘亏单据码名称生成成功"); -// } -// return codeList; - } - /** - * 比对码在集合中是否存在 - * - * @param codeList - * @param code - * @return - */ - private boolean verifyCodeExist(List codeList, String code) { - for (IoCodeTempEntity codeTempEntity : codeList) { - if (codeTempEntity.getCode().equals(code)) { - return true; - } - } - return false; - } - /** - * 构造扫码单据码明细数据 - * - * @param invCountOrder 盘点单据 - * @param code 码 - * @param invCountOrderDetailEntity 盘点单据详情 - * @return - */ - private IoCodeTempEntity buildCodeTempEntity(InvCountOrderEntity invCountOrder, String code, InvCountOrderDetailEntity invCountOrderDetailEntity) { - IoCodeTempEntity codeTemp = new IoCodeTempEntity(); - codeTemp.setCode(code); - codeTemp.setRelId(invCountOrderDetailEntity.getRelId()); - codeTemp.setMainAction(invCountOrderDetailEntity.getStatus() == 0 ? ConstantType.TYPE_OUT : ConstantType.TYPE_PUT); - codeTemp.setDeptCode(invCountOrder.getDeptCode()); - codeTemp.setInvCode(invCountOrder.getInvCode()); - UdiEntity udi = FilterUdiUtils.getUdi(code); - codeTemp.setBatchNo(udi.getBatchNo()); - codeTemp.setNameCode(udi.getUdi()); - codeTemp.setProduceDate(udi.getProduceDate()); - codeTemp.setExpireDate(udi.getExpireDate()); - codeTemp.setSerialNo(udi.getSerialNo()); - //计算码数量 - int actCount = udiCalCountUtil.getActCount(codeTemp.getNameCode()); - //判断此码有无批次号和序列号 - if ((StrUtil.isBlank(codeTemp.getBatchNo()) && StrUtil.isBlank(codeTemp.getSerialNo())) || (StrUtil.isBlank(codeTemp.getSerialNo()) && StrUtil.isNotBlank(codeTemp.getBatchNo()))) { - //根据盘点盈亏状态取盘点数量值 - int countNum = invCountOrderDetailEntity.getStatus() == 0 ? invCountOrderDetailEntity.getLossNum() : invCountOrderDetailEntity.getProfitNum(); - int codeNum = countNum / actCount; - codeTemp.setCount(codeNum); - codeTemp.setReCount(codeNum); - } else { - codeTemp.setCount(actCount); - codeTemp.setReCount(actCount); - } - //获取盘点盈亏状态值 - String countStatus = invCountOrderDetailEntity.getStatus() == 0 ? "loss" : "profit"; - //设置供应商信息 - setSupInfo(codeTemp, countStatus); - return codeTemp; - } /** * 设置条码供应商信息 diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 01b06a75..7a7d95c1 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -74,17 +74,6 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService @Resource IoOrderDetailBizService ioOrderDetailBizService; - @Override - public List filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest) { - if (filterinnerOrderprintRequest == null) { - return Collections.emptyList(); - } - int offset = (filterinnerOrderprintRequest.getPage() - 1) * filterinnerOrderprintRequest.getLimit(); - PageHelper.offsetPage(offset, filterinnerOrderprintRequest.getLimit()); - List data = invInnerOrderPrintDao.filterOrderPrintList(filterinnerOrderprintRequest); - return data; - } - @Override public Boolean addOrderList(String orderIdFk) { //先删除数据 diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java index 44a665ae..74da42a3 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java @@ -126,83 +126,6 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { } return ResultVOUtils.success(); } - -// @Override -// public BaseResponse batchAddDetail(AddInvMAOrderDetailRequest addMAOrderDetailRequest) { -// //查询库存养护记录说明 -// InvMAExplanationEntity invMAExplanationEntity = invMAExplanationDao.selectByStatus(1); -// //遍历库存ID，查找库存详情的条码信息，生成库存养护记录详情 -// addMAOrderDetailRequest.getInvProductIds().forEach(invProductId -> { -// //查询库存信息 -// InvProductEntity invProductEntity = invProductDao.selectById(invProductId); -// //查询库存详情码信息 -// FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest(); -// detailRequest.setRelId(String.valueOf(invProductEntity.getRelIdFk())); -// detailRequest.setBatchNo(invProductEntity.getBatchNo()); -// detailRequest.setDeptCode(invProductEntity.getDeptCode()); -// detailRequest.setInvCode(invProductEntity.getInvCode()); -// List invProductDetailEntities = invProductNewDao.filterInvProductDetailList(detailRequest); -// //提取去重后的码集合 -// List codeList = invProductDetailEntities.stream().map(InvProductNewVo::getCode).distinct().collect(Collectors.toList()); -// //初始化码数量计算集合数据 -// Map codeMap = new HashMap<>(codeList.size()); -// codeList.forEach(code -> codeMap.put(code, 0)); -// //计算当前在库存中的码明细 -// for (InvProductNewVo invProductNewVo : invProductDetailEntities) { -// UdiEntity udi = FilterUdiUtils.getUdi(invProductNewVo.getCode()); -// if (StrUtil.isNotBlank(udi.getSerialNo())) { -// //有序列号产品，根据产品数量计算即可 -// Integer count = codeMap.get(invProductNewVo.getCode()); -// if (invProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) { -// //出库 -// count = count - 1; -// } else { -// //入库 -// count = count + 1; -// } -// codeMap.put(invProductNewVo.getCode(), count); -// } else { -// //无序列号产品条码，直接查询库存，使用此库存信息计算出养护数量 -// int count = invProductEntity.getInCount() - invProductEntity.getOutCount(); -// codeMap.put(invProductNewVo.getCode(), count); -// } -// } -// -// //根据库存中的码明细，生成库存养护记录详情 -// for (String code : codeMap.keySet()) { -// if (codeMap.get(code) > 0) { -// //获取库存详情 -// InvProductNewVo invProductNewVo = null; -// for (InvProductNewVo detailEntity : invProductDetailEntities) { -// if (detailEntity.getCode().equals(code)) { -// invProductNewVo = detailEntity; -// break; -// } -// } -// //生成库存养护记录详情 -// InvMAOrderDetailEntity maOrderDetail = new InvMAOrderDetailEntity(); -// maOrderDetail.setOrderIdFk(addMAOrderDetailRequest.getOrderIdFk()); -// maOrderDetail.setCode(invProductNewVo.getCode()); -// maOrderDetail.setRelId(invProductNewVo.getRelId()); -// UdiEntity udi = FilterUdiUtils.getUdi(invProductNewVo.getCode()); -// maOrderDetail.setNameCode(udi.getUdi()); -// maOrderDetail.setProductionDate(udi.getProduceDate()); -// maOrderDetail.setExpireDate(udi.getExpireDate()); -// maOrderDetail.setBatchNo(udi.getBatchNo()); -// maOrderDetail.setCount(codeMap.get(code)); -// maOrderDetail.setMaStatus(0); -// maOrderDetail.setDeviceStatus(1); -// maOrderDetail.setCreateTime(new Date()); -// if (null != invMAExplanationEntity) { -// maOrderDetail.setRemark(invMAExplanationEntity.getText()); -// } -// invMAOrderDetailDao.insert(maOrderDetail); -// } -// } -// }); -// return ResultVOUtils.success("添加成功"); -// } - @Override public BaseResponse update(InvMAOrderDetailEntity invMAOrderDetailEntity) { invMAOrderDetailEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 7692761c..be50ade7 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -151,11 +151,6 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe // response.setOrderTime(DateUtil.toDateStr(new DateTime(), "yyyy-MM-dd HH:mm:ss")); } - @Override - public boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest) { - return invPreInProductDetailDao.deleteInvPreProductDetail(detailRequest); - } - @Override public int findCountByCode(String code) { List invPreinDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper().eq("code", code)); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java index 10fe787f..e93f0f76 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java @@ -60,17 +60,6 @@ public class InvPreProductServiceImpl implements InvPreProductService { return invPreProductDao.filterList(invPreProductRequest); } - @Override - public List filterPreProductList(FilterInvPreProductRequest invPreProductRequest) { - if (null == invPreProductRequest) { - return Collections.emptyList(); - } - if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) { - PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); - } - return invPreProductDao.filterPreProductList(invPreProductRequest); - } - @Override public InvPreProductEntity findById(String id) { return invPreProductDao.selectById(id); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java index b96dfce3..8e95ff3a 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java @@ -92,29 +92,4 @@ public class InvPreinDetailServiceImpl implements InvPreinDetailService { return invPreinDetailDao.updateById(invPreinDetailEntity); } - @Override - public int updateBack(String orderId) { - InvPreinDetailEntity invPreinDetailEntity = new InvPreinDetailEntity(); - invPreinDetailEntity.setStatus(ConstantStatus.INVIN_BACK); - invPreinDetailDao.update(invPreinDetailEntity, new QueryWrapper().eq("orderId", orderId).ne("status", ConstantStatus.INVIN_USE)); - return 1; - } - - @Override - public int findCountByCode(String code) { - List invPreinDetailEntities = invPreinDetailDao.selectList(new QueryWrapper().eq("code", code)); - int count = 0; - if (CollUtil.isNotEmpty(invPreinDetailEntities)) { - for (InvPreinDetailEntity invProductDetailEntity : invPreinDetailEntities) { - if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) - count = count + invProductDetailEntity.getReCount(); - else { - count = count - invProductDetailEntity.getReCount(); - } - } - } - return count; - } - - } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java index c849b4d0..1fe6e475 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java @@ -59,17 +59,6 @@ public class InvPreinProductServiceImpl implements InvPreinProductService { return invPreinProductDao.filterList(invPreProductRequest); } - @Override - public List filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest) { - if (null == invPreProductRequest) { - return Collections.emptyList(); - } - if (null != invPreProductRequest.getPage() && null != invPreProductRequest.getLimit()) { - PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit()); - } - return invPreinProductDao.filterPreProductList(invPreProductRequest); - } - @Override public InvPreinProductEntity findById(String id) { return invPreinProductDao.selectById(id); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java index 874bb282..80b3225a 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java @@ -49,16 +49,6 @@ public class InvProductServiceNew extends ServiceImpl selectByOrderIdFk(String billNo) { if (StrUtil.isEmpty(billNo)) return null; @@ -80,49 +70,12 @@ public class InvProductServiceNew extends ServiceImpl().eq("orderId", billNo)); -// } - - -// public int deleteById(Integer id) { -// return invProductNewDao.deleteById(id); -// } -// -// -// public int update(InvProductNewVo InvProductNewVo) { -// -// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) { -// InvProductNewVo.setInCount(InvProductNewVo.getReCount()); -// } else if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_OUT)) { -// InvProductNewVo.setOutCount(InvProductNewVo.getReCount()); -// } -// -// return invProductNewDao.updateById(InvProductNewVo); -// } - public List selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode) { return invProductNewDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(supId != null, "supId", supId).eq(deptCode != null, "deptCode", deptCode).eq(invCode != null, "invCode", invCode)); } - //TODO 120241022 之前是code去查库存详情 现在没有码了先注释逻辑 看下引用的地方要不要注释了 - public InvProductNewVo sortFindByCode(String code) { - return null; -// List invProductDetailEntities = invProductNewDao.selectList(new QueryWrapper().eq("code", code).orderByDesc("id")); -// if (CollUtil.isNotEmpty(invProductDetailEntities)) -// return invProductDetailEntities.get(0); -// else -// return null; - } - - -// public boolean insertList(List invProductDetailEntities) { -// return invProductNewDao.insertBatch(invProductDetailEntities); -// } - public List filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest) { if (null == filterInvProductDetailRequest) { @@ -135,10 +88,6 @@ public class InvProductServiceNew extends ServiceImpl datas = -// invProductNewDao.selectList(new QueryWrapper().eq("deptCode", deptCode).eq("invCode", invCode) -// .eq(StrUtil.isNotEmpty(invSpaceCode), "invSpaceCode", invSpaceCode) -// .eq("code", code) -// ); -// -// int count = 0; -// if (CollUtil.isNotEmpty(datas)) { -// for (InvProductNewVo InvProductNewVo : datas) { -// if (InvProductNewVo.getMainAction().equals(ConstantType.TYPE_PUT)) -// count = count + InvProductNewVo.getReCount(); -// else { -// count = count - InvProductNewVo.getReCount(); -// } -// } -// } -// return count; -// } - - - public List findByGroupCode(String invCode, String code, Boolean isCheckSpace) { - if (StrUtil.isNotEmpty(invCode) && StrUtil.isNotEmpty(code)) { - List datas = - invProductNewDao.findByGroupCode(invCode, code, isCheckSpace); - return datas; - } - - return null; - } - - @Resource - InvPreInProductDetailDao invPreInProductDetailDao; - @Resource - InvPreProductDetailDao invPreProductDetailDao; - - public InvProductNewVo selectLastInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction) { - - - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectLastInBatch(relId, batchNo, mainAction); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectLastInBatch(relId, batchNo, mainAction); - } else { - return invProductNewDao.selectLastInBatch(relId, batchNo, invCode, mainAction); - } - - - } - - public InvProductNewVo selectFirstInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction) { - - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectFirstInBatch(relId, batchNo, mainAction); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectFirstInBatch(relId, batchNo, mainAction); - } else { - return invProductNewDao.selectFirstInBatch(relId, batchNo, invCode, mainAction); - } - - } - - public Integer selectCountByInBatch(String relId, String batchNo, BasicBussinessTypeEntity bussinessTypeEntity, String inBatchNo, String invCode, String mainAction) { - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectCountByInBatch(relId, batchNo, inBatchNo, mainAction); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectCountByInBatch(relId, batchNo, inBatchNo, mainAction); - } else { - return invProductNewDao.selectCountByInBatch(relId, batchNo, invCode, inBatchNo, mainAction); - } - - } - - public InvProductNewVo selectNextInBatch(BasicBussinessTypeEntity bussinessTypeEntity, String relId, String batchNo, String invCode, String mainAction, String inBatchNo) { - if (bussinessTypeEntity.isScanPreIn()) { //校验预验收库存 - return invPreInProductDetailDao.selectNextInBatch(relId, batchNo, mainAction, inBatchNo); - } else if (bussinessTypeEntity.isAdvancePreIn()) { //校验寄售库存 - return invPreProductDetailDao.selectNextInBatch(relId, batchNo, mainAction, inBatchNo); - } else { - return invProductNewDao.selectNextInBatch(relId, batchNo, invCode, mainAction, inBatchNo); - } - } } diff --git a/src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java b/src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java index 51f0f453..3a9aac23 100644 --- a/src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java +++ b/src/main/java/com/glxp/api/service/monitor/ISysOperLogService.java @@ -22,7 +22,7 @@ public interface ISysOperLogService { /** * 查询系统操作日志集合 * - * @param operLog 操作日志对象 + * @param filterOperLogRequest 操作日志对象 * @return 操作日志集合 */ List selectOperLogList(FilterOperLogRequest filterOperLogRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java index d502f8d7..4378cdc0 100644 --- a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java +++ b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java @@ -11,7 +11,6 @@ import java.util.List; public interface CustomerContactService { - List filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest); boolean insertCustomerContact(CustomerContactEntity customerContactEntity); @@ -19,7 +18,6 @@ public interface CustomerContactService { boolean deleteById(String id); - boolean deleteContact(DeleteRequest deleteRequest); CustomerContactEntity selectById(Long emailId); } diff --git a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java index 0d24693c..8ed7d5b7 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurApplyDetailService.java @@ -12,7 +12,7 @@ public interface PurApplyDetailService { List queryPageList(PurApplyDetailRequest purApplyRequest); - public List findByOrderId(String orderId); + List findByOrderId(String orderId); List joinQueryList(PurApplyDetailRequest purApplyRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java index 3f70c54b..eeb4e295 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurArrivalDetailService.java @@ -15,8 +15,6 @@ public interface PurArrivalDetailService { List queryPageList(PurOrderDetailRequest purOrderDetailRequest); - List getPurArrivalDetailEntityList(PurOrderDetailRequest purOrderDetailRequest); - Boolean insert(PurArrivalDetailEntity purReturnedDetailEntity); Boolean update(PurArrivalDetailEntity purReturnedDetailEntity); diff --git a/src/main/java/com/glxp/api/service/purchase/PurArrivalService.java b/src/main/java/com/glxp/api/service/purchase/PurArrivalService.java index 7a105889..abfd9733 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurArrivalService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurArrivalService.java @@ -14,7 +14,6 @@ public interface PurArrivalService { Boolean update(PurArrivalEntity purArrivalEntity); - Boolean deleteByIds(List ids); Boolean deleteById(long id); diff --git a/src/main/java/com/glxp/api/service/purchase/PurDeliveryCodeService.java b/src/main/java/com/glxp/api/service/purchase/PurDeliveryCodeService.java index 4be5a461..523a3361 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurDeliveryCodeService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurDeliveryCodeService.java @@ -21,7 +21,7 @@ public interface PurDeliveryCodeService { /** * 判断码是否是此单产品 * - * @param codeList + * @param orderIdFk * @param relId * @return */ diff --git a/src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java index 09aaafeb..96269a91 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurDeliveryDetailService.java @@ -15,8 +15,6 @@ public interface PurDeliveryDetailService { List queryPageList(PurOrderDetailRequest purOrderDetailRequest); - List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest); - Boolean insert(PurDeliveryDetailEntity purDeliveryDetailEntity); Boolean update(PurDeliveryDetailEntity purDeliveryDetailEntity); diff --git a/src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java index 0bbaa59e..966310e0 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurReturnedDetailService.java @@ -16,7 +16,6 @@ public interface PurReturnedDetailService { List queryPageList(PurOrderDetailRequest purOrderDetailRequest); - List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest); Boolean insert(PurReturnedDetailEntity purReturnedDetailEntity); @@ -26,7 +25,6 @@ public interface PurReturnedDetailService { Boolean deleteByOrderId(String orderIdfK); - boolean insertPurReturnedDetailEntity(List purReturnedDetailEntity); BasicProductsEntity selectIoOrderDetailBiz(long id); diff --git a/src/main/java/com/glxp/api/service/purchase/SupCertService.java b/src/main/java/com/glxp/api/service/purchase/SupCertService.java index 8f19ca87..233c9a8b 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCertService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCertService.java @@ -13,7 +13,6 @@ public interface SupCertService extends IService { List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); - SupCertEntity findCompanyCertByName(String name); List findAll(String customerId); diff --git a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java index a71f11f1..5c2fcc98 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCompanyService.java @@ -10,16 +10,11 @@ import java.util.List; public interface SupCompanyService extends IService { - SupCompanyEntity findCompanyByUnitFk(String unitFk); List filterCompany(FilterSupCompanyRequest companyRequest); SupCompanyEntity findCompany(String CustomerId); - List getSubCompany(FilterSupCompanyRequest commitRequest); - - List getSubCompany2(FilterSupCompanyRequest commitRequest); - SupCompanyEntity findCompanyByName(String companyName); boolean modifyCompany(SupCompanyEntity companyEntity); diff --git a/src/main/java/com/glxp/api/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java index c86f204d..b4b41209 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupProductService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java @@ -15,23 +15,9 @@ public interface SupProductService extends IService { SupProductResponse findByProductId(String productId); - SupProductEntity findByRelIdFk(String relIdFk); - - - SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk); - SupProductEntity findExitByManufactury(String cpmctymc, String manufactory, String customerId); - - SupProductResponse findByPassByReCert(String registerCert); - - SupProductResponse findJoinRegistration(Long id); - - SupProductEntity findRegistrationByName(String recordProductName); - List getRegistration(FilterPoductRequest filterPoductRequest); - List filterProducts(FilterPoductRequest filterPoductRequest); - boolean modifyRegistration(SupProductEntity supProductEntity); boolean insertRegistration(SupProductEntity supProductEntity); @@ -40,5 +26,4 @@ public interface SupProductService extends IService { boolean deleteById(@Param("id") String id); - boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); } diff --git a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java index 99889edb..7fa855d6 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java @@ -21,16 +21,6 @@ public class CustomerContactServiceImpl implements CustomerContactService { @Resource private CustomerContacDao customerContacDao; - @Override - public List filterCustomerContact(CustomerContactFilterRequest customerContactFilterRequest) { - if (customerContactFilterRequest == null) { - return Collections.emptyList(); - } - int offset = (customerContactFilterRequest.getPage() - 1) * customerContactFilterRequest.getLimit(); - PageHelper.offsetPage(offset, customerContactFilterRequest.getLimit()); - return customerContacDao.filterCustomerContact(customerContactFilterRequest); - } - @Override public boolean insertCustomerContact(CustomerContactEntity customerContactEntity) { return customerContacDao.insertCustomerContact(customerContactEntity); @@ -46,12 +36,6 @@ public class CustomerContactServiceImpl implements CustomerContactService { return customerContacDao.deleteById(id); } - @Override - public boolean deleteContact(DeleteRequest deleteRequest) { - return customerContacDao.deleteContact(deleteRequest); - } - - @Override public CustomerContactEntity selectById(Long emailId) { return customerContacDao.selectById(emailId); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java index 91ee0f9f..c284e738 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java @@ -56,10 +56,6 @@ public class PurArrivalDetailServiceImpl implements PurArrivalDetailService { return data; } - @Override - public List getPurArrivalDetailEntityList(PurOrderDetailRequest purOrderDetailRequest) { - return purArrivalDetailDao.queryPageList(purOrderDetailRequest); - } @Override public Boolean insert(PurArrivalDetailEntity purReturnedDetailEntity) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java index e62ca946..b7d8aaa8 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java @@ -45,10 +45,7 @@ public class PurArrivalServiceImpl implements PurArrivalService { return purArrivalDao.updateById(purArrivalEntity) > 0 ? true : false; } - @Override - public Boolean deleteByIds(List ids) { - return purArrivalDao.deleteBatchIds(ids) > 0 ? true : false; - } + @Override public Boolean deleteById(long id) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java index b8591b34..7bbcb594 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java @@ -55,11 +55,6 @@ public class PurDeliveryDetailServiceImpl implements PurDeliveryDetailService { return data; } - @Override - public List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest) { - return purDeliveryDetailDao.queryPageList(purOrderDetailRequest); - } - @Override public Boolean insert(PurDeliveryDetailEntity purReturnedDetailEntity) { return purDeliveryDetailDao.insert(purReturnedDetailEntity) > 0 ? true : false; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java index 93c4fa16..57bc14f6 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java @@ -57,11 +57,6 @@ public class PurReturnedDetailServiceImpl implements PurReturnedDetailService { return data; } - @Override - public List getPurOrderDetailEntityList(PurOrderDetailRequest purOrderDetailRequest) { - return purReturnedDetailDao.queryPageList(purOrderDetailRequest); - } - @Override public Boolean insert(PurReturnedDetailEntity purReturnedDetailEntity) { return purReturnedDetailDao.insert(purReturnedDetailEntity) > 0 ? true : false; @@ -82,11 +77,6 @@ public class PurReturnedDetailServiceImpl implements PurReturnedDetailService { return purReturnedDetailDao.deleteByOrderId(orderIdfK); } - @Override - public boolean insertPurReturnedDetailEntity(List purReturnedDetailEntity) { - return purReturnedDetailDao.insertPurReturnedDetailEntity(purReturnedDetailEntity); - } - @Override public BasicProductsEntity selectIoOrderDetailBiz(long id) { return purReturnedDetailDao.selectIoOrderDetailBiz(id); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java index c55f6572..210027a8 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java @@ -46,8 +46,7 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService { private SupCertDao supCertDao; @Resource private CustomerService customerService; - @Resource - private UdiCompanyDao udiCompanyDao; + @Override public List filterList(FilterCertRemindMsgRequest filterCertRemindMsgRequest) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java index 7c63541a..f3253fbe 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java @@ -77,11 +77,6 @@ public class SupCertServiceImpl extends ServiceImpl i return companyEntities; } - @Override - public SupCertEntity findCompanyCertByName(String companyName) { - return supCertDao.findCompanyCertByName(companyName); - } - @Override public List findAll(String customerId) { if (StrUtil.isEmpty(customerId)) diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java index 1579f630..3b93a78f 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCompanyServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.SupCompanyDao; import com.glxp.api.entity.purchase.SupCompanyEntity; -import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import com.glxp.api.service.purchase.SupCompanyService; import org.springframework.stereotype.Service; @@ -21,20 +20,6 @@ public class SupCompanyServiceImpl extends ServiceImpl companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest); - if (companyEntities != null && companyEntities.size() > 0) { - return companyEntities.get(0); - } - return null; - } - @Override public List filterCompany(FilterSupCompanyRequest companyRequest) { if (companyRequest == null) { @@ -69,31 +54,6 @@ public class SupCompanyServiceImpl extends ServiceImpl getSubCompany(FilterSupCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - if (commitRequest.getPage() != null) { - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - } - - List companyEntities = supCompanyDao.getSubCompany(commitRequest); - return companyEntities; - } - - @Override - public List getSubCompany2(FilterSupCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - List companyEntities = supCompanyDao.getSubCompany2(commitRequest); - return companyEntities; - } - @Override public SupCompanyEntity findCompanyByName(String companyName) { return supCompanyDao.findCompanyByName(companyName); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index 4e300f90..c4613efd 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -30,32 +30,6 @@ public class SupProductServiceImpl extends ServiceImpl companyEntities = supProductDao.getRegistration(filterPoductRequest); - if (CollUtil.isNotEmpty(companyEntities)) - return companyEntities.get(0); - - return null; - } - - @Override - public SupProductResponse findByPassByReCert(String registerCert) { - if (StrUtil.isEmpty(registerCert)) - return null; - FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); - filterPoductRequest.setRecordCode(registerCert); - filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); - List supProductEntities = supProductDao.getRegistration(filterPoductRequest); - if (CollUtil.isNotEmpty(supProductEntities)) - return supProductEntities.get(0); - - return null; - } @Override public SupProductResponse findByProductId(String productId) { @@ -71,47 +45,11 @@ public class SupProductServiceImpl extends ServiceImpl supProductEntities = supProductDao.selectList(new QueryWrapper().eq("relIdFk", relIdFk) - .and(tmp -> tmp.eq("auditStatus", ConstantStatus.AUDIT_PASS).or().eq("auditStatus", ConstantStatus.AUDIT_PASS)) - .last("LIMIT 1")); - if (CollUtil.isNotEmpty(supProductEntities)) - return supProductEntities.get(0); - else return null; - } - - @Override - public SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk) { - - QueryWrapper ew = new QueryWrapper<>(); - if (StrUtil.isNotEmpty(manufactory)) { - ew.eq("manufactory", manufactory); - } - if (StrUtil.isNotEmpty(cpmctymc)) { - ew.eq("recordProductName", cpmctymc); - } - if (StrUtil.isNotEmpty(manufacturerIdFk)) { - ew.eq("manufacturerIdFk", manufacturerIdFk); - } - ew.last("limit 1"); - List supProductEntities = supProductDao.selectList(ew); - if (CollUtil.isNotEmpty(supProductEntities)) - return supProductEntities.get(0); - else return null; - } - @Override public SupProductEntity findExitByManufactury(String cpmctymc, String manufactory, String customerId) { return supProductDao.findByManufactury(cpmctymc, manufactory, customerId); } - @Override - public SupProductEntity findRegistrationByName(String recordProductName) { - return supProductDao.findRegistrationByName(recordProductName); - } - @Override public List getRegistration(FilterPoductRequest filterPoductRequest) { if (filterPoductRequest == null) { @@ -125,18 +63,6 @@ public class SupProductServiceImpl extends ServiceImpl filterProducts(FilterPoductRequest filterPoductRequest) { - if (filterPoductRequest == null) { - return Collections.emptyList(); - } - if (filterPoductRequest.getPage() != null) { - int offset = (filterPoductRequest.getPage() - 1) * filterPoductRequest.getLimit(); - PageHelper.offsetPage(offset, filterPoductRequest.getLimit()); - } - List supProductEntities = supProductDao.filterProducts(filterPoductRequest); - return supProductEntities; - } @Override public boolean modifyRegistration(SupProductEntity companyEntity) { @@ -158,8 +84,5 @@ public class SupProductServiceImpl extends ServiceImpl { - BasicDownloadStatusEntity findByData(String idDatas, Integer status); List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest); diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index cca138e5..7e2c3de4 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -121,7 +121,6 @@ public class SpsSyncDownloadService { //首次任务or上次任务结束 if (basicExportStatusEntity1 == null || IntUtil.value(BasicExportStatusEnum.COMPLETED.getCode()) == IntUtil.value(basicExportStatusEntity1.getStatus())) { -// log.info("no2:" + basicExportStatusEntity1.getStatus() + "---" + BasicExportStatusEnum.COMPLETED.getCode()); SpsSyncDataRequest spsSyncDataRequest = getRequest(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER); if (lastUpdateTime != null) spsSyncDataRequest.setLastUpdateTime(DateUtil.formatDateTime(lastUpdateTime)); @@ -245,11 +244,6 @@ public class SpsSyncDownloadService { } break; case DOCUMENT_TYPE_DATA: -// if (needExec(info.getTypeBus(), info.getTypeScan(), info.getTypeThird())) { -// basicExportInfoCreate(exportType, syncTime, now -// , x -> x.generateDocumentTypeDataFile(info, now, false, syncTime) -// , x -> x.generateDocumentTypeDataFile(info, now, true, syncTime)); -// } break; case DEVICE_TASK: basicExportInfoCreate(exportType, syncTime, now @@ -316,8 +310,6 @@ public class SpsSyncDownloadService { boolean result = redisUtil.setIfAbsent(redisKey, 1, 10); if (!result) { String errorMsg = String.format("syncIdcSps----process------------同步[%s]重复进入", exportEnum.getRemark()); -// logger.info(errorMsg); -// throw new RuntimeException(errorMsg); log.error(errorMsg); } BasicExportStatusEntity exportStatus = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class) @@ -512,11 +504,6 @@ public class SpsSyncDownloadService { } try { String fileFullPath = writeFile(filePath, exportType.getRemark(), JsonUtils.toJsonString(jsonMap)); - //计算总数 -// int total = 0; -// for (List l : jsonMap.values()) { -// total += l.size(); -// } try { //修改任务数据 boolean update = updateExportStatus(exportType, fileFullPath, remark.toString()); @@ -635,11 +622,6 @@ public class SpsSyncDownloadService { } try { String fileFullPath = writeFile(filePath, exportType.getRemark(), JsonUtils.toJsonString(jsonMap)); - //计算总数 -// int total = 0; -// for (List l : jsonMap.values()) { -// total += l.size(); -// } try { //修改任务数据 boolean update = updateExportStatus(exportType, fileFullPath, remark.toString()); @@ -667,110 +649,6 @@ public class SpsSyncDownloadService { private final IBasicBusTypeChangeService busTypeChangeService; private final IThrBusTypeOriginService thrBusTypeOriginService; - /** - * 读取单据类型数据，创建文件 - * - * @param info 同步设置信息 - * @param now 当前时间 - * @param createFile 是否创建文件 - * @return 是否有数据 true/false 有新数据/无新数据 - */ - protected boolean generateDocumentTypeDataFile(SyncDataSetResponse info, Date now, boolean createFile, Date syncTime) { - StringBuffer remark = new StringBuffer(); - List syncFiles = new ArrayList<>(); - BasicExportTypeEnum exportType = BasicExportTypeEnum.DOCUMENT_TYPE_DATA; - //文件数据 - Map jsonMap = new WeakHashMap<>(4); - Map> totalTimeMap = new WeakHashMap<>(10); - Map syncTimeMap = new WeakHashMap<>(3); - syncTimeMap.put("isNew", true); - boolean ge = false; - if (syncTime != null) { - ge = true; - } - try { - //确认有开启业务单据类型同步 - if (needExec(info.getTypeBus())) { - Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE, createFile); - totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE, map); - List bussinessTypeEntities = bussinessTypeService.list(Wrappers.lambdaQuery(BasicBussinessTypeEntity.class) - .le(!ge && (boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now) - .between(ge, BasicBussinessTypeEntity::getUpdateTime, syncTime, now) - .between(!ge && !(boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime - , map.get("oldDate"), now) - ); - if (CollectionUtil.isNotEmpty(bussinessTypeEntities)) { - remark.append("扫码单据类型：").append(bussinessTypeEntities.size()).append("条\n"); - jsonMap.put(BasicBussinessTypeEntity.class.getSimpleName(), bussinessTypeEntities); - } - } - //确认有开启扫码单据类型同步 - if (needExec(info.getTypeScan())) { - Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE, createFile); - totalTimeMap.put(BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE, map); - List busTypeChangeEntities = busTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class) - .le(!ge && (boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now) - .between(ge, BasicBusTypeChangeEntity::getUpdateTime, syncTime, now) - .between(!ge && !(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime - , map.get("oldDate"), now) - ); - if (CollectionUtil.isNotEmpty(busTypeChangeEntities)) { - remark.append("业务单据类型：").append(busTypeChangeEntities.size()).append("条\n"); - jsonMap.put(BasicBusTypeChangeEntity.class.getSimpleName(), busTypeChangeEntities); - } - } - //确认有开启第三方单据类型同步 - if (needExec(info.getTypeThird())) { - Map map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN, createFile); - totalTimeMap.put(BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN, map); - List thrBusTypeOriginEntities = thrBusTypeOriginService.list(Wrappers.lambdaQuery(ThrBusTypeOriginEntity.class) - .le(!ge && (boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now) - .between(ge, ThrBusTypeOriginEntity::getUpdateTime, syncTime, now) - .between(!ge && !(boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime - , map.get("oldDate"), now) - ); - if (CollectionUtil.isNotEmpty(thrBusTypeOriginEntities)) { - remark.append("第三方单据类型：").append(thrBusTypeOriginEntities.size()).append("条\n"); - jsonMap.put(ThrBusTypeOriginEntity.class.getSimpleName(), thrBusTypeOriginEntities); - } - } - - - if (jsonMap.size() > 0) { - jsonMap.put(SYNC_REMARK, remark.toString()); - if (!createFile) { - return true; - } - try { - String fileFullPath = writeFile(filePath, exportType.getRemark(), JsonUtils.toJsonString(jsonMap)); - //计算总数 -// int total = 0; -// for (List l : jsonMap.values()) { -// total += l.size(); -// } - try { - //修改任务数据 - boolean update = updateExportStatus(exportType, fileFullPath, remark.toString()); - } catch (Exception e) { - // 异常回滚 - this.exportTimeRollback(totalTimeMap, exportType, fileFullPath); - } - return true; - } catch (IOException e) { - logger.error(String.format("syncIdcSps----process------------生成[%s]文件及更改库操作异常，异常信息<%s>" - , exportType.getRemark(), e.getMessage())); - // 异常回滚 - this.exportTimeRollback(totalTimeMap, exportType, null); - } - } - return false; - } catch (Exception e) { - logger.error(e.getMessage()); - return false; - } - } - - @Resource DeviceInspectTaskService deviceInspectTaskService; @Resource @@ -1601,11 +1479,8 @@ public class SpsSyncDownloadService { syncFiles.add(orderInvoiceEntity.getLicenseUrl()); } } - orderInvoiceEntities.addAll(invoiceEntities); - } - } } diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java index 8fbc9682..4860f10d 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java @@ -16,10 +16,6 @@ public class SyncEditLogService extends ServiceImpl0; diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java index 330ffc9b..d041ddb8 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java @@ -17,10 +17,6 @@ public class SyncEditTypeService extends ServiceImpl0; diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java index 6b8185d4..8299b439 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java @@ -21,17 +21,6 @@ public class BasicDownloadServiceImpl extends ServiceImpl basicDownloadStatusEntities = basicDownloadDao.filterDownloadStatus(basicDownloadRequest); - if (CollUtil.isNotEmpty(basicDownloadStatusEntities)) { - return basicDownloadStatusEntities.get(0); - } - return null; - } @Override public List filterDownloadStatus(BasicDownloadRequest basicDownloadRequest) { diff --git a/src/main/java/com/glxp/api/service/system/CompanyService.java b/src/main/java/com/glxp/api/service/system/CompanyService.java index 2c49af8b..1543dbd0 100644 --- a/src/main/java/com/glxp/api/service/system/CompanyService.java +++ b/src/main/java/com/glxp/api/service/system/CompanyService.java @@ -8,24 +8,14 @@ import java.util.List; public interface CompanyService { - CompanyEntity findCompanyByUnitFk(String unitFk); - List filterCompany(FilterCompanyRequest companyRequest); CompanyEntity findCompany(String CustomerId); - List getSubCompany(FilterCompanyRequest commitRequest); - - List getSubCompany2(FilterCompanyRequest commitRequest); - CompanyEntity findCompanyByName(String companyName); boolean modifyCompany(CompanyEntity companyEntity); -// boolean insertCompany(CompanyEntity companyEntity); - - AliKeyEntity findKey(String customerId); - boolean deleteCompany(Long customerId); boolean insertCompany(CompanyEntity companyEntity); diff --git a/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java b/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java index 1c38a113..f8eb78d8 100644 --- a/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java +++ b/src/main/java/com/glxp/api/service/system/SyncUploadDataSetService.java @@ -4,9 +4,6 @@ import com.glxp.api.entity.system.SyncUploadDataSetEntity; public interface SyncUploadDataSetService { - - SyncUploadDataSetEntity findSet(); - SyncUploadDataSetEntity selectSet(); boolean insert(SyncUploadDataSetEntity syncUploadDataSetEntity); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java index 7d78daba..fede7e5d 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceService.java @@ -11,20 +11,10 @@ public interface SystemPDFTemplateRelevanceService { List filterList(FilterPdfTemplateRelevanceRequest systemPDFModuleRequest); - List listByCustomerId(Long customerId); - - List listByCustomerIdIn(List customerIds); - - List listByTemplateId(int templateId); - - SystemPDFTemplateRelevanceEntity selectModuleldAndAction(Integer moduleId,String localAction); - int insertSystemPDFTemplateRelevanceAll(List systemPDFTemplateRelevanceEntityList); boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); - int insertRolesCustomerIdAll(List templates, Long customerId); - boolean deleteByCustomerId(Integer customerId); boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java index 013dd90d..c841e5d2 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateService.java @@ -15,8 +15,6 @@ public interface SystemPDFTemplateService extends IService listPDFTemplates(Integer page, Integer limit); - SystemPDFTemplateEntity findSystemPDFTemplate(FilterPdfTemplateRequest filterPdfTemplateRequest); - SystemPDFTemplateEntity selectById(String id); boolean updateById(SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest); diff --git a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java index 1df29a3d..da36a563 100644 --- a/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java +++ b/src/main/java/com/glxp/api/service/system/SystemParamConfigService.java @@ -14,12 +14,6 @@ public interface SystemParamConfigService extends IService queryPage(FilterParamConfigRequest FilterParamConfigRequest); - SystemParamConfigEntity selectSystemParamConfig(); - - SystemParamConfigEntity findSystemParamConfig(FilterParamConfigRequest FilterParamConfigRequest); - - SystemParamConfigEntity selectByParamName(FilterParamConfigRequest filterParamConfigRequest); - SystemParamConfigEntity selectByParamKey(FilterParamConfigRequest filterParamConfigRequest); SystemParamConfigEntity selectByParamKey(String key); diff --git a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java index c9bb86cb..1348ac08 100644 --- a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java @@ -20,16 +20,7 @@ public class CompanyServiceImpl implements CompanyService { @Resource CompanyDao companyDao; - @Override - public CompanyEntity findCompanyByUnitFk(String unitFk) { - FilterCompanyRequest filterCompanyRequest = new FilterCompanyRequest(); - filterCompanyRequest.setUnitIdFk(unitFk); - List companyEntities = companyDao.filterCompany(filterCompanyRequest); - if (companyEntities != null && companyEntities.size() > 0) { - return companyEntities.get(0); - } - return null; - } + @Override public List filterCompany(FilterCompanyRequest companyRequest) { @@ -41,27 +32,6 @@ public class CompanyServiceImpl implements CompanyService { return companyDao.findCompany(CustomerId); } - @Override - public List getSubCompany(FilterCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - List companyEntities = companyDao.getSubCompany(commitRequest); - return companyEntities; - } - - @Override - public List getSubCompany2(FilterCompanyRequest commitRequest) { - if (commitRequest == null) { - return Collections.emptyList(); - } - int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); - PageHelper.offsetPage(offset, commitRequest.getLimit()); - List companyEntities = companyDao.getSubCompany2(commitRequest); - return companyEntities; - } @Override public CompanyEntity findCompanyByName(String companyName) { @@ -78,11 +48,6 @@ public class CompanyServiceImpl implements CompanyService { return companyDao.insertCompany(companyEntity); } - @Override - public AliKeyEntity findKey(String customerId) { - return companyDao.findKey(customerId); - } - @Override public boolean deleteCompany(Long customerId) { return companyDao.deleteCompany(customerId); diff --git a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java index 8dc91692..18269610 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SyncUploadDataSetServiceImpl.java @@ -20,11 +20,6 @@ public class SyncUploadDataSetServiceImpl implements SyncUploadDataSetService { @Resource SyncUploadDataBustypeService syncUploadDataBustypeService; - @Override - public SyncUploadDataSetEntity findSet() { - SyncUploadDataSetEntity syncDataSetEntity = syncUploadDataSetDao.selectSet(); - return syncDataSetEntity; - } @Override public SyncUploadDataSetEntity selectSet() { diff --git a/src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java deleted file mode 100644 index 75f73e84..00000000 --- a/src/main/java/com/glxp/api/service/system/impl/SysServerLogServiceImpl.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.glxp.api.service.system.impl; - -import com.glxp.api.service.system.SysServerLogService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@Transactional(rollbackFor = Exception.class) -public class SysServerLogServiceImpl implements SysServerLogService { -} diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java index 0b96e2e5..ba530a2b 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -30,46 +30,6 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest); } - /** - * 根据 customerId 获取模板id - * - * @param customerId - * @return - */ - @Override - public List listByCustomerId(Long customerId) { - return systemPDFTemplateRelevanceDao.listByCustomerId(customerId); - } - - /** - * 根据多个 customerId 查询角色列表 - * - * @param customerIds - * @return - */ - @Override - public List listByCustomerIdIn(List customerIds) { - if (customerIds.isEmpty()) { - return Collections.emptyList(); - } - return systemPDFTemplateRelevanceDao.listByCustomerIdIn(customerIds); - } - - /** - * 根据 roleId 获取 customerId - * - * @param templateId - * @return - */ - @Override - public List listByTemplateId(int templateId) { - return systemPDFTemplateRelevanceDao.listByTemplateId(templateId); - } - - @Override - public SystemPDFTemplateRelevanceEntity selectModuleldAndAction(Integer moduleId, String localAction) { - return systemPDFTemplateRelevanceDao.selectModuleldAndAction(moduleId,localAction); - } /** * 批量插入 @@ -92,28 +52,6 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR return systemPDFTemplateRelevanceDao.insert(systemPDFTemplateRelevanceEntity); } - /** - * 根据 模板ids 和 customerId 批量插入 - * - * @param templates - * @param customerId - * @return - */ - @Override - public int insertRolesCustomerIdAll(List templates, Long customerId) { - - List systemPDFTemplateRelevanceEntityList = templates.stream().map(aLong -> { - SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); - systemPDFTemplateRelevanceEntity.setTemplateId(aLong); - systemPDFTemplateRelevanceEntity.setCustomerId(customerId); - return systemPDFTemplateRelevanceEntity; - }).collect(Collectors.toList()); - if (!systemPDFTemplateRelevanceEntityList.isEmpty()) { - return insertSystemPDFTemplateRelevanceAll(systemPDFTemplateRelevanceEntityList); - } - - return 0; - } /** * 根据 customerId 删除对应的模板关联 diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java index cf3ed39c..3568c93e 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateServiceImpl.java @@ -37,10 +37,6 @@ public class SystemPDFTemplateServiceImpl extends ServiceImpl findByByApproved(String approvalNum) { - return this.baseMapper.selectList(new LambdaQueryWrapper().eq(ThirdAliDrug::getApprovalNum, approvalNum)); - } - - public boolean addOrUpdate(List list) { - if (list != null && list.size() > 0) { - for (ThirdAliDrug thirdAliDrug : list) { - ThirdAliDrug thirdAliDrugNew = this.getOne(new QueryWrapper().eq("nameCode", thirdAliDrug.getNameCode()) - .last("limit 1") - ); - if (Objects.isNull(thirdAliDrugNew)) { - thirdAliDrug.setId(null); - this.save(thirdAliDrug); - - } else { - this.update(thirdAliDrug, new QueryWrapper().eq("nameCode", thirdAliDrug.getNameCode())); - } - } - return true; - } else { - return false; - } - } - public boolean addOrUpdateJson(List list) { - if(list!=null && list.size() >0){ - for (Object object : list) { - ThirdAliDrug thirdAliDrug = JSONUtil.toBean(object.toString(),ThirdAliDrug.class); - ThirdAliDrug thirdAliDrugNew = this.getOne(new QueryWrapper().eq("nameCode", thirdAliDrug.getNameCode()) - .last("limit 1") - ); - if (Objects.isNull(thirdAliDrugNew)) { - - this.save(thirdAliDrug); - - } else { - this.update(thirdAliDrug, new QueryWrapper().eq("nameCode", thirdAliDrug.getNameCode())); - } - } - return true; - - }else { - return false; - } - } } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java index 95f6d311..7f0aeb59 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpImportDetailService.java @@ -12,9 +12,6 @@ public interface ThrCorpImportDetailService { List filterCorpDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); - boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); - - boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity); boolean insertCorpDetailImports( List thrCorpImportDetailEntities); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java index 3e37496e..05ba0db5 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java @@ -15,12 +15,8 @@ public interface ThrCorpService { List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest); - boolean insertThrCorps(ThrCorpEntity thrCorpEntity); - boolean insertThrCorpss(List thrCorpEntitys); - boolean updateThrCorps(ThrCorpEntity thrCorpEntity); - boolean deleteById(String id); boolean deleteByUnitId(String id); 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 e2a061ee..1268a820 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -44,8 +44,6 @@ public class ThrCorpsDlService { ThrCorpExportLogService thrCorpExportLogService; @Resource private ThrCorpImportDetailService thrCorpImportDetailService; - // @Value("${SPSYNC_IP}") -// private String spsSyncUrl; @Resource ErpBasicClient erpBasicClient; @Resource @@ -152,74 +150,6 @@ public class ThrCorpsDlService { thrCorpImportLogService.updateImportLog(thrProductsImportLogEntity); } - //导出生成Excel文件 - @Async - public void genExcel(String genKey, ThrCorpExportRequest thrCorpExportRequest) { - ThrCorpExportLogEntity thrCorpExportLogEntity = thrCorpExportLogService.selectByGenKey(genKey); - List> excelData = new ArrayList<>(); - List head = new ArrayList<>(); - head.add("往来单位ID"); - head.add("往来单位名称"); - head.add("拼音简写"); - head.add("地址"); - head.add("社会信用号"); - head.add("联系人"); - head.add("联系电话"); - excelData.add(head); - //选中导出 - if (thrCorpExportRequest.getThrCorpEntities() != null && thrCorpExportRequest.getThrCorpEntities().size() > 0) { - List corpEntities = thrCorpExportRequest.getThrCorpEntities(); - for (ThrCorpEntity thrCorpEntity : corpEntities) { - List rows = new ArrayList<>(); - rows.add(thrCorpEntity.getUnitId()); - rows.add(thrCorpEntity.getName()); - rows.add(thrCorpEntity.getSpell()); - rows.add(thrCorpEntity.getAddr()); - rows.add(thrCorpEntity.getCreditNo()); - rows.add(thrCorpEntity.getContact()); - rows.add(thrCorpEntity.getMobile()); - excelData.add(rows); - } - } else {//一键导出 - - //判断是否启用实时获取 - ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("corpUrl", thrCorpExportRequest.getThirdSys()); - if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null) { - thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - thrCorpExportLogEntity.setRemark("往来单位接口地址未定义"); - thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); - return; - } - - if (!thrSystemDetailEntity.getEnabled()) { - thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用"); - thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); - return; - } - - if (thrSystemDetailEntity.getFromType() == 0) { - //根据查询条件一键导出第三方系统往来单位 - List thrCorpEntities = exportCorps(thrCorpExportRequest); - excelData.addAll(getRows(thrCorpEntities)); - } else { - //根据查询条件一键导出数据库往来单位 - FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtil.copyProperties(thrCorpExportRequest, filterThrCorpRequest); - filterThrCorpRequest.setPage(null); - List> genDatas = genExcelData(filterThrCorpRequest); - if (genDatas != null && genDatas.size() > 0) { - excelData.addAll(genDatas); - } - } - - } - String sheetName = "往来单位信息"; - new ExcelUtil().exportExcel(excelData, sheetName, thrCorpExportLogEntity.getFilePath(), 20); - thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); - thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); - - } //接收第三方上传或文件导入数据 @Async diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java index 5927900b..2b2e5168 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java @@ -10,18 +10,12 @@ import java.util.List; public interface ThrDeptService { - ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault); - boolean editExit(String code, String thirdSysFk, Long id); List filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); - List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest); - boolean insertInvWarehouse(ThrDeptEntity thrDeptEntity); - boolean insertInvWarehouses(List thrDeptEntities); - boolean updateInvWarehouse(ThrDeptEntity thrDeptEntity); ThrDeptEntity selectById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java index 3dcd3554..827f2a65 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDetailService.java @@ -9,9 +9,6 @@ import java.util.List; public interface ThrInvProductsDetailService { List filterInvProductsDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); - boolean insertInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity); - - boolean updateInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity); boolean insertInvProductsDetailImports(List thrInvProductsImportDetailEntities); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java index f725eafa..4d3c56e0 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsService.java @@ -13,12 +13,9 @@ public interface ThrInvProductsService { ThrInvProductsEntity selectById(String id); - boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity); boolean insertThrInvProducts(List thrInvProductsEntities); - boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity); - boolean deleteById(String id); boolean deleteAll(); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java index 073a23ba..ae73a903 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java @@ -11,26 +11,15 @@ public interface ThrInvWarehouseService { ThrInvWarehouseEntity selectById(String id); - ThrInvWarehouseEntity selectByThrCode(String thirdSys, String thirdId); - List filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); List selectByPid(String pid); List selectByThrDeptCode( FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); boolean insertThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity); - boolean insertInvWarehouses(List thrSubInvWarehouseEntities); - boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity); boolean deleteById(String id); - /** - * 查询第三方分库数据 - * - * @param filterThrSubInvWarehouseRequest - * @return - */ - List filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java index 9181a070..ac33e946 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java @@ -42,49 +42,6 @@ public class ThrManufacturerService extends ServiceImpl> baseResponse = erpBasicClient.getThrManu(request); - - if (baseResponse.getCode() == 20000) { - List list = baseResponse.getData().getList(); - list.forEach(thrCorpsResponse -> { - ThrManufacturerEntity thrCorpEntity = thrManufacturerMapper.selectByUnitIdAndThirdId(thrCorpsResponse.getUnitId(), thrSystemDetailEntity.getThirdSysFk()); - if (null == thrCorpEntity) { - thrCorpEntity = new ThrManufacturerEntity(); - BeanUtils.copyProperties(thrCorpsResponse, thrCorpEntity); - thrCorpEntity.setCreateTime(new Date()); - thrCorpEntity.setUpdateTime(new Date()); - thrCorpEntity.setId(IdUtil.getSnowflakeNextId()); - thrCorpEntity.setThirdSysFk(thrSystemDetailEntity.getThirdSysFk()); - thrManufacturerMapper.insert(thrCorpEntity); - } else { - boolean isChange = verifyDataChange(thrCorpEntity, thrCorpsResponse); - if (isChange) { - thrCorpEntity.setUpdateTime(new Date()); - thrManufacturerMapper.updateById(thrCorpEntity); - } - } - }); - if (list.size() >= limit) { - page++; - } else { - break; - } - } else { - return baseResponse; - } - } - - return ResultVOUtils.success("下载完成"); - } public BaseResponse downloadByRequest(ThrManuFilterRequest request) { int page = 1; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java index fe7f6b22..56b03e87 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderDetailService.java @@ -13,12 +13,9 @@ public interface ThrOrderDetailService { List filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); - boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); boolean insertThrOrderDetails(List thrOrderDetailEntities); - int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); - boolean deleteById(String id); boolean deleteByOrderIdFk(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java index e35683c2..d7484187 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderImportDetailService.java @@ -11,10 +11,6 @@ public interface ThrOrderImportDetailService { List filterOrderImportDetail(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest); - boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); - - boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity); - boolean insertOrderImportDetails(List thrOrderImportDetailEntities); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java index e19fdb28..66539c7a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java @@ -13,20 +13,12 @@ public interface ThrOrderService { List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); - List filterAllOrders(List billNos, String action); - - List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest); - ThrOrderEntity findByUnique(String billNo, String thirdSysFk); - ThrOrderEntity findReceiveOrder(String billNo); - ThrOrderEntity findById(Integer id); boolean insertThrOrder(ThrOrderEntity thrCorpEntity); - boolean insertThrOrders(List thrOrderEntities); - int updateThrOrder(ThrOrderEntity thrOrderEntity); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index a3dc3d6c..c9830568 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -28,9 +28,6 @@ import java.util.List; @Service public class ThrOrdersDlService { - - // @Value("${SPSYNC_IP}") -// private String spsSyncUrl; @Resource ThrOrderService thrOrderService; @Resource @@ -142,81 +139,6 @@ public class ThrOrdersDlService { head.add("实际数量"); head.add("原单据类型"); excelData.add(head); - //todo改功能有关表还未设计 -// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderExportRequest.getBillAction()); -// -// //选中导出 -// if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) { -// BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); -// bussinessTypeFilterRequest.setEnabled(true); -// List bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); -// List erpOrderResponses = thrOrderExportRequest.getErpOrderResponses(); -// for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { -// List subErpOrders = erpOrderResponse.getSubErpOrders(); -// for (ErpOrderResponse.SubErpOrder subErpOrder : subErpOrders) { -// List rows = new ArrayList<>(); -// rows.add(erpOrderResponse.getBillNo()); -// rows.add(erpOrderResponse.getBilldate()); -//// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpOrderResponse.getCorpId(), bussinessTypeEntity.getThirdSysFk()); -//// if (basicUnitMaintainEntity != null) -//// rows.add(basicUnitMaintainEntity.getErpId()); -//// else -// rows.add(erpOrderResponse.getCorpId()); -// -// rows.add(erpOrderResponse.getCorpName()); -// rows.add(getName(bussinessTypeEntities, erpOrderResponse.getBillType())); -// rows.add(erpOrderResponse.getBillFlag()); -// rows.add(subErpOrder.getProductId()); -// rows.add(subErpOrder.getProductName()); -// rows.add(subErpOrder.getSpec()); -// rows.add(subErpOrder.getBatchNo()); -// rows.add(subErpOrder.getProductDate()); -// rows.add(subErpOrder.getExpireDate()); -// rows.add(subErpOrder.getCount() + ""); -// rows.add(subErpOrder.getReCount() + ""); -// rows.add(erpOrderResponse.getOriginType()); -// excelData.add(rows); -// } -// -// } -// -// } else {//一键导出 -// -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = thrSystemDetailService.selectByKey("orderQueryUrl", bussinessTypeEntity.getThirdSysFk()); -// -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("业务单据接口地址未定义"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrOrderExportLogEntity.setRemark("第三方系统业务单据接口服务未启用"); -// thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); -// return; -// } -// -// -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk()); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// List> datas = exportThrOrders(filterThrOrderRequest); -// excelData.addAll(datas); -// } else { -// FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); -// BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); -// List> genDatas = genExcelData(filterThrOrderRequest); -// if (genDatas != null && genDatas.size() > 0) { -// excelData.addAll(genDatas); -// } -// } -// -// } -// String sheetName = "业务单据"; -// new ExcelUtil().exportExcel(excelData, sheetName, thrOrderExportLogEntity.getFilePath(), 20); -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); } @@ -278,8 +200,6 @@ public class ThrOrdersDlService { //toDo 上傳SMP postThrOrderRequest.setGenKey(genKey); postThrOrderRequest.setThirdSys(thrOrderExportRequest.getThirdSysFk()); -// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); -// if (systemParamConfigEntity != null) { String response = httpOkClient.uCloudPost(getIpUrl() + "/udiwms/thrsys/postOrderDetail", postThrOrderRequest); BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { }); @@ -288,10 +208,6 @@ public class ThrOrdersDlService { } else { thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } -// } else { -// thrOrderExportLogEntity.setRemark("SMP服务IP地址未定义！"); -// thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// } thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddService.java index ed470488..351edc23 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsAddService.java @@ -10,15 +10,10 @@ import java.util.List; public interface ThrProductsAddService { List filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); - - List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); - ThrProductsAddEntity selectById(String id); boolean insertThrProducts(ThrProductsAddEntity thrProductsEntity); - boolean insertThrProductss(List thrProductsEntities); - boolean updateThrProducts(ThrProductsAddEntity thrProductsEntity); boolean deleteById(String id); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java index e6f18625..435f95ee 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsDlService.java @@ -39,255 +39,12 @@ public class ThrProductsDlService { ThrProductsService thrProductsService; @Resource ThrSystemDetailService thrSystemDetailService; - // @Resource -// RedisUtil redisUtil; -// @Resource -// ThrProductsImportLogService thrProductsImportLogService; -// @Resource -// ThrProductsImportDetailService thrProductsImportDetailService; @Resource ThrProductsExportLogService thrProductsExportLogService; @Resource private ErpBasicClient erpBasicClient; - // @Resource -// private BasicThirdSysService basicThirdSysService; -// @Resource -// private UdiRelevanceService udiRelevanceService; -// @Resource -// private UdiContrastService udiContrastService; -// -// @Async -// public void importSelectProducrs(String genKey, List thrProductsEntities, String thirdSys) { -// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); -// if (thrProductsEntities != null && thrProductsEntities.size() > 0) { -// List thrProductsImportDetailEntities; -// thrProductsImportDetailEntities = thrProductsEntities.stream().map( -// item -> { -// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); -// thrProductsImportDetailEntity.setSpec(item.getStandard()); -// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); -// thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); -// return thrProductsImportDetailEntity; -// } -// ).collect(Collectors.toList()); -// thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities); -// FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); -// filterUdiIpLogRequest.setGenKey(genKey); -// List thrProductsImportDetailEntities1 = -// thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); -// List thrProductsEntities1 = thrProductsImportDetailEntities1.stream().map( -// item -> { -// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// thrProductsEntity.setUpdateTime(new Date()); -//// thrProductsService.insertOrUpdateSelective(thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// thrProductsService.insertThrProductss(thrProductsEntities1); -// -// redisUtil.set(Constant.dlThrProducts, "false"); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); -// } -// } -// -// //主动下载产品信息 -// @Async -// public void importProducrs(String genKey, FilterThrProductsRequest filterThrProductsRequest) { -// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); -// BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSysFk()); -// if (piDetailEntity == null || piDetailEntity.getValue() == null) { -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsImportLogEntity.setRemark("产品信息接口未设置"); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// WebSocketServer.sendInfo("产品信息接口未设置！", "sid"); -// return; -// } -// -// int page = 1; -// int limit = 50; -// while (page != -1) { -// FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); -// BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest); -// page = getInvmandoc(thrProductsImportLogEntity, page, limit, piDetailEntity.getValue(), filterErpGoodsRequest.getThirdSys(), filterErpGoodsRequest); -// } -// FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); -// filterUdiIpLogRequest.setGenKey(genKey); -// List thrProductsImportDetailEntities = -// thrProductsImportDetailService.filterProductsDetailImport(filterUdiIpLogRequest); -// List thrProductsEntities = thrProductsImportDetailEntities.stream().map( -// item -> { -// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// thrProductsEntity.setUpdateTime(new Date()); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// -// List> splitList = CustomUtil.splitList(thrProductsEntities, 100); -// for (List data : splitList) { -// thrProductsService.insertThrProductss(data); -// } -//// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); -//// if (filterThrProductsRequest.getThirdSysFk().equals(basicThirdSysEntity.getThirdId())) { -//// for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { -//// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByMainIdLimitOne(thrProductsEntity.getCode()); -//// if (udiRelevanceEntity == null) { -//// udiContrastService.createOnlyMainId(thrProductsEntity.getCode()); -//// } -//// } -//// } -// redisUtil.set(Constant.dlThrProducts, "false"); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); -// } -// -// //导出生成Excel文件 -// @Async -// public void genExcel(String genKey, ThrProductsExportRequest thrProductsExportRequest) { -// -// ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); -// -// List> excelData = new ArrayList<>(); -// List head = new ArrayList<>(); -// head.add("产品ID"); -// head.add("产品名称"); -// head.add("计量单位"); -// head.add("规格型号"); -// head.add("注册证号"); -// head.add("生产厂家"); -// head.add("配送企业"); -// excelData.add(head); -// //选中导出 -// if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { -// List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); -// excelData.addAll(getRows(thrProductsEntities)); -// -// } else {//一键导出 -// -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// -// if (!basicThirdSysDetailEntity.getEnabled()) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); -// List thrProductsEntities = exportThrProducts(filterThrProductsRequest); -// excelData.addAll(getRows(thrProductsEntities)); -// -// } else { -// FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrInvProductsRequest); -// List> genDatas = genExcelData(null, filterThrInvProductsRequest); -// if (genDatas != null && genDatas.size() > 0) { -// excelData.addAll(genDatas); -// } -// } -// } -// String sheetName = "产品信息"; -// new ExcelUtil().exportExcel(excelData, sheetName, thrProductsExportLogEntity.getFilePath(), 20); -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// -// } -// -// //上传SMP -// @Async -// public void uploadSmp(String genKey, ThrProductsExportRequest thrProductsExportRequest) { -// -// PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest(); -// List datas = new ArrayList<>(); -// ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey); -// -// //选中导出 -// if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) { -// List thrProductsEntities = thrProductsExportRequest.getThrProductsEntities(); -// List lists = thrProductsEntities.stream().map( -// item -> { -// ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// datas.addAll(lists); -// postThrProductsRequest.setDatas(datas); -// postThrProductsRequest.setGenKey(genKey); -// postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); -// postThrProductsRequest.setUploadType("接口上传"); -// -// -// } else {//一键导出 -// -// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys()); -// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("产品信息接口未定义！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// -// if (!basicThirdSysDetailEntity.getEnabled()) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！"); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// return; -// } -// List thrProductsEntities; -// if (basicThirdSysDetailEntity.getFromType() == 0) { -// FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); -// BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest); -// thrProductsEntities = exportThrProducts(filterThrProductsRequest); -// } else { -// FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); -// thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest); -// } -// if (thrProductsEntities != null) { -// List lists = thrProductsEntities.stream().map( -// item -> { -// ErpProductsResponse thrProductsEntity = new ErpProductsResponse(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// datas.addAll(lists); -// postThrProductsRequest.setDatas(datas); -// postThrProductsRequest.setGenKey(genKey); -// postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys()); -// postThrProductsRequest.setUploadType("接口上传"); -// } -// -// -// } -// String response = httpOkClient.uCloudPost(getIpUrl() + "/udiwms/thrsys/postThrProducts", postThrProductsRequest); -// BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { -// }); -// if (baseResponse.getCode() == 20000) { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// } else { -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// } -// thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); -// } -// -// //上传SMP @Async public void uploadSpssync(String genKey, ThrProductsExportRequest thrProductsExportRequest) { @@ -380,89 +137,6 @@ public class ThrProductsDlService { SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet(); return syncDataSetEntity.getSyncIp(); } - - // -// // //接收第三方上传或文件导入数据 -// @Async -// public void insertData(String genKey, List erpProductsResponses, String thirdSys) { -// ThrProductsImportLogEntity thrProductsImportLogEntity = thrProductsImportLogService.selectByGenKey(genKey); -// if (erpProductsResponses != null && erpProductsResponses.size() > 0) { -// List thrProductsImportDetailEntities; -// thrProductsImportDetailEntities = erpProductsResponses.stream().map( -// item -> { -// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); -// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); -// thrProductsImportDetailEntity.setGenKeyFk(genKey); -// return thrProductsImportDetailEntity; -// } -// ).collect(Collectors.toList()); -// -// List> splitList = CustomUtil.splitList(thrProductsImportDetailEntities, 100); -// for (List data : splitList) { -// thrProductsImportDetailService.insertProductsDetailImports(data); -// } -// List thrProductsEntities; -// thrProductsEntities = thrProductsImportDetailEntities.stream().map( -// item -> { -// ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); -// BeanUtils.copyProperties(item, thrProductsEntity); -// thrProductsEntity.setUpdateTime(new Date()); -// thrProductsService.insertOrUpdateSelective(thrProductsEntity); -// return thrProductsEntity; -// } -// ).collect(Collectors.toList()); -// List> products = CustomUtil.splitList(thrProductsEntities, 100); -//// for (List data : products) { -//// thrProductsService.insertThrProductss(data); -//// } -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); -// thrProductsImportLogEntity.setUpdateTime(new Date()); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// } else { -// thrProductsImportLogEntity.setRemark("未选择产品信息"); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// } -// } -// -// public int getInvmandoc(ThrProductsImportLogEntity thrProductsImportLogEntity, int page, int limit, String -// productUrl, String thirdSys, FilterErpGoodsRequest filterErpGoodsRequest) { -// -// filterErpGoodsRequest.setPage(page); -// filterErpGoodsRequest.setLimit(limit); -// BaseResponse> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest); -// if (erpProducts != null && erpProducts.getCode() == 20000) { -// List erpProductsResponses = erpProducts.getData().getList(); -// if (erpProductsResponses != null && erpProductsResponses.size() > 0) { -// List thrProductsImportDetailEntities; -// thrProductsImportDetailEntities = erpProductsResponses.stream().map( -// item -> { -// ThrProductsImportDetailEntity thrProductsImportDetailEntity = new ThrProductsImportDetailEntity(); -// BeanUtils.copyProperties(item, thrProductsImportDetailEntity); -// thrProductsImportDetailEntity.setSpec(item.getStandard()); -// thrProductsImportDetailEntity.setThirdSysFk(thirdSys); -// thrProductsImportDetailEntity.setGenKeyFk(thrProductsImportLogEntity.getGenKey()); -// return thrProductsImportDetailEntity; -// } -// ).collect(Collectors.toList()); -// thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities); -// page++; -// return page; -//// if (page * limit < erpProducts.getData().getTotal()) { -//// return page; -//// } -// } else { -// return -1; -// } -// } else { -// thrProductsImportLogEntity.setRemark(erpProducts.getMessage()); -// thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); -// thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); -// return -1; -// } -// } -// public List exportThrProducts(FilterThrProductsRequest filterThrProductsRequest) { ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("piQueryUrl", filterThrProductsRequest.getThirdSys()); int page = 1; @@ -508,20 +182,6 @@ public class ThrProductsDlService { return null; } - // public List> genExcelData(String id, FilterThrProductsRequest filterThrProductsRequest) { -// -// List> excelData = new ArrayList<>(); -// List thrProductsEntities = new ArrayList<>(); -// if (id != null) { -// ThrProductsEntity thrProductsEntity = thrProductsService.selectById(id); -// thrProductsEntities.add(thrProductsEntity); -// } else { -// thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); -// } -// excelData.addAll(getRows(thrProductsEntities)); -// return excelData; -// } -// public List genJsonData(String id, FilterThrProductsRequest filterThrProductsRequest) { List jsonData = new ArrayList<>(); if (id != null) { @@ -535,24 +195,6 @@ public class ThrProductsDlService { return jsonData; } - // -// public List> getRows(List thrProductsEntities) { -// List> excelData = new ArrayList<>(); -// for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { -// List rows = new ArrayList<>(); -// rows.add(thrProductsEntity.getCode()); -// rows.add(thrProductsEntity.getName()); -// rows.add(thrProductsEntity.getMeasname() + ""); -// rows.add(thrProductsEntity.getSpec()); -// rows.add(thrProductsEntity.getRegisterNo()); -// rows.add(thrProductsEntity.getManufactory()); -// rows.add(thrProductsEntity.getSupName()); -// excelData.add(rows); -// } -// return excelData; -// } -// -// //导出json文件 @Async public void genJsonFile(String genKey, ThrProductsExportRequest thrProductsExportRequest) { diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java index 5e2e2e2b..845a0185 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportDetailService.java @@ -11,12 +11,6 @@ public interface ThrProductsImportDetailService { List filterProductsDetailImport(FilterThrProductsImportLogRequest filterThrProductsImportLogRequest); - boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); - - boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity); - - boolean insertProductsDetailImports(List thrOrderImportDetailEntities); - boolean deleteById(String id); boolean deleteByTime(); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java index e1c48235..22d9552c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductsImportLogService.java @@ -14,10 +14,7 @@ public interface ThrProductsImportLogService { boolean insertImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); boolean updateImportLog(ThrProductsImportLogEntity thrProductsImportLogEntity); -// boolean deleteById(String id); boolean deleteByTime(); -// -// ThrProductsImportLogEntity selectByGenKey(String genKey); } diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java index a6117b5c..885c071b 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemBusApiService.java @@ -8,8 +8,6 @@ import java.util.List; public interface ThrSystemBusApiService { - boolean insertSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity); - boolean updateSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity); ThrSystemBusApiEntity selectByKey(String key, String thirdSys); diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java index 577ec52f..6f4eec22 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java @@ -31,10 +31,9 @@ public interface ThrSystemService { /** * 根据第三方系统ID查询第三方系统名称 * - * @param thirdId + * @param filterBasicThirdSysRequest * @return */ - String selectThirdNameByThirdId(@Param("thirdId") String thirdId); int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java index 27e7401d..3b3af956 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -109,33 +109,6 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl responseList = thrBusTypeOriginDao.filterJoinList(request); - if (CollUtil.isNotEmpty(responseList)) { - return responseList.get(0); - } - return null; - } - - @Override - public ThrBusTypeOriginResponse findByMainAction(String mainAction) { - FilterThrBusTypeOriginRequest request = new FilterThrBusTypeOriginRequest(); - request.setMainAction(mainAction); - List responseList = thrBusTypeOriginDao.filterJoinList(request); - if (CollUtil.isNotEmpty(responseList)) { - return responseList.get(0); - } - return null; - } - - @Override - public String findNameByAction(String originAction) { - return thrBusTypeOriginDao.selectNameByAction(originAction); - } - /** * 设置创建/更新信息 * diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index 94c029e4..3b4a9ff7 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -21,8 +21,6 @@ import java.util.List; public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { @Resource ThrCorpExportLogDao thrCorpExportLogDao; - @Resource - CustomerService customerService; @Override public ThrCorpExportLogEntity selectByGenKey(String genKey) { @@ -57,9 +55,6 @@ public class ThrCorpExportLogServiceImpl implements ThrCorpExportLogService { public boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity) { //塞入创建时间创建人 thrCorpExportLogEntity.setCreateTime(new Date()); - //todo 未添加创建人 -// thrCorpExportLogEntity.setCreateUser(String.valueOf(customerService.getUserId())); -// thrCorpExportLogEntity.setUpdateUser(String.valueOf(customerService.getUserId())); return thrCorpExportLogDao.updateThrCorpExportLog(thrCorpExportLogEntity); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index a778ecba..c447b1a9 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -20,8 +20,6 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic @Resource ThrCorpImportDetailDao thrCorpImportDetailDao; - @Resource - CustomerService customerServicel; @Override public List filterCorpDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { @@ -36,24 +34,6 @@ public class ThrCorpImportDetailServiceImpl implements ThrCorpImportDetailServic return data; } - @Override - public boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { - thrCorpImportDetailEntity.setUpdateTime(new Date()); - thrCorpImportDetailEntity.setCreateTime(new Date()); - thrCorpImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrCorpImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrCorpImportDetailDao.insertCorpDetailImport(thrCorpImportDetailEntity); - } - - @Override - public boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity) { - thrCorpImportDetailEntity.setUpdateTime(new Date()); - thrCorpImportDetailEntity.setCreateTime(new Date()); - thrCorpImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrCorpImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrCorpImportDetailDao.updateCorpDetailImport(thrCorpImportDetailEntity); - } - @Override public boolean insertCorpDetailImports(List thrCorpImportDetailEntities) { return thrCorpImportDetailDao.insertCorpDetailImports(thrCorpImportDetailEntities); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index d3d58d6d..f53d8faf 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -36,21 +36,11 @@ public class ThrCorpServiceImpl implements ThrCorpService { return data; } - @Override - public boolean insertThrCorps(ThrCorpEntity thrCorpEntity) { - return thrCorpDao.insertThrCorps(thrCorpEntity); - } - @Override public boolean insertThrCorpss(List thrCorpEntitys) { return thrCorpDao.insertThrCorpss(thrCorpEntitys); } - @Override - public boolean updateThrCorps(ThrCorpEntity thrCorpEntity) { - return thrCorpDao.updateThrCorps(thrCorpEntity); - } - @Override public boolean deleteById(String id) { return thrCorpDao.deleteById(id); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index ec1f4fa2..d77b4dc2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -36,17 +36,6 @@ public class ThrDeptServiceImpl implements ThrDeptService { @Resource private ThrInvWarehouseDao thrInvWarehouseDao; - @Override - public ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault) { - - FilterThrDeptRequest filterThrDeptRequest = new FilterThrDeptRequest(); - filterThrDeptRequest.setIsDefault(isDefault); - filterThrDeptRequest.setAdvanceType(advaceType); - List thrInvWarehouseEntities = thrDeptDao.filterThrInvWarehouse(filterThrDeptRequest); - if (thrInvWarehouseEntities != null && thrInvWarehouseEntities.size() > 0) - return thrInvWarehouseEntities.get(0); - return null; - } @Override public boolean editExit(String code, String thirdSysFk, Long id) { @@ -65,27 +54,12 @@ public class ThrDeptServiceImpl implements ThrDeptService { return thrDeptDao.filterThrInvWarehouse(filterThrDeptRequest); } - @Override - public List filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) { - if (filterThrDeptRequest == null) { - return Collections.emptyList(); - } - if (filterThrDeptRequest.getPage() != null) { - int offset = (filterThrDeptRequest.getPage() - 1) * filterThrDeptRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrDeptRequest.getLimit()); - } - return thrDeptDao.filterThrGroupInvWarehouse(filterThrDeptRequest); - } @Override public boolean insertInvWarehouse(ThrDeptEntity thrDeptEntity) { return thrDeptDao.insertThrInvWarehouse(thrDeptEntity); } - @Override - public boolean insertInvWarehouses(List thrDeptEntities) { - return thrDeptDao.insertInvWarehouses(thrDeptEntities); - } @Override public boolean updateInvWarehouse(ThrDeptEntity thrDeptEntity) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 04308639..05d798f4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -20,8 +20,6 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ @Resource ThrInvProductsDetailDao thrInvProductsDetailDao; - @Resource - CustomerService customerServicel; @Override public List filterInvProductsDetailImport(FilterThrCorpImportLogRequest filterThrCorpImportLogRequest) { @@ -36,24 +34,6 @@ public class ThrInvProductsDetailServiceImpl implements ThrInvProductsDetailServ return data; } - @Override - public boolean insertInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity) { - thrInvProductsImportDetailEntity.setUpdateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDetailDao.insertInvProductsDetailImport(thrInvProductsImportDetailEntity); - } - - @Override - public boolean updateInvProductsDetailImport(ThrInvProductsImportDetailEntity thrInvProductsImportDetailEntity) { - thrInvProductsImportDetailEntity.setUpdateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateTime(new Date()); - thrInvProductsImportDetailEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsImportDetailEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDetailDao.updateInvProductsDetailImport(thrInvProductsImportDetailEntity); - } - @Override public boolean insertInvProductsDetailImports(List thrInvProductsImportDetailEntities) { return thrInvProductsDetailDao.insertInvProductsDetailImports(thrInvProductsImportDetailEntities); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index 2a169429..e81cad1e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -21,9 +21,6 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { @Resource private ThrInvProductsDao thrInvProductsDao; - @Resource - CustomerService customerServicel; - @Override public List filterThrInvProductss(FilterThrInvProductsRequest filterThrInvProductsRequest) { if (filterThrInvProductsRequest == null) { @@ -42,29 +39,12 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { return thrInvProductsDao.selectById(id); } - @Override - public boolean insertThrInvProduct(ThrInvProductsEntity thrInvProductsEntity) { - thrInvProductsEntity.setUpdateTime(new Date()); - thrInvProductsEntity.setCreateTime(new Date()); - thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDao.insertThrInvProduct(thrInvProductsEntity); - } @Override public boolean insertThrInvProducts(List thrInvProductsEntities) { return thrInvProductsDao.insertThrInvProducts(thrInvProductsEntities); } - @Override - public boolean updateThrInvProducts(ThrInvProductsEntity thrInvProductsEntity) { - thrInvProductsEntity.setUpdateTime(new Date()); - thrInvProductsEntity.setCreateTime(new Date()); - thrInvProductsEntity.setCreateUser(String.valueOf(customerServicel.getUserId())); - thrInvProductsEntity.setUpdateUser(String.valueOf(customerServicel.getUserId())); - return thrInvProductsDao.updateThrInvProducts(thrInvProductsEntity); - } - @Override public boolean deleteById(String id) { return thrInvProductsDao.deleteById(id); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index 606c229f..3ad46547 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -38,16 +38,6 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { return null; } - @Override - public ThrInvWarehouseEntity selectByThrCode(String thirdSys, String thirdId) { - FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest = new FilterThrSubInvWarehouseRequest(); - filterThrSubInvWarehouseRequest.setCode(thirdId); - filterThrSubInvWarehouseRequest.setThirdSysFk(thirdSys); - List thrInvWarehouseEntitys = thrInvWarehouseDao.filterThrInvWarehouse(filterThrSubInvWarehouseRequest); - if (CollUtil.isNotEmpty(thrInvWarehouseEntitys)) { - return thrInvWarehouseEntitys.get(0); - } else return null; - } @Override public List filterThrInvWarehouse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { @@ -84,11 +74,6 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity); } - @Override - public boolean insertInvWarehouses(List thrInvWarehouseEntitys) { - return thrInvWarehouseDao.insertThrInvWarehouses(thrInvWarehouseEntitys); - } - @Override public boolean updateThrInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) { thrInvWarehouseEntity.setUpdateTime(new Date()); @@ -100,16 +85,4 @@ public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService { return thrInvWarehouseDao.deleteById(id); } - @Override - public List filterThrInvWarehouseResponse(FilterThrSubInvWarehouseRequest filterThrSubInvWarehouseRequest) { - if (null == filterThrSubInvWarehouseRequest) { - return Collections.emptyList(); - } - if (filterThrSubInvWarehouseRequest.getPage() != null) { - int offset = (filterThrSubInvWarehouseRequest.getPage() - 1) * filterThrSubInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrSubInvWarehouseRequest.getLimit()); - } - return thrInvWarehouseDao.filterThrInvWarehouseResponse(filterThrSubInvWarehouseRequest); - } - } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java index 0e3c58c5..4fb1b4c6 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -38,20 +38,12 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { return data; } - @Override - public boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { - return thrOrderDetailDao.insertThrOrderDetail(thrOrderDetailEntity); - } @Override public boolean insertThrOrderDetails(List thrOrderDetailEntities) { return thrOrderDetailDao.insertThrOrderDetails(thrOrderDetailEntities); } - @Override - public int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { - return thrOrderDetailDao.updateById(thrOrderDetailEntity); - } @Override public boolean deleteById(String id) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index f43fa3b4..dd9fddf4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -32,16 +32,6 @@ public class ThrOrderImportDetailServiceImpl implements ThrOrderImportDetailServ return data; } - @Override - public boolean insertOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { - return thrOrderImportDetailDao.insertOrderdDetailImport(thrOrderImportDetailEntity); - } - - @Override - public boolean updateOrderImportDetail(ThrOrderImportDetailEntity thrOrderImportDetailEntity) { - return thrOrderImportDetailDao.updateOrderdDetailImport(thrOrderImportDetailEntity); - } - @Override public boolean insertOrderImportDetails(List thrOrderImportDetailEntities) { return thrOrderImportDetailDao.insertOrderdDetailImports(thrOrderImportDetailEntities); 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 22bb1f32..b3bf0f94 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 @@ -98,10 +98,6 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); BeanUtil.copyProperties(thrOrderImportDetailEntity, thrOrderEntity); thrOrderEntity.setUpdateTime(new Date()); -// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(thrOrderEntity.getBillType()); -// if (bussinessTypeEntity != null) { -// thrOrderEntity.setBillType(bussinessTypeEntity.getAction()); -// } thrOrderService.insertThrOrder(thrOrderEntity); thrOrderEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); ThrOrderEntity finalThrOrderEntity = thrOrderEntity; @@ -115,9 +111,7 @@ public class ThrOrderImportLogServiceImpl implements ThrOrderImportLogService { return thrOrderDetailEntity; }).collect(Collectors.toList()); thrOrderDetailService.insertThrOrderDetails(postDatas); - } - thrOrderImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); this.updateImportLog(thrOrderImportLogEntity); 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 9b9d3c66..b5dbeb74 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 @@ -43,74 +43,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { return data; } - - @Override - public List filterAllOrders(List billNos, String thirdSys) { - List erpOrderEntities = new ArrayList<>(); - for (String billNo : billNos) { - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - filterThrOrderRequest.setBillNo(billNo); - filterThrOrderRequest.setThirdSysFk(thirdSys); - List data = thrOrderDao.filterThrOrder(filterThrOrderRequest); - if (data != null && data.size() > 0) { - for (ThrOrderEntity thrOrderEntity : data) { - FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); - filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); - List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { - for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { - ThrErpOrderResponse thrErpOrderResponse = new ThrErpOrderResponse(); - BeanUtil.copyProperties(thrOrderEntity, thrErpOrderResponse); - BeanUtil.copyProperties(thrOrderDetailEntity, thrErpOrderResponse); - thrErpOrderResponse.setCompanyid(thrOrderEntity.getCorpId()); - thrErpOrderResponse.setCompanyname(thrOrderEntity.getCorpName()); - thrErpOrderResponse.setErpOrderId(thrOrderEntity.getBillNo()); - thrErpOrderResponse.setIodtlId(thrOrderEntity.getBillNo()); - thrErpOrderResponse.setErpCount(Integer.valueOf(thrOrderDetailEntity.getCount())); - thrErpOrderResponse.setReCount(Integer.valueOf(thrOrderDetailEntity.getReCount())); - thrErpOrderResponse.setBatchNo(thrOrderDetailEntity.getBatchNo()); - thrErpOrderResponse.setGoodsid(thrOrderDetailEntity.getProductId()); - thrErpOrderResponse.setGoodsname(thrOrderDetailEntity.getProductName()); - thrErpOrderResponse.setCredate(thrOrderDetailEntity.getProductDate()); - thrErpOrderResponse.setExpireDate(thrOrderDetailEntity.getExpireDate()); - thrErpOrderResponse.setPackSpec(thrOrderDetailEntity.getSpec()); - erpOrderEntities.add(thrErpOrderResponse); - } - } - } - } - } - return erpOrderEntities; - } - - @Override - public List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest) { - - List erpOrderResponses = new ArrayList<>(); - List data = filterThrOrder(filterThrOrderRequest); - if (data != null && data.size() > 0) { - for (ThrOrderEntity thrOrderEntity : data) { - FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); - filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); - List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - ThrOrderResponse erpOrderResponse = new ThrOrderResponse(); - BeanUtil.copyProperties(thrOrderEntity, erpOrderResponse); - List subErpOrders = new ArrayList<>(); - if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { - for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { - ThrOrderResponse.SubErpOrder subErpOrder = new ThrOrderResponse.SubErpOrder(); - BeanUtil.copyProperties(thrOrderDetailEntity, subErpOrder); - subErpOrders.add(subErpOrder); - } - } - erpOrderResponse.setSubErpOrders(subErpOrders); - erpOrderResponses.add(erpOrderResponse); - } - } - - return erpOrderResponses; - } - @Override public ThrOrderEntity findByUnique(String billNo, String thirdSysFk) { @@ -128,21 +60,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { return null; } - @Override - public ThrOrderEntity findReceiveOrder(String billNo) { - if (StrUtil.isEmpty(billNo)) { - return null; - } - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - filterThrOrderRequest.setBillNo(billNo); - filterThrOrderRequest.setType(1); - List thrOrderEntities = filterThrOrder(filterThrOrderRequest); - if (thrOrderEntities != null && thrOrderEntities.size() > 0) { - return thrOrderEntities.get(0); - } - return null; - } - @Override public ThrOrderEntity findById(Integer id) { return thrOrderDao.selectById(id); @@ -153,11 +70,6 @@ public class ThrOrderServiceImpl implements ThrOrderService { return thrOrderDao.insertThrOrder(thrCorpEntity); } - @Override - public boolean insertThrOrders(List thrOrderEntities) { - return thrOrderDao.insertThrOrders(thrOrderEntities); - } - @Override public int updateThrOrder(ThrOrderEntity thrOrderEntity) { return thrOrderDao.updateById(thrOrderEntity); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java index 492959d8..67a76e15 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java @@ -75,19 +75,6 @@ public class ThrProductsAddDiService extends ServiceImpl thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest); - if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) { - return thrProductsAddDiResponses.get(0); - } - return null; - } - public boolean exits(String devKey) { return thrProductsAddDiDao.exists(new QueryWrapper().eq("deviceRecordKey", devKey)); @@ -172,14 +159,6 @@ public class ThrProductsAddDiService extends ServiceImpl= 7) { -// Integer catalogcode1 = Integer.valueOf(catalogcode.substring(1, 3)); -// Integer catalogcode2 = Integer.valueOf(catalogcode1 + catalogcode.substring(3, 5)); -// Integer catalogcode3 = Integer.valueOf(catalogcode2 + catalogcode.substring(5, 7)); -// thrProductsAddDiEntity.setCatalogCode1(catalogcode1); -// thrProductsAddDiEntity.setCatalogCode2(catalogcode2); -// thrProductsAddDiEntity.setCatalogCode3(catalogcode3); -// } String internalMaterialCode = this.getInternalMaterialCode("10","66"); thrProductsAddDiEntity.setInternalMaterialCode(internalMaterialCode); list.add(thrProductsAddDiEntity); @@ -249,76 +228,6 @@ public class ThrProductsAddDiService extends ServiceImpl voList = excelHandler.importExcel(multipartFile, AddThrDiProductsExcelVo.class, null); -// if (CollectionUtils.isNotEmpty(voList)) { -// log.info("本次成功入：" + voList.size() + "条,数据如下---------------"); -// voList.forEach(excelVo -> { -// ProductInfoEntity productInfoEntity = productInfoService.findByNameCode(excelVo.getNameCode()); -// AddThrDiProductsRequest addThrDiProductsRequest = new AddThrDiProductsRequest(); -// if (productInfoEntity != null) { -// addThrDiProductsRequest.setUuids(List.of(productInfoEntity.getUuid())); -// } else { -// addThrDiProductsRequest.setUuids(List.of("null")); -// } -// //todo -// addThrDiProductsRequest.setSptm(excelVo.getSptm()); -// addThrDiProductsRequest.setManufactory(excelVo.getManufactory()); -// addThrDiProductsRequest.setCpms(excelVo.getCpms()); -// addThrDiProductsRequest.setMeasname(excelVo.getMeasname()); -// addThrDiProductsRequest.setPrice(excelVo.getPrice()); -// addThrDiProductsRequest.setBasicPrductRemak1(excelVo.getBasicPrductRemak1()); -// addThrDiProductsRequest.setSpmc(excelVo.getSpmc()); -// addThrDiProductsRequest.setYbbm(excelVo.getYbbm()); -// addThrDiProductsRequest.setCustomerId(customerId); -// if (StrUtil.isNotEmpty(excelVo.getAttributeType())) { -// if (excelVo.getAttributeType().equals("设备")) { -// addThrDiProductsRequest.setAttributeType(1); -// } else if (excelVo.getAttributeType().equals("耗材")) { -// addThrDiProductsRequest.setAttributeType(2); -// } else if (excelVo.getAttributeType().equals("服务费")) { -// addThrDiProductsRequest.setAttributeType(3); -// } -// } -// -// if (StrUtil.isNotEmpty(excelVo.getGroupBuy())) { -// if (excelVo.getGroupBuy().equals("是")) { -// addThrDiProductsRequest.setGroupBuy(true); -// } else -// addThrDiProductsRequest.setGroupBuy(false); -// } -// if (StrUtil.isNotEmpty(excelVo.getHcType())) { -// if (excelVo.getHcType().equals("高值")) { -// addThrDiProductsRequest.setHcType(1); -// } else if (excelVo.getHcType().equals("低值")) { -// addThrDiProductsRequest.setHcType(2); -// } -// } -// -// if (StrUtil.isNotEmpty(excelVo.getPurType())) { -// if (excelVo.getPurType().equals("普通入账")) { -// addThrDiProductsRequest.setPurType(1); -// } -// if (excelVo.getPurType().equals("预验收")) { -// addThrDiProductsRequest.setPurType(2); -// } else -// addThrDiProductsRequest.setPurType(3); -// } -// addThrAddDiProducts(addThrDiProductsRequest); -// -// //1.校验国家库信息 -//// addThrDiProductsRequest.setAttributeType(); -// -// -// }); -// -// } -// } catch (Exception e) { -// throw new RenException("导入失败"); -// } -// } @Resource ThrProductsAddDiService thrProductsAddDiService; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java index 78f9194e..8a4e9c77 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java @@ -33,19 +33,6 @@ public class ThrProductsAddServiceImpl implements ThrProductsAddService { return data; } - @Override - public List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest) { - if (filterThrProductsRequest == null) { - return Collections.emptyList(); - } - if (filterThrProductsRequest.getPage() != null) { - int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit(); - PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit()); - } - List data = thrProductsAddDao.selectThrProducts(filterThrProductsRequest); - return data; - } - @Override public ThrProductsAddEntity selectById(String id) { return thrProductsAddDao.selectById(id); @@ -56,11 +43,6 @@ public class ThrProductsAddServiceImpl implements ThrProductsAddService { return thrProductsAddDao.insertThrProducts(thrProductsEntity); } - @Override - public boolean insertThrProductss(List thrProductsEntities) { - return thrProductsAddDao.insertThrProductss(thrProductsEntities); - } - @Override public boolean updateThrProducts(ThrProductsAddEntity thrProductsEntity) { return thrProductsAddDao.updateThrProducts(thrProductsEntity); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 16b0ad7f..70aa614e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -32,21 +32,6 @@ public class ThrProductsImportDetailServiceImpl implements ThrProductsImportDeta return data; } - @Override - public boolean insertProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { - return thrProductsImportDetailDao.insertProductsDetailImport(thrOrderImportDetailEntity); - } - - @Override - public boolean updateProductsDetailImport(ThrProductsImportDetailEntity thrOrderImportDetailEntity) { - return thrProductsImportDetailDao.updateProductsDetailImport(thrOrderImportDetailEntity); - } - - @Override - public boolean insertProductsDetailImports(List thrOrderImportDetailEntities) { - return thrProductsImportDetailDao.insertProductsDetailImports(thrOrderImportDetailEntities); - } - @Override public boolean deleteById(String id) { return thrProductsImportDetailDao.deleteById(id); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index e8e23a5f..9469d11a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -50,15 +50,4 @@ public class ThrProductsImportLogServiceImpl implements ThrProductsImportLogServ public boolean deleteByTime() { return thrProductsImportLogDao.deleteByTime(); } -// -// @Override -// public ThrProductsImportLogEntity selectByGenKey(String genKey) { -// -// filterUdiIpLogRequest.setGenKey(genKey); -// List data = thrProductsImportLogDao.filterImportLog(filterUdiIpLogRequest); -// if (data != null && data.size() > 0) { -// return data.get(0); -// } -// return null; -// } } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java index 1fc64f0d..df99e407 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemBusApiServiceImpl.java @@ -19,10 +19,6 @@ public class ThrSystemBusApiServiceImpl implements ThrSystemBusApiService { @Resource ThrSystemBusApiDao thrSystemBusApiDao; - @Override - public boolean insertSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity) { - return thrSystemBusApiDao.insertSysBusApi(basicThirdSysEntity); - } @Override public boolean updateSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity) { diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java index 9f5e252e..e579ae6f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java @@ -95,11 +95,6 @@ public class ThrSystemServiceImpl implements ThrSystemService { return false; } - @Override - public String selectThirdNameByThirdId(String thirdId) { - return thrSystemDao.selectThirdNameByThirdId(thirdId); - } - @Override public int countThirdSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest) { return thrSystemDao.countThirdSys(filterBasicThirdSysRequest); diff --git a/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java b/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java index 31438fdd..824279ab 100644 --- a/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java @@ -277,9 +277,6 @@ public class AlihealthUtils { query.append(key).append(value); } } -// StringUtils.areNotEmpty(key, value) - - } // 第三步：使用MD5/HMAC加密 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6b059776..5fc5ae56 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.50:3306/udi_spms_hlhy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_jy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: @@ -56,9 +56,11 @@ err_path: d:/udi/udiwms/err/ back_file_path: d:/share/udisps/back/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test +#UDI_SERVER_URL: http://127.0.0.1:9994 + SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs API_KEY: 1101 -API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNxmQ5L +API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L WEB_TITLE: 平潭协和医院 WEBSOCKET_TOKEN: 07rKFDFkQvBkbxgc7aUBlONo4gWNdx8b