From 94612500cfcf4f4cb35d032e138178d85e7115fd Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 12 Sep 2023 11:17:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?MDM=E6=8E=A5=E5=8F=A3=E6=8A=BD=E6=8F=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/http/MDMHttpRequest.java | 95 +++++++++++++++++++ .../store/service/impl/FlowServiceImpl.java | 76 ++++----------- 2 files changed, 112 insertions(+), 59 deletions(-) create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java new file mode 100644 index 000000000..8b6c8e1a8 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java @@ -0,0 +1,95 @@ +package com.cool.store.http; + +import com.alibaba.fastjson.JSONObject; +import com.cool.store.dto.mdm.AccessTokenDTO; +import com.cool.store.dto.response.MDMResultDTO; +import com.cool.store.exception.ApiException; +import com.cool.store.exception.ServiceException; +import com.cool.store.request.RpcCreateQualifyVerifyReq; +import com.cool.store.request.RpcGetMdmTokenReq; +import com.cool.store.utils.RestTemplateUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; + +import java.util.Map; +import java.util.Objects; + +/** + * @author Fun Li 2023/9/12 10:07 + * @version 1.0 + */ +@Slf4j +@Service +public class MDMHttpRequest { + + @Value("${hs.mdm.baseUrl:null}") + private String mdmBaseUrl; + + @Value("${hs.mdm.appkey:null}") + private String mdmAppKey; + + @Value("${hs.mdm.appsec:null}") + private String mdmAppSec; + + public String getMdmAccessToken() throws ApiException { + RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq(); + rpcGetMDMTokenReq.setAppKey(mdmAppKey); + rpcGetMDMTokenReq.setAppSecret(mdmAppSec); + String url = mdmBaseUrl + "/api/oauth2/accessToken"; + ResponseEntity responseEntity = null; + try { + responseEntity = RestTemplateUtil.post(url,rpcGetMDMTokenReq, MDMResultDTO.class); + log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); + if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { + AccessTokenDTO accessTokenDTO = JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getBody().getData()), AccessTokenDTO.class); + if(accessTokenDTO==null || StringUtils.isBlank(accessTokenDTO.getAccessToken())){ + throw new ServiceException("获取Mdm token失败!"); + } + return accessTokenDTO.getAccessToken(); + } + } catch (Exception e) { + log.info("获取MDM Token 出错 url:\t{}, e:\t{}", url, e); + throw new ApiException(e.getMessage()); + } + return null; + } + + public String createQualifyVerify(Map headers, RpcCreateQualifyVerifyReq rpcRequest) throws ApiException{ + String url = mdmBaseUrl + "/api/openapi/runtime/form/startFraQualExamWithData"; + ResponseEntity responseEntity = null; + try { + responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); + log.info("url:{}, header:{}, request:{} response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(rpcRequest), JSONObject.toJSONString(responseEntity)); + if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { + return JSONObject.toJSONString(responseEntity.getBody().getData()); + } + } catch (Exception e) { + log.info("调用MDM接口出错 url{}, e{}", url, e); + throw new ApiException(e.getMessage()); + } + return null; + + } + + public ResponseEntity uploadFile(Map headers, Resource resource) throws ApiException { + String url = mdmBaseUrl + "/api/openapi/ext/upload/file"; + MultiValueMap param = new LinkedMultiValueMap<>(); + try { + param.add("file", resource); + ResponseEntity responseEntity = RestTemplateUtil.post(url, headers, param, MDMResultDTO.class); + log.info("url:{}, header:{}, response statusCode:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(responseEntity.getStatusCode())); + return responseEntity; + } catch (Exception e) { + log.info("调用MDM接口出错 url{}, e{}", url, e); + throw new ApiException(e.getMessage()); + } + } + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index 47bfb7a1f..50928f754 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -22,6 +22,7 @@ import com.cool.store.enums.OperateTypeEnum; import com.cool.store.enums.WorkflowStatusEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; +import com.cool.store.http.MDMHttpRequest; import com.cool.store.mapper.*; import com.cool.store.oss.OSSServer; import com.cool.store.request.*; @@ -104,6 +105,9 @@ public class FlowServiceImpl implements FlowService { @Autowired private HyInspectionMapper inspectionMapper; + @Autowired + private MDMHttpRequest mdmHttpRequest; + @Override @Transactional public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException { @@ -180,12 +184,16 @@ public class FlowServiceImpl implements FlowService { } //通过 rpc 请求审核系统获取返回数据 //上传证明文件数据 + Map headers = new HashMap<>(); + headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); if (StringUtils.isNotEmpty(request.getSignerRealControlRelationCert())) { List certFileList = Arrays.asList(request.getSignerRealControlRelationCert().split(",")); - List relshipProves = OSSFileToMDMFile(certFileList); + List relshipProves = OSSFileToMDMFile(headers, certFileList); rpcRequest.getData().setSkrRelshipProve(relshipProves); } - Map qualifyVerifyRespData = JSON.parseObject(createQualifyVerify(rpcRequest), new TypeReference>() {}); + //调用接口发起审批 + String qualifyVerify = mdmHttpRequest.createQualifyVerify(headers, rpcRequest); + Map qualifyVerifyRespData = JSON.parseObject(qualifyVerify, new TypeReference>() {}); //2.更新审核信息 HyPartnerCertificationInfoDO partnerCertificationInfoDO = new HyPartnerCertificationInfoDO(); @@ -299,14 +307,10 @@ public class FlowServiceImpl implements FlowService { } } - public List OSSFileToMDMFile(List fileUrlList) throws ApiException, IOException { - String url = mdmBaseUrl + "/api/openapi/ext/upload/file"; - ResponseEntity responseEntity = null; - RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq(); - rpcGetMDMTokenReq.setAppKey(mdmAppKey); - rpcGetMDMTokenReq.setAppSecret(mdmAppSec); + private List OSSFileToMDMFile(Map headers, List fileUrlList) throws ApiException, IOException { ByteArrayOutputStream outputStream = null; List relshipProves = new ArrayList<>(); + ResponseEntity responseEntity = null; //逐个处理文件 for (String fileUrl : fileUrlList) { @@ -315,76 +319,30 @@ public class FlowServiceImpl implements FlowService { outputStream = ossServer.downloadFileServer(fileName); //2. 将下载到的文件上传到 MDM 系统中 try { - //获取 token 设置到 header - Map headers = new HashMap<>(); - headers.put("Authorization", getMdmAccessToken(rpcGetMDMTokenReq)); //将文件流编辑为 formdata 格式的数据 - MultiValueMap param = new LinkedMultiValueMap<>(); ByteArrayResource resource = new ByteArrayResource(outputStream.toByteArray()) { @Override public String getFilename() throws IllegalStateException { return fileName; } }; - param.add("file", resource); //上传文件 - responseEntity = RestTemplateUtil.post(url, headers, param, MDMResultDTO.class); - log.info("url:{}, header:{}, response statusCode:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(responseEntity.getStatusCode())); + responseEntity = mdmHttpRequest.uploadFile(headers, resource); Map data = (Map) responseEntity.getBody().getData(); SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false); relshipProves.add(skrRelshipProve); } catch (Exception e) { - log.info("调用MDM接口出错 url{}, fileUrl{}, e{}", url, fileUrl, e); + log.info("上传文件到MDM出错, e{}", e); throw new ApiException(e.getMessage()); } finally { - outputStream.close(); + if (outputStream != null) { + outputStream.close(); + } } } return relshipProves; } - public String createQualifyVerify(RpcCreateQualifyVerifyReq rpcRequest) throws ApiException{ - String url = mdmBaseUrl + "/api/openapi/runtime/form/startFraQualExamWithData"; - ResponseEntity responseEntity = null; - try { - RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq(); - rpcGetMDMTokenReq.setAppKey(mdmAppKey); - rpcGetMDMTokenReq.setAppSecret(mdmAppSec); - Map headers = new HashMap<>(); - headers.put("Authorization", getMdmAccessToken(rpcGetMDMTokenReq)); - responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); - log.info("url:{}, header:{}, request:{} response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(rpcRequest), JSONObject.toJSONString(responseEntity)); - if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { - return JSONObject.toJSONString(responseEntity.getBody().getData()); - } - } catch (Exception e) { - log.info("调用MDM接口出错 url{}, e{}", url, e); - throw new ApiException(e.getMessage()); - } - return null; - - } - - public String getMdmAccessToken(RpcGetMdmTokenReq rpcGetMDMTokenReq) throws ApiException { - String url = mdmBaseUrl + "/api/oauth2/accessToken"; - ResponseEntity responseEntity = null; - try { - responseEntity = RestTemplateUtil.post(url,rpcGetMDMTokenReq, MDMResultDTO.class); - log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity)); - if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) { - AccessTokenDTO accessTokenDTO = JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getBody().getData()), AccessTokenDTO.class); - if(accessTokenDTO==null || StringUtils.isBlank(accessTokenDTO.getAccessToken())){ - throw new ServiceException("获取Mdm token失败!"); - } - return accessTokenDTO.getAccessToken(); - } - } catch (Exception e) { - log.info("获取MDM Token 出错 url:\t{}, e:\t{}", url, e); - throw new ApiException(e.getMessage()); - } - return null; - } - /** * 生成授权码 From 8cf947a02f30b528c350ecfd9307cbd1f65284cb Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 12 Sep 2023 14:16:05 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BB=8EMDM=E6=8E=A5=E5=8F=A3=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=89=80=E5=B1=9E=E5=A4=A7=E5=8C=BA=E5=92=8C=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/constants/RedisConstant.java | 9 +++ .../cool/store/response/mdm/BelongRegion.java | 26 ++++++++ .../store/response/mdm/BusinessRegion.java | 22 +++++++ .../com/cool/store/http/MDMHttpRequest.java | 62 +++++++++++++++++++ .../cool/store/service/MDMAreaService.java | 16 +++++ .../service/impl/MDMAreaServiceImpl.java | 50 +++++++++++++++ .../store/controller/MDMAreaController.java | 22 ++++++- 7 files changed, 204 insertions(+), 3 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BelongRegion.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BusinessRegion.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java index f9f95c517..22035bed8 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java @@ -243,6 +243,15 @@ public class RedisConstant { */ public static final String MDM_AREA_OTHERS = "mdm:area:others:{0}"; + /** + * MDM 所属大区缓存 + */ + public static final String MDM_BELONG_REGION = "mdm:belongRegion"; + + /** + * MDM 业务区域缓存 + */ + public static final String MDM_BUSINESS_REGION = "mdm:businessRegion"; /** * 动态标题 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BelongRegion.java b/coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BelongRegion.java new file mode 100644 index 000000000..1fd0d3e52 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BelongRegion.java @@ -0,0 +1,26 @@ +package com.cool.store.response.mdm; + +import lombok.Data; + +/** + * @author Fun Li 2023/9/12 11:52 + * @version 1.0 + * mdm 所属大区 pojo + * 对应 + * { + * "id": "1642818197440036864", + * "orgregionid": "Org001", + * "orgregion": "东北战区" + * }, + */ +@Data +public class BelongRegion { + + private String id; + + private String orgregionid; + + private String orgregion; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BusinessRegion.java b/coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BusinessRegion.java new file mode 100644 index 000000000..6e17de56a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BusinessRegion.java @@ -0,0 +1,22 @@ +package com.cool.store.response.mdm; + +import lombok.Data; + +/** + * @author Fun Li 2023/9/12 11:29 + * @version 1.0 + * mdm 业务区域 pojo + * 对应 + * { + * "id": "1643101868734676992", + * "buarea": "东北战区" + * }, + */ +@Data +public class BusinessRegion { + + private String id; + + private String buarea; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java b/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java index 8b6c8e1a8..d3ac8b362 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/http/MDMHttpRequest.java @@ -37,6 +37,11 @@ public class MDMHttpRequest { @Value("${hs.mdm.appsec:null}") private String mdmAppSec; + /** + * 获取 mdm token + * @return token + * @throws ApiException 接口异常 + */ public String getMdmAccessToken() throws ApiException { RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq(); rpcGetMDMTokenReq.setAppKey(mdmAppKey); @@ -60,6 +65,56 @@ public class MDMHttpRequest { return null; } + /** + * 获取 mdm 所有所属大区 + * @param headers + * @return + */ + public ResponseEntity getBelongRegion(Map headers) throws ApiException { + String url = mdmBaseUrl + "/api/openapi/regionget/getallregion"; + ResponseEntity responseEntity = null; + try { + //需要传一个空 body + RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq(); + RpcCreateQualifyVerifyReq.Data dataBody = new RpcCreateQualifyVerifyReq().new Data(); + rpcRequest.setData(dataBody); + responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); + return responseEntity; + } catch (Exception e) { + log.info("调用MDM接口出错 url{}, e{}", url, e); + throw new ApiException(e.getMessage()); + } + } + + /** + * 获取 mdm 所有业务区域 + * @param headers headers + * @return ResponseEntity JSON + * @throws ApiException 接口异常 + */ + public ResponseEntity getBusinessRegion(Map headers) throws ApiException { + String url = mdmBaseUrl + "/api/openapi/regionget/getallbuarea"; + ResponseEntity responseEntity = null; + try { + //需要传一个空 body + RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq(); + RpcCreateQualifyVerifyReq.Data dataBody = new RpcCreateQualifyVerifyReq().new Data(); + rpcRequest.setData(dataBody); + responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class); + return responseEntity; + } catch (Exception e) { + log.info("调用MDM接口出错 url{}, e{}", url, e); + throw new ApiException(e.getMessage()); + } + } + + /** + * 发起 mdm 审批 + * @param headers headers + * @param rpcRequest 请求参数 + * @return ResponseEntity JSON + * @throws ApiException 接口异常 + */ public String createQualifyVerify(Map headers, RpcCreateQualifyVerifyReq rpcRequest) throws ApiException{ String url = mdmBaseUrl + "/api/openapi/runtime/form/startFraQualExamWithData"; ResponseEntity responseEntity = null; @@ -77,6 +132,13 @@ public class MDMHttpRequest { } + /** + * + * @param headers headers + * @param resource 资源文件 + * @return ResponseEntity + * @throws ApiException 接口异常 + */ public ResponseEntity uploadFile(Map headers, Resource resource) throws ApiException { String url = mdmBaseUrl + "/api/openapi/ext/upload/file"; MultiValueMap param = new LinkedMultiValueMap<>(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java index 4de23ee92..ab1030bdd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/MDMAreaService.java @@ -1,6 +1,9 @@ package com.cool.store.service; import com.cool.store.entity.MDMAreaDO; +import com.cool.store.exception.ApiException; +import com.cool.store.response.mdm.BelongRegion; +import com.cool.store.response.mdm.BusinessRegion; import java.util.List; @@ -20,4 +23,17 @@ public interface MDMAreaService { List getAllAreaCode(String code); boolean getAreaProvinceType(String code); + + /** + * 获取所有所属大区 + * @return 所属大区 + */ + List getBelongRegion() throws ApiException; + + /** + * 获取所有业务区域 + * @return 业务区域 + */ + List getBusinessRegion() throws ApiException; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java index 7b401b5a7..ab8893c33 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/MDMAreaServiceImpl.java @@ -1,19 +1,28 @@ package com.cool.store.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.RedisConstant; +import com.cool.store.dto.response.MDMResultDTO; import com.cool.store.entity.MDMAreaDO; +import com.cool.store.exception.ApiException; +import com.cool.store.http.MDMHttpRequest; import com.cool.store.mapper.MdmAreaMapper; +import com.cool.store.response.mdm.BelongRegion; +import com.cool.store.response.mdm.BusinessRegion; import com.cool.store.service.MDMAreaService; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.text.MessageFormat; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class MDMAreaServiceImpl implements MDMAreaService { @@ -24,6 +33,9 @@ public class MDMAreaServiceImpl implements MDMAreaService { @Autowired private MdmAreaMapper mdmAreaMapper; + @Autowired + private MDMHttpRequest mdmHttpRequest; + /** * 获取省级数据 */ @@ -96,4 +108,42 @@ public class MDMAreaServiceImpl implements MDMAreaService { return CollectionUtils.isEmpty(provinceCodeList)?false:true; } + /** + * 获取所有所属大区 + * @return 所属大区 + */ + @Override + public List getBelongRegion() throws ApiException { + String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BELONG_REGION); + if (StringUtil.isNotEmpty(belongRegionsString)) { + return (List) JSONObject.parseObject(belongRegionsString, List.class); + } + Map headers = new HashMap<>(); + headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); + ResponseEntity belongRegionResp = mdmHttpRequest.getBelongRegion(headers); + List belongRegions = (List) belongRegionResp.getBody().getData(); + //缓存，半个小时过期 + redisUtilPool.setString(RedisConstant.MDM_BELONG_REGION, JSON.toJSONString(belongRegions), 30 * 60); + return belongRegions; + } + + /** + * 获取所有业务区域 + * @return 业务区域 + */ + @Override + public List getBusinessRegion() throws ApiException { + String belongRegionsString = redisUtilPool.getString(RedisConstant.MDM_BUSINESS_REGION); + if (StringUtil.isNotEmpty(belongRegionsString)) { + return (List) JSONObject.parseObject(belongRegionsString, List.class); + } + Map headers = new HashMap<>(); + headers.put("Authorization", mdmHttpRequest.getMdmAccessToken()); + ResponseEntity belongRegionResp = mdmHttpRequest.getBusinessRegion(headers); + List businessRegions = (List) belongRegionResp.getBody().getData(); + //缓存，半个小时过期 + redisUtilPool.setString(RedisConstant.MDM_BUSINESS_REGION, JSON.toJSONString(businessRegions), 30 * 60); + return businessRegions; + } + } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java index 111a7cc19..bfaa49c93 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java @@ -2,7 +2,10 @@ package com.cool.store.controller; import com.cool.store.dto.mdm.AreaSonDTO; import com.cool.store.entity.MDMAreaDO; +import com.cool.store.exception.ApiException; import com.cool.store.response.ResponseResult; +import com.cool.store.response.mdm.BelongRegion; +import com.cool.store.response.mdm.BusinessRegion; import com.cool.store.service.MDMAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,6 +17,8 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; +import static com.cool.store.response.ResponseResult.success; + @RestController @RequestMapping("/mdm/area") @Api(tags = "MDM省市信息") @@ -25,14 +30,25 @@ public class MDMAreaController { @PostMapping("/province") @ApiOperation("获取MDM省级信息") public ResponseResult> getProvince() { - return ResponseResult.success(mdmAreaService.getProvince()); + return success(mdmAreaService.getProvince()); } @PostMapping("/son") @ApiOperation("获取子级区域数据") - private ResponseResult> getSonArea(@RequestBody AreaSonDTO areaSon) { - return ResponseResult.success(mdmAreaService.getSonArea(areaSon.getCode())); + public ResponseResult> getSonArea(@RequestBody AreaSonDTO areaSon) { + return success(mdmAreaService.getSonArea(areaSon.getCode())); } + @PostMapping("/belonging/region") + @ApiOperation("获取 mdm 所有归属大区") + public ResponseResult> getBelongRegion() throws ApiException { + return ResponseResult.success(mdmAreaService.getBelongRegion()); + } + + @PostMapping("/business/region") + @ApiOperation("获取 mdm 所有业务区域") + public ResponseResult> getBusinessRegion() throws ApiException { + return ResponseResult.success(mdmAreaService.getBusinessRegion()); + } } From bc5d3da8026424d3aa2514c7e4e9b8cda90d4fe8 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 12 Sep 2023 14:19:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/controller/MDMAreaController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java index bfaa49c93..3727d7674 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MDMAreaController.java @@ -21,7 +21,7 @@ import static com.cool.store.response.ResponseResult.success; @RestController @RequestMapping("/mdm/area") -@Api(tags = "MDM省市信息") +@Api(tags = "MDM区域信息") public class MDMAreaController { @Autowired From 96550202b48e68456605c9653a099bd72f84b02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 15 Sep 2023 11:06:36 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/request/PartnerIntentInfoRequest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java index e1bab4f83..b6b0cc86a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java @@ -81,4 +81,12 @@ public class PartnerIntentInfoRequest { @ApiModelProperty("提交标识 提交-true 暂存-false") private Boolean submitFlag; + private Integer acquaintanceFlag; + + private String acquaintanceName; + + private String acquaintanceRelationshipType; + + private String otherRelationshipType; + } From c62c2a5192a86f915ceab9bd6c2cfd48da17b867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 15 Sep 2023 12:23:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E8=AE=A4?= =?UTF-8?q?=E8=AF=86=E7=9A=84=E4=BA=BA=20=E9=80=BB=E8=BE=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/dao/HyPartnerIntentInfoDAO.java | 8 ++++ .../mapper/HyPartnerIntentInfoMapper.java | 10 +++++ .../mapper/HyPartnerIntentInfoMapper.xml | 40 ++++++++++++++++++- .../store/entity/HyPartnerIntentInfoDO.java | 8 ++++ .../cool/store/vo/PartnerIntentInfoVO.java | 7 ++++ .../impl/HyPartnerIntentInfoServiceImpl.java | 9 +++++ 6 files changed, 81 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java index fe3a33c4e..f114cd2fe 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java @@ -71,4 +71,12 @@ public class HyPartnerIntentInfoDAO { return hyPartnerIntentInfoMapper.updateLineId(newPartnerId,newLineId, oldLineId); } + public int updateAcquaintanceFlag(Long id ,Integer acquaintanceFlag,String acquaintanceName, String acquaintanceRelationshipType,String otherRelationshipType){ + if (id==null){ + return 0; + } + return hyPartnerIntentInfoMapper.updateAcquaintanceFlag(id,acquaintanceFlag,acquaintanceName,acquaintanceRelationshipType,otherRelationshipType); + } + + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index da7c61c7a..31d3267d5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -64,4 +64,14 @@ public interface HyPartnerIntentInfoMapper { * @return */ int updateLineId(@Param("newPartnerId")String newPartnerId,@Param("newLineId") Long newLineId, @Param("oldLineId") Long oldLineId); + + /** + * 更新数据 + * @param id + * @param acquaintanceFlag + * @param acquaintanceName + * @param acquaintanceRelationshipType + * @param otherRelationshipType + */ + int updateAcquaintanceFlag(Long id ,Integer acquaintanceFlag,String acquaintanceName, String acquaintanceRelationshipType,String otherRelationshipType); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index ad7c17f26..cb97d595a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -25,12 +25,16 @@ + + + + id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop, want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp, work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness, - create_time, update_time + create_time, update_time,acquaintance_flag,acquaintance_name,acquaintance_relationship_type,other_relationship_type