diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java b/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java index 3e089e7c..39a1bf37 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/impl/ErpInvClientImpl.java @@ -8,12 +8,9 @@ import com.glxp.api.httpClient.utils.HttpOkClient; import com.glxp.api.req.thrsys.ThrOnhandRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; -import com.glxp.api.util.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; @Service public class ErpInvClientImpl implements ErpInvClient { diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index 0415fd71..38eca504 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.dao.auth.DeptDao; import com.glxp.api.entity.auth.DeptEntity; diff --git a/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java index 55c8ebfd..d5df27a8 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java @@ -6,26 +6,17 @@ import com.glxp.api.annotation.Log; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BusinessType; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.entity.basic.BasicProductsExportLogEntity; import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.httpClient.utils.HttpOkClient; -import com.glxp.api.req.basic.BasicCorpsExportRequest; -import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.service.sync.SyncDataSetService; -import com.glxp.api.util.ExcelUtil; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; @Service public class BasicGenExcelService { 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 fe12ac74..397590d5 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 @@ -34,7 +34,6 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 0e2d9898..9c1f2a52 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.XmlUtil; import com.alibaba.fastjson.JSONObject; @@ -39,6 +40,7 @@ import com.glxp.api.service.basic.ProductInfoService; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.HttpClient; +import com.glxp.api.util.StringUtils; import com.glxp.api.util.alihealth.AlihealthUtils; import com.glxp.api.util.alihealth.AlihealthYljgUtils; import com.glxp.api.util.udi.FilterUdiUtils; @@ -394,54 +396,56 @@ public class RelCodeBatchService extends ServiceImpl navList = this.list(new LambdaQueryWrapper() .eq(RelCodeBatch::getCurCode, parentCode)); -// codeTempEntity.getSupId() - //todo if(navList)是空的 1.查供应商key；2：根据parentCode查阿里接口；3：根据返回结果，再次查询 if (navList == null || navList.size() == 0) { CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(codeTempEntity.getSupId()); - - AlihealthRelCodeInsertReqeust alihealthRelCodeInsertReqeust = new AlihealthRelCodeInsertReqeust(); - alihealthRelCodeInsertReqeust.setAppKey(customerInfoEntity.getAppKey()); - alihealthRelCodeInsertReqeust.setAppSecret(customerInfoEntity.getAppSecret()); - alihealthRelCodeInsertReqeust.setCustomerId(codeTempEntity.getSupId()); - alihealthRelCodeInsertReqeust.setCode(parentCode); - alihealthRelCodeInsertReqeust.setRefEntId(customerInfoEntity.getRefEntId()); - - BaseResponse baseResponse = alihealthUtils.relCodeInsert(alihealthRelCodeInsertReqeust); - if (baseResponse.getCode() == 20000) { - AlihealthKytSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); - // 返回的码关联关系进行插入 - RelCodeBatch relCodeBatch = alihealthKytSinglerelationResponse.disposeRelCodeBatch(alihealthRelCodeInsertReqeust.getCustomerId()); - RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("productCode", relCodeBatch.getProductCode()) - .last("limit 1") - ); - if (Objects.isNull(relCodeBatchOne)) { - relCodeBatch.setCreateUser(alihealthRelCodeInsertReqeust.getCustomerId()); - relCodeBatch.setCreateTime(new Date()); - relCodeBatchService.save(relCodeBatch); - - } else { - relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("productCode", relCodeBatch.getProductCode())); - } - Integer id = Objects.isNull(relCodeBatch.getId()) ? relCodeBatchOne.getId() : relCodeBatch.getId(); - // 进行查询 - List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id); - if (list != null && list.size() > 0) { - List curCodeList = new ArrayList(); - for (RelCodeDetail relCodeDetail : list) { - curCodeList.add(relCodeDetail.getCurCode()); + if(ObjectUtil.isNotNull(customerInfoEntity) + && StringUtils.isNotEmpty(customerInfoEntity.getAppKey()) + && StringUtils.isNotEmpty(customerInfoEntity.getAppSecret()) + && StringUtils.isNotEmpty(customerInfoEntity.getRefEntId()) + + ){ + AlihealthRelCodeInsertReqeust alihealthRelCodeInsertReqeust = new AlihealthRelCodeInsertReqeust(); + alihealthRelCodeInsertReqeust.setAppKey(customerInfoEntity.getAppKey()); + alihealthRelCodeInsertReqeust.setAppSecret(customerInfoEntity.getAppSecret()); + alihealthRelCodeInsertReqeust.setCustomerId(codeTempEntity.getSupId()); + alihealthRelCodeInsertReqeust.setCode(parentCode); + alihealthRelCodeInsertReqeust.setRefEntId(customerInfoEntity.getRefEntId()); + + BaseResponse baseResponse = alihealthUtils.relCodeInsert(alihealthRelCodeInsertReqeust); + if (baseResponse.getCode() == 20000) { + AlihealthKytSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); + // 返回的码关联关系进行插入 + RelCodeBatch relCodeBatch = alihealthKytSinglerelationResponse.disposeRelCodeBatch(alihealthRelCodeInsertReqeust.getCustomerId()); + RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("productCode", relCodeBatch.getProductCode()) + .last("limit 1") + ); + if (Objects.isNull(relCodeBatchOne)) { + relCodeBatch.setCreateUser(alihealthRelCodeInsertReqeust.getCustomerId()); + relCodeBatch.setCreateTime(new Date()); + relCodeBatchService.save(relCodeBatch); + } else { + relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("productCode", relCodeBatch.getProductCode())); } - relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); - - relCodeDetailService.saveBatch(list); + Integer id = Objects.isNull(relCodeBatch.getId()) ? relCodeBatchOne.getId() : relCodeBatch.getId(); + // 进行查询 + List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id); + if (list != null && list.size() > 0) { + List curCodeList = new ArrayList(); + for (RelCodeDetail relCodeDetail : list) { + curCodeList.add(relCodeDetail.getCurCode()); + } + relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); + relCodeDetailService.saveBatch(list); + } + // 插入成功就重新查询一下 + navList = this.list(new LambdaQueryWrapper() + .eq(RelCodeBatch::getCurCode, parentCode)); + } else { + log.error(baseResponse.getMessage()); } - // 插入成功就重新查询一下 - navList = this.list(new LambdaQueryWrapper() - .eq(RelCodeBatch::getCurCode, parentCode)); - } else { - log.error(baseResponse.getMessage()); } - } + } if ((udiProductEntity != null && "1".equals(udiProductEntity.getPackLevel())) || (CollUtil.isNotEmpty(navList)) ) { diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index 569084eb..75081363 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -16,7 +16,6 @@ import com.glxp.api.res.inout.PlatformLinkResponse; import com.glxp.api.res.inout.ioUploadOrderResponse; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/inv/JaspaperService.java b/src/main/java/com/glxp/api/service/inv/JaspaperService.java index b771bc03..235994ab 100644 --- a/src/main/java/com/glxp/api/service/inv/JaspaperService.java +++ b/src/main/java/com/glxp/api/service/inv/JaspaperService.java @@ -7,7 +7,6 @@ import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.res.inv.InnerOrderPrintResponse; import com.glxp.api.util.JasperUtils; import net.sf.jasperreports.engine.JRException; -import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; 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 985f4230..2abc495a 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -44,7 +44,6 @@ import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inv.DeviceInspectTaskDetailService; import com.glxp.api.service.inv.DeviceInspectTaskService; import com.glxp.api.service.purchase.*; -import com.glxp.api.service.thrsys.IThrBusTypeOriginService; import com.glxp.api.service.thrsys.ThrManufacturerService; import com.glxp.api.util.*; import lombok.RequiredArgsConstructor; 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 fe4fdd05..7933f5e2 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 @@ -2,7 +2,6 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.util.StrUtil; import com.glxp.api.dao.thrsys.ThrOrderDao; -import com.glxp.api.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.service.thrsys.ThrOrderService; diff --git a/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java b/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java index 5c3aed3e..da7fb0a9 100644 --- a/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java @@ -2,6 +2,7 @@ package com.glxp.api.util.alihealth; import com.glxp.api.util.StringUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.lang.reflect.Field; import java.util.Map; @@ -37,14 +38,8 @@ public class CopyUtils { } } } - - } catch (Exception e) { - log.error("对象转换错误==="+e.getMessage()); - - e.printStackTrace(); -// BeanUtil.copyProperties(source, target); - + log.error("对象转换错误==="+ExceptionUtils.getStackTrace(e)); } }