From f94ded5d0a6545bb564f986bc2db03a989fae662 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 12 三月 2024 10:17:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java | 26 ++++++-- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java | 5 + Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java | 1 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 2 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 2 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 57 +++++++++++++----- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 9 ++- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmSearchItemCodeProvider.java | 2 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java | 3 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java | 22 ++++++ 10 files changed, 94 insertions(+), 35 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java index bc8531c..6f975b2 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java @@ -1,6 +1,7 @@ package com.vci.ubcs.code.vo.pagemodel; import com.vci.ubcs.starter.revision.model.BaseModel; +import io.swagger.annotations.ApiModelProperty; import java.util.List; @@ -62,22 +63,20 @@ */ private String description; - /** * 鎺ュ彛绫诲瀷 */ private String interfaceType; - /** * 鎺ュ彛绫诲瀷鏄剧ず鏂囨湰 */ private String interfaceTypeText; + /** * 鍙傛暟绫诲瀷 */ private String paramType; - /** * 鍙傛暟绫诲瀷鏄剧ず鏂囨湰 @@ -88,11 +87,11 @@ */ private String requestMethod; - /** * 璇锋眰鏂瑰紡鏄剧ず鏂囨湰 */ private String requestMethodText; + /** * 鍒嗙被oid */ @@ -123,17 +122,16 @@ */ private String requestUrl; - /** * 杩斿洖鍊肩被鍨� */ private String returnType; - /** * 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈� */ private String returnTypeText; + /** * 鏉ユ簮绯荤粺涓婚敭 */ @@ -237,14 +235,30 @@ * 鍒嗙被鍚嶇О */ private String classifyName; + /*** * 闆嗗洟鐮佹槸鍚﹀弬涓庣敵璇�/鏇存柊/鍙戦�� */ private String isGroupCodeFlag; + + /** + * 鍐呭绫诲瀷 + */ + private String contentType; + + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public String getContentType() { + return contentType; + } + /*** * 鍙傛暟淇℃伅瀵硅薄 */ private List<DockingSysIntParamVO> sysIntParamVOs; + /*** * header淇℃伅瀵硅薄 */ diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java index 574b42c..333dc71 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java @@ -1,5 +1,6 @@ package com.vci.ubcs.code.Scheduling; +import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException; import com.vci.ubcs.code.service.ICodeDuckingSyncService; import com.vci.ubcs.code.service.UniversalInterfaceI; import com.vci.ubcs.starter.web.enumpck.BooleanEnum; @@ -31,11 +32,11 @@ @Value("${erp.item.isStart:false}") public boolean ERP_ITEM_ISSTARE; - /** * 鏄惁鍒濆鍖栧畬鎴愪簡 */ public static volatile String FINISH_INIT = "false"; + /** * 鍦ㄥ垵濮嬪寲瀹屾垚鍚庢墽琛� */ @@ -46,7 +47,7 @@ //榛樿姣忓崄鍒嗛挓鎵ц鏂规硶 @Scheduled(cron = "${erp.item.cronTime:0 0/10 * * * ?}") - public void scheduled() { + public void scheduled() throws ServiceException { log.info("鎵ц浠嶦RP椤圭洰浠e彿/鍨嬪彿浠e彿鏁版嵁 start:"); log.info("鎵ц涓绘暟鎹泦鎴愭暟鎹帹閫� end: "+ "寮�鍏虫槸鍚﹀紑鍚�:" +ERP_ITEM_ISSTARE); if(ERP_ITEM_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) { diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java index 5b7d4d4..4000224 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; + /** * 鐢宠浜哄憳閮ㄩ棬鎺у埗鍣� * @@ -18,15 +20,18 @@ @RestController @RequestMapping("/codeApplyOrgPersonController") public class CodeApplyOrgPersonController { + /** * 鏃ュ織 */ private Logger logger = LoggerFactory.getLogger(getClass()); + /** * 鎺ュ彛闆嗘垚鏈嶅姟 */ @Autowired private UniversalInterfaceI universalInterfaceI; + /**** * 浜哄憳鏁版嵁鍚屾 * @param personData @@ -34,7 +39,8 @@ * @throws Throwable */ @PostMapping("/syncDataForPerson") - public ResultOrgData syncDataForPerson(@RequestBody PersonData personData) { + public ResultOrgData syncDataForPerson(@RequestBody PersonData personData, HttpServletRequest request) { + this.setHttpToThreadLocal(request); String result=""; try { return universalInterfaceI.syncDataForPerson(personData); @@ -52,7 +58,8 @@ * @throws Throwable */ @PostMapping("/syncDataForOrg") - public ResultOrgData syncDataForOrg(@RequestBody OrgData orgData) { + public ResultOrgData syncDataForOrg(@RequestBody OrgData orgData, HttpServletRequest request) { + this.setHttpToThreadLocal(request); String result=""; try { return universalInterfaceI.syncDataForOrg(orgData); @@ -62,4 +69,15 @@ return new ResultOrgData(); } } + + /** + * 璁剧疆request锛屽埌ThreadLocal涓� + * @param request + */ + public void setHttpToThreadLocal(HttpServletRequest request){ + ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>(); + threadLocal.set(request); + universalInterfaceI.setThreadLocal(threadLocal); + } + } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java index a97befa..4c0649e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java @@ -156,7 +156,6 @@ return result; } - /**** * 浜哄憳闆嗘垚鎺ュ彛 * @param personData 鏁版嵁淇℃伅 @@ -186,7 +185,6 @@ threadLocal.set(request); universalInterfaceI.setThreadLocal(threadLocal); } - /*** * diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java index 30b4b15..242b506 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java @@ -41,6 +41,7 @@ @RequestMapping("/dockingManagement") @Api(value = "鎺ュ彛绠$悊", tags = "缂栫爜鐩稿叧鎺ュ彛绠$悊淇℃伅") public class DockingManagementController { + /*** * 闆嗘垚绯荤粺绠$悊鏈嶅姟 */ @@ -50,6 +51,7 @@ * 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟 */ private final IDockingSystemConfigService dockingSystemConfigService; + /*** * 寰呴泦绠$悊閰嶇疆鏈嶅姟 */ @@ -93,7 +95,6 @@ return R.status(res); } - /** * 淇敼 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭� * @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞� @@ -104,7 +105,6 @@ DockingSystemVO dockingSystemVO = dockingSystemService.editSave(dockingSystemDTO); return R.data(dockingSystemVO); } - /** * 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭� @@ -120,6 +120,7 @@ } return R.success("鎿嶄綔鎴愬姛"); } + /** * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 @@ -169,6 +170,7 @@ return R.fail("淇濆瓨澶辫触!"); } } + /** * 鍒犻櫎绯荤粺闆嗘垚绯荤粺閰嶇疆淇℃伅 * @param oids 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈� @@ -183,6 +185,7 @@ } return R.success("鎿嶄綔鎴愬姛"); } + /*** * 鎺ュ彛淇℃伅鏄惁鍚敤/鍋滅敤 * @param sysInfoStatusDTO @@ -222,7 +225,6 @@ IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query); return R.data(pages); } - /** * data鍒楄〃 @@ -311,6 +313,7 @@ } + /** *鎵归噺澶勭悊 * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmSearchItemCodeProvider.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmSearchItemCodeProvider.java index fb51486..8a207ae 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmSearchItemCodeProvider.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmSearchItemCodeProvider.java @@ -29,6 +29,6 @@ * @param searchItemParam * @return 鎵ц缁撴灉 */ - @PostMapping(value = "/getppModelByElem",headers = {"Authorization=${erp.item.bearer:bearer: Bearer 7fc32939-0a59-da71-a6e6-6b0d37b53e8a}","X-ECC-Current-Tenant=10000","Content-Type=application/json","Accept-Language=zh-CHS"}) + @PostMapping(value = "/getppModelByElem",headers = {"Authorization=${erp.item.bearer:Bearer 7fc32939-0a59-da71-a6e6-6b0d37b53e8a}","X-ECC-Current-Tenant=10000","Content-Type=application/json","Accept-Language=zh-CHS"}) String getppModelByElem(@RequestBody SearchItemParam searchItemParam); } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java index 2f93cac..d92424e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeDuckingSyncService.java @@ -1,6 +1,7 @@ package com.vci.ubcs.code.service; +import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException; import org.springblade.core.tool.api.R; import javax.servlet.http.HttpServletRequest; @@ -49,6 +50,6 @@ */ R sendData(String oids); - void saveItemDataSyncScheduing(String endDate); + void saveItemDataSyncScheduing(String endDate) throws ServiceException; } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java index 9f1c212..ca58a3c 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java @@ -6,7 +6,6 @@ import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO; import com.vci.ubcs.code.entity.DockingSystemConfig; import com.vci.ubcs.code.vo.pagemodel.DockingSystemConfigVO; -import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO; import com.vci.ubcs.starter.exception.VciBaseException; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java index d21f912..7a3ca89 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java @@ -3,6 +3,7 @@ import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSONObject; +import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.thoughtworks.xstream.XStream; @@ -50,6 +51,7 @@ import com.vci.ubcs.starter.web.util.BeanUtilForVCI; import com.vci.ubcs.starter.web.util.VciBaseUtil; import com.vci.ubcs.starter.web.util.WebUtil; +import com.xkcoding.http.support.Http; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.map.CaseInsensitiveMap; import org.springblade.core.redis.cache.BladeRedis; @@ -59,6 +61,7 @@ import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.stereotype.Service; @@ -111,34 +114,53 @@ @Value("${erp.item.btmName:XHDH}") public String btmName; + + @Value("${erp.item.bearer:bearer: Bearer 7fc32939-0a59-da71-a6e6-6b0d37b53e8a}") + private String ERPXHDHAUTH; + + @Value("${erp.item.url:http://127.0.0.1:8080/api/pp/pp/v1.0}") + private String ERPXHDHURL; + + @Value("${erp.item.tenant:10000}") + private String ERPXHDHTENANT; + + /** * 涓氬姟绫诲瀷鐨勬湇鍔� */ @Autowired private IBtmTypeClient btmTypeClient; + /** * 閫氱敤鏌ヨ */ @Resource private CommonsMapper commonsMapper; + @Resource private MdmEngineService mdmEngineServiceI; + /** * 鎵归噺澶勭悊鐨勬湇鍔� */ @Resource private MdmIOService mdmIOService; + @Resource private IPasswordFreeLoginService passwordFreeLoginService; @Resource private IDockingLogeService dockingLogeService; + @Resource private IDockingDataService dockingDataService; + @Resource private IDockingTaskService dockingTaskService; + @Resource private IDockingSystemConfigService dockingSystemConfigService; + @Resource private ICodeClassifyService codeClassifyService; @@ -269,7 +291,7 @@ * 鍚屾鍨嬪彿浠e彿 */ @Override - public void saveItemDataSyncScheduing(String endDate) { + public void saveItemDataSyncScheduing(String endDate) throws ServiceException { String paramString=""; String backString="鎴愬姛"; String msg="鎴愬姛"; @@ -293,17 +315,15 @@ Map<String,String>searchDataMap= VciBaseUtil.objectToMapString(searchItemParam); try { paramString=JSONObject.toJSON(searchItemParam).toString(); - String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam); - SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class); - /**SearchItemVO searchItemVO=new SearchItemVO(); - List<SearchItemDataVO> data=new ArrayList<>(); - SearchItemDataVO searchItemDataVO1=initData("1","","pro-00001"); - SearchItemDataVO searchItemDataVO2=initData("0","item-00001",""); - data.add(searchItemDataVO1); - data.add(searchItemDataVO2); - //searchItemVO.setData(data); - searchItemVO.setCode("200");**/ - //searchItemVO.setMsg(""); + // TODO: 鏀逛负浣跨敤HttpUtils鏂瑰紡杩涜鐢宠锛屽洜涓虹幇鍦ㄧ敵璇风敤涔嬪墠鐨勬柟寮忎細鎶ラ敊 + LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>(); + headers.add("Authorization",ERPXHDHAUTH); + headers.add("X-ECC-Current-Tenant",ERPXHDHTENANT); + headers.add("Accept-Language","zh-CHS"); + headers.add("Content-Type",MediaType.APPLICATION_JSON.toString()); + String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElem",paramString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON); + // String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam); + SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class); if (searchItemVO != null) { BladeUser finalUser; paramString = JSONObject.toJSON(searchItemVO).toString(); @@ -449,7 +469,6 @@ } } catch (Throwable e) { e.printStackTrace(); - ; log.error("鏌ヨ澶辫触--->" + e); success = false; backString = "鏌ヨ澶辫触--->" + e; @@ -466,7 +485,7 @@ } } }else{ - throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�"); + throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�"); } }catch (Throwable e1){ e1.printStackTrace(); @@ -481,8 +500,9 @@ } catch (Throwable e) { e.printStackTrace(); log.error(e.getMessage()); - throw new VciBaseException(e.getMessage()); + throw new ServiceException(e.getMessage()); } + throw new ServiceException(e1.getMessage()); } } @@ -1079,7 +1099,12 @@ for (DockingSysIntHeader dockingSysIntHeader : dockingSysIntHeaderList) { headers.add(dockingSysIntHeader.getHeaderKey(), dockingSysIntHeader.getHeaderValue()); } - backString = HttpUtils.postByMediaType(url, params, headers,MediaType.valueOf(dockingSystemConfig.getContentType())); + backString = HttpUtils.postByMediaType( + url, + params, + headers, + Func.isNotBlank(dockingSystemConfig.getContentType()) ? MediaType.valueOf(dockingSystemConfig.getContentType()):MediaType.APPLICATION_FORM_URLENCODED + ); } if(backString.startsWith("\"")){ backString=backString.substring(backString.indexOf("\"")+1); diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java index 9b0d5a3..53fa337 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java @@ -544,7 +544,7 @@ * @param dockingSystemConfigDTO * @throws Throwable */ - private void callInterface(String sendString , DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable{ + private void callInterface(String sendString , DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable{ String paramString = ""; String backString = ""; -- Gitblit v1.9.3