From cb57084fee5c3f05af9d25d3f885a2de1718fce4 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 2 Apr 2022 09:30:38 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicUnitMaintainController.java | 1 + .../controller/basic/UdiInfoController.java | 7 +- .../basic/UdiInfoExportLogController.java | 2 + .../basic/UdiRelevanceController.java | 12 +++- .../CompanyProductRelevanceController.java | 18 ++++++ .../impl/UdiInfoImportDetailServiceImpl.java | 64 ++++++++++++++++++- .../thrsys/impl/ThrCorpServiceImpl.java | 21 ++++-- .../thread/BasicBackUpdateProductService.java | 2 +- .../thread/BasicUdiInfoImportService.java | 2 + .../thread/BasicUpdateProductService.java | 6 +- .../thread/ThrProductsImportService.java | 23 +++++-- .../admin/thread/UpdateproductService.java | 6 +- .../com/glxp/sale/admin/util/HttpClient.java | 53 +++++++++++++-- .../src/main/resources/logback-spring.xml | 4 +- .../mapper/basic/BasicUnitMaintainDao.xml | 13 ++-- 15 files changed, 200 insertions(+), 34 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java index 3a5e1af..b5145e2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicUnitMaintainController.java @@ -127,6 +127,7 @@ public class BasicUnitMaintainController { BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); basicUnitMaintainEntity.setErpId(CustomUtil.getId()); basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); + basicUnitMaintainEntity.setUpdateTime(new Date()); boolean b = basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index 0334fbe..3fb1513 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -27,6 +27,7 @@ import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -54,6 +55,8 @@ public class UdiInfoController { private String udiUrl; @Resource private ErpBasicClient erpBasicClient; + @Resource + HttpClient httpClient; //获取同步库UDI信息 @AuthRuleAnnotation("") @@ -82,7 +85,7 @@ public class UdiInfoController { paramMap.put("zczbhhzbapzbh", productInfoFilterRequest.getZczbhhzbapzbh()); paramMap.put("uuid", productInfoFilterRequest.getUuid()); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap); + String response = httpClient.mipsGetHead(udiUrl + "/udidl/device/filterUdi", paramMap); try { BaseResponse> udiDlDeviceResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -134,7 +137,7 @@ public class UdiInfoController { paramMap.put("limit", productInfoFilterRequest.getLimit()); paramMap.put("ylqxzcrbarmc", productInfoFilterRequest.getYlqxzcrbarmc()); - String response = HttpClient.mipsGet(udiUrl + "/udi/company/filter", paramMap); + String response = httpClient.mipsGetHead(udiUrl + "/udi/company/filter", paramMap); try { BaseResponse> udiDlDeviceResponse = (BaseResponse>) JSONObject.parseObject(response, BaseResponse.class); return udiDlDeviceResponse; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java index 642ffa7..82c07d4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoExportLogController.java @@ -17,6 +17,7 @@ import com.glxp.sale.admin.service.basic.UdiInfoExportLogService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.thread.BasicGenExcelService; import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.FileUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -90,6 +91,7 @@ public class UdiInfoExportLogController { String filePath = udiInfoExportLogEntity.getFilePath(); String fileName = "temp"; if (filePath != null && filePath.length() > 0) { + filePath = FileUtils.getUNIXfilePath(filePath); String[] data = filePath.split("/"); fileName = data[data.length - 1]; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index c6a1420..0e62764 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -306,7 +306,6 @@ public class UdiRelevanceController { } if (combineRequest.getRelId() != null && !combineRequest.getRelId().equals("")) { //修改 - //判断DI是否被使用，若使用则新增一条 UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId()); List udiRelevanceEntities = udiRelevanceService.selectByUuid(temp.getUuid()); @@ -338,9 +337,18 @@ public class UdiRelevanceController { udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); } else { + List udiRelevanceEntities = udiRelevanceService.selectByUuid(key); + if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { + for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) { + if (StrUtil.isEmpty(combineRequest.getThirdId()) && StrUtil.isEmpty(udiRelevanceEntity1.getMainId())) { + return ResultVOUtils.error(500, "已存在该DI，且未关联！"); + } + } + } + udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(key, combineRequest.getThirdId()); - if (temp == null) { + if (temp == null || StrUtil.isEmpty(udiRelevanceEntity.getThirdId())) { udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceEntity.setUuid(key); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java index 7061aed..58744e1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/info/CompanyProductRelevanceController.java @@ -104,6 +104,24 @@ public class CompanyProductRelevanceController { } + @AuthRuleAnnotation("") + @GetMapping("/spms/info/company/product/filterAll") + public BaseResponse filterAll(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List companyProductRelevanceEntities = + companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(companyProductRelevanceEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyProductRelevanceEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + @AuthRuleAnnotation("") @GetMapping("/sale/info/companyProductRelevance") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java index 0904dc0..c4118c3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java @@ -6,10 +6,17 @@ import com.glxp.sale.admin.dao.basic.UdiInfoDao; import com.glxp.sale.admin.dao.basic.UdiInfoImportDetailDao; import com.glxp.sale.admin.dao.basic.UdiRelevanceDao; import com.glxp.sale.admin.dao.thrsys.ThrProductsDao; +import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity; +import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -27,6 +34,8 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic UdiRelevanceDao udiRelevanceDao; @Resource ThrProductsDao thrProductsDao; + @Resource + SqlSessionFactory sqlSessionFactory; @Override public List filterUdiInfoImport(FilterUdiIpLogRequest filterInCodeLogRequest) { @@ -70,16 +79,65 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic @Override public void importJsonData(UdiRelevanceExportJsonResponse udiRelevanceExportJsonResponse) { +// if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { +// udiInfoDao.importUdiInfo(udiRelevanceExportJsonResponse.getUdiInfoEntities()); +// } +// +// if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) { +// udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities()); +// } +// +// if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) { +// thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities()); +// } + + if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { - udiInfoDao.importUdiInfo(udiRelevanceExportJsonResponse.getUdiInfoEntities()); + + //基础表导入 + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiInfoEntities())) { + try { + List corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities(); + UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); + for (UdiInfoEntity basicUnitMaintainEntity : corpList) { + mapper.insertUdiInfo(basicUnitMaintainEntity); + } + batchSession.commit(); + } catch (Exception e) { + } + } } + //关联表导入 if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getUdiRelevanceEntities())) { - udiRelevanceDao.importUdiRelevance(udiRelevanceExportJsonResponse.getUdiRelevanceEntities()); + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + try { + List corpList = udiRelevanceExportJsonResponse.getUdiRelevanceEntities(); + UdiRelevanceDao mapper = batchSession.getMapper(UdiRelevanceDao.class); + for (UdiRelevanceEntity basicUnitMaintainEntity : corpList) { + mapper.insertUdiRelevance(basicUnitMaintainEntity); + } + batchSession.commit(); + } catch (Exception e) { + } } + //第三方产品信息导入 if (CollUtil.isNotEmpty(udiRelevanceExportJsonResponse.getThrProductsEntities())) { - thrProductsDao.importThrProductss(udiRelevanceExportJsonResponse.getThrProductsEntities()); + + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + try { + List corpList = udiRelevanceExportJsonResponse.getThrProductsEntities(); + ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); + for (ThrProductsEntity basicUnitMaintainEntity : corpList) { + mapper.insertThrProducts(basicUnitMaintainEntity); + } + batchSession.commit(); + } catch (Exception e) { + } } + + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java index 8647e83..6583054 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrCorpServiceImpl.java @@ -1,11 +1,16 @@ package com.glxp.sale.admin.service.thrsys.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.thrsys.ThrCorpDao; import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity; import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest; import com.glxp.sale.admin.service.thrsys.ThrCorpService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -19,6 +24,8 @@ public class ThrCorpServiceImpl implements ThrCorpService { @Resource private ThrCorpDao thrCorpDao; + @Resource + SqlSessionFactory sqlSessionFactory; @Override public List filterThrCorps(FilterThrCorpRequest filterThrCorpRequest) { @@ -66,10 +73,16 @@ public class ThrCorpServiceImpl implements ThrCorpService { @Override @Async public void importJsonData(List thrCorpEntities) { - try { - thrCorpDao.importThrCorps(thrCorpEntities); - } catch (Exception e) { - log.error("导入第三方往来单位数据异常", e); + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + if (CollUtil.isNotEmpty(thrCorpEntities)) { + try { + ThrCorpDao mapper = batchSession.getMapper(ThrCorpDao.class); + thrCorpEntities.forEach(thrCorpEntity -> { + mapper.insertThrCorps(thrCorpEntity); + }); + batchSession.commit(); + } catch (Exception e) { + } } } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 42c29c2..44e5037 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -198,7 +198,7 @@ public class BasicBackUpdateProductService { udiInfoService.insertUdiInfo(udiInfoEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); - + udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); if ("thirdId".equals(thirdSysId)) { udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java index bc6d5b5..61db71f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUdiInfoImportService.java @@ -49,6 +49,8 @@ public class BasicUdiInfoImportService { BasicThirdSysService basicThirdSysService; @Resource UdiDlHttpClient udiDlHttpClient; + @Resource + HttpClient httpClient; //导入产品信息文件，生成产品信息，更新或插入对照表 @Async diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java index 718caf4..6de9878 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java @@ -58,6 +58,8 @@ public class BasicUpdateProductService { CompanyService companyService; @Resource private CompanyProductsRelService companyProductsRelService; + @Resource + HttpClient httpClient; public String addProduct(CombineRequest combineRequest, String url) { String errMsg = null; @@ -161,7 +163,7 @@ public class BasicUpdateProductService { udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - + udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); String mainSys = basicThirdSysEntity.getThirdId(); if (mainSys.equals("thirdId")) { @@ -343,7 +345,7 @@ public class BasicUpdateProductService { paramMap.put("zczbhhzbapzbh", productInfoFilterRequest.getZczbhhzbapzbh()); paramMap.put("uuid", productInfoFilterRequest.getUuid()); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterAllUdi", paramMap); + String response = httpClient.mipsGetHead(udiUrl + "/udidl/device/filterAllUdi", paramMap); try { BaseResponse> udiDlDeviceResponse = diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java index 2c8b2ab..7479f68 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsImportService.java @@ -1,6 +1,8 @@ package com.glxp.sale.admin.thread; +import cn.hutool.core.collection.CollUtil; import com.glxp.sale.admin.constant.BasicProcessStatus; +import com.glxp.sale.admin.dao.thrsys.ThrCorpDao; import com.glxp.sale.admin.dao.thrsys.ThrProductsDao; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsImportLogEntity; @@ -9,6 +11,10 @@ import com.glxp.sale.admin.res.basic.ErpProductsResponse; import com.glxp.sale.admin.service.thrsys.ThrProductsImportLogService; import com.glxp.sale.admin.util.CustomUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -26,6 +32,8 @@ public class ThrProductsImportService { ThrProductsImportLogService thrProductsImportLogService; @Resource ThrProductsDao thrProductsDao; + @Resource + SqlSessionFactory sqlSessionFactory; @Async public void importThrProduct(PostThrProductsRequest postThrProductsRequest) { @@ -67,10 +75,17 @@ public class ThrProductsImportService { */ @Async public void importJsonData(List thrProductsEntities) { - try { - thrProductsDao.importThrProducts(thrProductsEntities); - } catch (Exception e) { - log.error("导入产品信息异常", e); + + SqlSession batchSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED); + if (CollUtil.isNotEmpty(thrProductsEntities)) { + try { + ThrProductsDao mapper = batchSession.getMapper(ThrProductsDao.class); + thrProductsEntities.forEach(thrCorpEntity -> { + mapper.insertThrProducts(thrCorpEntity); + }); + batchSession.commit(); + } catch (Exception e) { + } } } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java index 74f6bd8..3d65c71 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/UpdateproductService.java @@ -33,6 +33,8 @@ public class UpdateproductService { UdiRelevanceService udiRelevanceService; @Resource UdiInfoService udiInfoService; + @Resource + HttpClient httpClient; @Async public void updateProduct() { @@ -56,7 +58,7 @@ public class UpdateproductService { paramMap.put("page_size", 1 + ""); paramMap.put("page_now", 1 + ""); paramMap.put("invcode", code); - String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/invbasdoc", paramMap); + String response = httpClient.mipsGet(ucloudUrl + "/uclooud/basic/invbasdoc", paramMap); try { BaseResponse> udiDlDeviceResponse = JSONObject.parseObject(response, new TypeReference>>() { @@ -94,7 +96,7 @@ public class UpdateproductService { if (invcode != null) { paramMap.put("invcode", invcode); } - String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/invbasdoc", paramMap); + String response = httpClient.mipsGet(ucloudUrl + "/uclooud/basic/invbasdoc", paramMap); try { BaseResponse> udiDlDeviceResponse = JSONObject.parseObject(response, new TypeReference>>() { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/HttpClient.java b/api-admin/src/main/java/com/glxp/sale/admin/util/HttpClient.java index 8d54363..b866017 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/util/HttpClient.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/util/HttpClient.java @@ -7,6 +7,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -95,6 +97,8 @@ public class HttpClient { public static String mipsGet(String url, Map params) { + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); StringBuffer stringBuffer = new StringBuffer(url); if (params instanceof Map) { Iterator iterator = ((Map) params).entrySet().iterator(); @@ -117,10 +121,47 @@ public class HttpClient { RestTemplate restTemplate = new RestTemplate(); String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; logger.info(accessTokenRequestUrl); - String response = restTemplate.getForObject(accessTokenRequestUrl, String.class); - return response; + ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(headers), String.class); +// String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, new HttpEntity(headers)); + return response.getBody(); + } + + + public static String mipsGetHead(String url, Map params, HttpHeaders headers) { + + headers.add("Content-Type", "application/json"); + if (params != null) { + StringBuffer stringBuffer = new StringBuffer(url); + if (params instanceof Map) { + Iterator iterator = ((Map) params).entrySet().iterator(); + if (iterator.hasNext()) { + stringBuffer.append("?"); + Object element; + while (iterator.hasNext()) { + element = iterator.next(); + Map.Entry entry = (Map.Entry) element; + if (entry.getValue() != null) { + stringBuffer.append(element).append("&"); + } + url = stringBuffer.substring(0, stringBuffer.length() - 1); + } + } + } else { + throw new RuntimeException("url请求:" + url + "请求参数有误不是map类型"); + } + } + + + RestTemplate restTemplate = new RestTemplate(); + String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; + logger.info(accessTokenRequestUrl); + ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(headers), String.class); + +// String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, new HttpEntity(headers)); + return response.getBody(); } + public String mipsGetHead(String url, Map params) { HttpHeaders headers = new HttpHeaders(); @@ -146,9 +187,9 @@ public class HttpClient { } RestTemplate restTemplate = new RestTemplate(); String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; - logger.info(accessTokenRequestUrl); - HttpEntity httpEntity = new HttpEntity<>(headers); - String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, httpEntity); - return response; + logger.info(accessTokenRequestUrl+"---"+udiKey); + ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(headers), String.class); +// String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, new HttpEntity(headers)); + return response.getBody(); } } diff --git a/api-admin/src/main/resources/logback-spring.xml b/api-admin/src/main/resources/logback-spring.xml index e02657b..a9fae50 100644 --- a/api-admin/src/main/resources/logback-spring.xml +++ b/api-admin/src/main/resources/logback-spring.xml @@ -38,7 +38,7 @@ - /home/glxpdata/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log + d://glxpdata/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log 30 - /home/glxpdata/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log + d://glxpdata/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log 30 @@ -141,7 +141,7 @@ insert INTO basic_corp(thirdId, erpId, name, spell, addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, - thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType) + thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType,outType) values (#{thirdId}, #{erpId}, #{name}, @@ -153,7 +153,7 @@ #{contact}, #{mobile}, #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, - #{thirdName}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{updateTime}, #{corpType}) + #{thirdName}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, #{updateTime}, #{corpType},#{outType}) @@ -181,6 +181,7 @@ thirdName4=#{thirdName4}, updateTime=#{updateTime}, corpType=#{corpType}, + outType=#{outType}, WHERE id=#{id} @@ -228,7 +229,7 @@ INTO basic_corp ( thirdId, erpId, name, spell, addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, - thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType) + thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType,outType) values ( #{thirdId}, #{erpId}, @@ -250,7 +251,7 @@ #{thirdName3}, #{thirdName4}, #{updateTime}, - #{corpType} + #{corpType},#{outType} )