From 8acf1b32b94ad05ce47130fd02647e87662aff2a Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期五, 26 一月 2024 11:26:58 +0800
Subject: [PATCH] erp集成项目代号属性更新
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/SearchDataSyncForERPScheduling.java | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 165 ++++++++++++++++++++++++++++++++++++-----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/NonWebRequestAttributes.java | 52 +++++++++++++
3 files changed, 199 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/NonWebRequestAttributes.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/NonWebRequestAttributes.java
new file mode 100644
index 0000000..21e6542
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/NonWebRequestAttributes.java
@@ -0,0 +1,52 @@
+package com.vci.ubcs.code.Scheduling;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+
+/**
+ * @author Vigi
+ */
+@Slf4j
+public class NonWebRequestAttributes implements RequestAttributes {
+
+ @Override
+ public Object getAttribute(String name, int scope) {
+ return null;
+ }
+
+ @Override
+ public void setAttribute(String name, Object value, int scope) {
+ // to do nothing
+ }
+
+ @Override
+ public void removeAttribute(String name, int scope) {
+ // to do nothing
+ }
+
+ @Override
+ public String[] getAttributeNames(int scope) {
+ return new String[0];
+ }
+
+ @Override
+ public void registerDestructionCallback(String name, Runnable callback, int scope) {
+ // to do nothing
+ }
+
+ @Override
+ public Object resolveReference(String key) {
+ return null;
+ }
+
+ @Override
+ public String getSessionId() {
+ return null;
+ }
+
+ @Override
+ public Object getSessionMutex() {
+ return null;
+ }
+}
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 937d52a..e1debed 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
@@ -3,13 +3,16 @@
import com.vci.ubcs.code.service.ICodeDuckingSyncService;
import com.vci.ubcs.code.service.UniversalInterfaceI;
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
+import io.swagger.annotations.Scope;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.Date;
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 be0ed51..227274c 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.vci.ubcs.code.Scheduling.NonWebRequestAttributes;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.constant.MdmDuckingConstant;
import com.vci.ubcs.code.dto.CodeOrderDTO;
@@ -54,6 +55,7 @@
import com.vci.ubcs.starter.web.util.WebUtil;
import com.vci.ubcs.system.user.entity.User;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
@@ -62,12 +64,16 @@
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionStatus;
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.jws.WebMethod;
@@ -102,6 +108,11 @@
@Value("${erp.item.systemId:ERP}")
public String systemId;
+ @Value("${erp.item.secName:鍥哄畾鐮佹}")
+ public String secName;
+ @Value("${erp.item.secValue:A}")
+ public String secValue;
+
/**
* 涓氬姟绫诲瀷鐨勬湇鍔�
@@ -122,8 +133,7 @@
private MdmIOService mdmIOService;
@Resource
private IPasswordFreeLoginService passwordFreeLoginService;
- @Resource
- private WebServiceContext webServiceContext;
+
@Resource
private IDockingLogeService dockingLogeService;
@Resource
@@ -152,7 +162,6 @@
private MdmSearchItemCodeProvider mdmSearchItemCodeProvider;
@Autowired
HttpServletRequest request;
-
@Override
public void DockingDataSyncScheduing() {
@@ -214,7 +223,40 @@
});
return R.success("鎵嬪姩鎺ㄩ�佸畬鎴�,璇锋牳瀵规槸鍚︽帹閫佹垚鍔�");
}
+ private SearchItemDataVO initData(String status,String itemCode,String mmCode){
+ SearchItemDataVO searchItemDataVO=new SearchItemDataVO();
+ searchItemDataVO.setLastchangedon(new Date());
+ searchItemDataVO.setLastchangedby("19831133");
+ searchItemDataVO.setCreatby("19831133");
+ searchItemDataVO.setCreatedon(new Date());
+ searchItemDataVO.setIsenabled(status);
+ searchItemDataVO.setMaterialcode("XMDH0001");
+ searchItemDataVO.setStatus("1");
+ searchItemDataVO.setProjectcode("3333");
+ searchItemDataVO.setProjectitem(itemCode);
+ searchItemDataVO.setMmodelcode(mmCode);
+ return searchItemDataVO;
+ }
+
+ public HttpServletRequest getRequest(){
+ HttpServletRequest request =null;
+ RequestAttributes requestAttributes = null;
+ try{
+ requestAttributes = RequestContextHolder.currentRequestAttributes();
+ }catch (IllegalStateException e){
+ //requestAttributes = new NonWebRequestAttributes();
+ //RequestContextHolder.setRequestAttributes(requestAttributes, true);
+ request = new MockHttpServletRequest();
+ RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request),true);
+ }finally {
+ if (requestAttributes instanceof ServletRequestAttributes) {
+ ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.currentRequestAttributes();
+ request = servletRequestAttributes.getRequest();
+ }
+ }
+ return request;
+ }
/***
* 鍚屾鍨嬪彿浠ｅ彿
*/
@@ -232,12 +274,26 @@
searchItemParam.setLastchangedon(lastchangedon);
searchItemParam.setStatus("1");//
Map<String,String>searchDataMap= VciBaseUtil.objectToMapString(searchItemParam);
- SearchItemVO searchItemVO= mdmSearchItemCodeProvider.getppModelByElem(searchDataMap);
+ //SearchItemVO searchItemVO= mdmSearchItemCodeProvider.getppModelByElem(searchDataMap);
+ 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("");
+ String paramString="";
+ String backString="鎴愬姛";
+ String msg="鎴愬姛";
+ boolean success=true;
if(searchItemVO!=null) {
+ paramString = JSONObject.toJSON(searchItemVO).toString();
try {
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
try {
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), request);
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),getRequest());
}catch (Throwable e){
throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
}
@@ -257,6 +313,8 @@
List<SearchItemDataVO> dataList = searchItemVO.getData();
Map<String, SearchItemDataVO> dataVOMap = new HashMap<>();
List<String> itemCodeList = new ArrayList<>();
+ ApplyDatasVO allDatasVO = new ApplyDatasVO();
+ List<ApplyDataVO> allObjectList=new ArrayList<>();
if (!CollectionUtils.isEmpty(dataList)) {
dataList.stream().forEach(searchItemDataVO -> {
String itemCode = StringUtils.isNotBlank(searchItemDataVO.getProjectitem()) ? searchItemDataVO.getProjectitem() : searchItemDataVO.getMmodelcode();//椤圭洰浠ｅ彿
@@ -264,7 +322,7 @@
itemCodeList.add(itemCode);
});
String tableName = "";
- R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(btmName);
+ R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(codeClassify.getBtmTypeId());
if (!r.isSuccess()) {
throw new Throwable(r.getMsg());
}
@@ -273,7 +331,7 @@
throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
}
tableName = btmTypeVO.getTableName();
- if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+ if (StringUtils.isBlank(tableName)) {
throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
}
StringBuffer sb = new StringBuffer();
@@ -282,19 +340,21 @@
sb.append(" where 1=1");
sb.append(" and lastr=1 and lastv=1");
sb.append(" and codeclsfid = '" + codeClassify.getOid() + "' ");
- sb.append( VciBaseUtil.toInSql(attrKey,VciBaseUtil.array2String(itemCodeList.toArray(new String[]{}))));
+ sb.append(" and "+ VciBaseUtil.toInSql(attrKey,itemCodeList.toArray(new String[]{})));
List<Map<String, String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
//List<BaseModel> baseModelList=new ArrayList<>();
Map<String,BaseModel> baseModelMap=new HashMap<>();
newDataList.stream().forEach(dataMap->{
BaseModel baseModel=new BaseModel();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,baseModel,false,user);
+ Map<String,String> newDateMap=new CaseInsensitiveMap<>(dataMap);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(newDateMap,baseModel,true,user);
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,user);
//baseModelList.add(baseModel);
- String attrKeyValue=dataMap.getOrDefault(attrKey,"");
+
+ String attrKeyValue=newDateMap.getOrDefault(attrKey,"");
baseModelMap.put(attrKeyValue,baseModel);
});
- ApplyDatasVO editDatasVO = new ApplyDatasVO();
+
List<ApplyDataVO> addObjectList=new ArrayList<>();
List<ApplyDataVO> editObjectList=new ArrayList<>();
dataVOMap.forEach((key,value)->{
@@ -305,6 +365,10 @@
changeObjectToMap(value,"",user,"create",addObjectList);
}
});
+ allObjectList.addAll(addObjectList);
+ allObjectList.addAll(editObjectList);
+ allDatasVO.setObject(allObjectList);
+ LinkedList<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new LinkedList<>();
if(!CollectionUtils.isEmpty(addObjectList)){
//瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
CodeClassifyFullInfoBO classifyFullInfo = codeClassifyService.getClassifyFullInfo(codeClassify.getOid());
@@ -323,32 +387,89 @@
this.getConfigDatas(systemId, btmName, applyDatasVO, attrVOS, dataObjectVO);
CodeOrderDTO orderDTO = new CodeOrderDTO();
orderDTO.setCodeClassifyOid(codeClassify.getOid());//鍒嗙被涓婚敭
-
+ //鐮佹璁剧疆
+ List<SectionVO> section=new ArrayList<>();
+ SectionVO sectionVO=new SectionVO();
+ sectionVO.setValue(secValue);
+ sectionVO.setName(secName);
+ section.add(sectionVO);
log.info("end锛氳鍒欒幏鍙栧畬姣�");
- List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(null, ruleVO,classifyFullInfo);
+ List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(section, ruleVO,classifyFullInfo);
log.info("end锛氱爜娈佃幏鍙栧畬姣�");
-
orderDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs,false);
+ allResultDataObjectDetailDOS.addAll(resultDataObjectDetailDOs);
}
-
+ //鏇存柊鏁版嵁锛堟洿鏂扮姸鎬侊級
if(!CollectionUtils.isEmpty(editObjectList)){
DataObjectVO dataObjectVO = new DataObjectVO();
ApplyDatasVO applyDatasVO = new ApplyDatasVO();
+ applyDatasVO.setObject(editObjectList);
LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
CodeClassifyVO codeClassifyVO=new CodeClassifyVO();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassify, codeClassifyVO);
this.getConfigDatas(systemId, btmName, applyDatasVO, attrVOS, dataObjectVO);
mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,false);
-
+ allResultDataObjectDetailDOS.addAll(resultDataObjectDetailDOs);
}
+ Object paramObject = JSONObject.toJSON(allDatasVO);
+ paramString=Func.isEmpty(paramObject)?"":paramObject.toString();
+ Object backObject = JSONObject.toJSON(allResultDataObjectDetailDOS);
+ backString=Func.isEmpty(backObject)?"":backObject.toString();
}
}
catch (Throwable e){
+ e.printStackTrace();;
log.error("鏌ヨ澶辫触--->"+e);
+ success=false;
+ backString="鏌ヨ澶辫触--->"+e;
+ msg="鏌ヨ澶辫触--->"+e;
+ }finally {
+ try {
+ //璁板綍鏃ュ織
+ this.saveLogs(systemId, systemId, paramString, backString, success, msg, "queryData");
+ }catch (Throwable e){
+ e.printStackTrace();
+ log.error(e.getMessage());
+ }
}
}
}
+
+ /***
+ * 璁板綍鏃ュ織淇℃伅
+ * @param systemId
+ * @param parmaData
+ * @param result
+ * @return
+ */
+ private void saveLogs(String systemId,String systemName,String parmaData, String result,boolean isSucess,String msg,String operation){
+ //璁板綍鏃ュ織淇℃伅
+ DockingLog dockingLoge=new DockingLog();
+ //String oid=redisService.getUUIDEveryDay();
+ dockingLoge.setSystemCode(StringUtils.isBlank(systemId)?"-":systemId);//璁剧疆绯荤粺鏍囪瘑
+ dockingLoge.setSystemName(StringUtils.isBlank(systemName)?"-":systemName);
+ dockingLoge.setMsg(msg);//鏃ュ織娑堟伅
+ dockingLoge.setClassifyId("-");//鍒嗙被缂栧彿
+ dockingLoge.setClassifyName("-");//鍒嗙被鍚嶇О
+ dockingLoge.setClassifyOid("-");//鍒嗙被涓婚敭
+ dockingLoge.setUniqueCode("-");//鍞竴鏍囪瘑
+ dockingLoge.setSystemOid("-");//绯荤粺鏍囪瘑
+// dockingLogeDO.setName(operation);
+ //dockingLogeDO.setOid(oid);//鏃ュ織涓婚敭
+ dockingLoge.setParamString(parmaData);//鍙傛暟淇℃伅
+ dockingLoge.setReturnString(result);//杩斿洖淇℃伅
+ dockingLoge.setType(operation);//鏃ュ織鎿嶄綔绫诲瀷
+ dockingLoge.setCreateTime(new Date());
+ if(isSucess) {
+ dockingLoge.setInterfaceStatus("true");//鎺ュ彛闆嗘垚鐘舵��
+ }else{
+ dockingLoge.setInterfaceStatus("false");//鎺ュ彛闆嗘垚鐘舵��
+ }
+ dockingLogeService.save(dockingLoge);
+ log.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
+ }
+
/***
* 鏍规嵁浼犲叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
*/
@@ -540,13 +661,15 @@
//String status= searchItemDataVO.getStatus();//鏁版嵁鐘舵�� 瀛楃鍨嬶紝鏋氫妇鍊硷紱鍒跺崟锛�0锛涘鎵逛腑锛�1锛涢�氳繃锛�2锛涢┏鍥烇細3锛�
String mmodelCode=searchItemDataVO.getMmodelcode();//鍒堕�犲瀷鍙蜂唬鍙�
- initProperty("mmodelCode","","mmodelCode",propList);
+ initProperty("mmodelcode","",mmodelCode,propList);
String projectCode= searchItemDataVO.getProjectcode();//椤圭洰缂栫爜
- initProperty("projectcode","","projectCode",propList);
+ initProperty("projectcode","",projectCode,propList);
String projectItem=searchItemDataVO.getProjectitem();//椤圭洰浠ｅ彿
- initProperty("projectitem","","projectItem",propList);
+ initProperty("projectitem","",projectItem,propList);
String materialCode=searchItemDataVO.getMaterialcode();//浜у搧缂栫爜
- initProperty("materialcode","","materialCode",propList);
+ initProperty("materialcode","",materialCode,propList);
+ //缁勫悎灞炴�х殑澶勭悊
+ initProperty(attrKey,"",StringUtils.isNotBlank(projectItem)?projectItem:mmodelCode,propList);
String creatBy=searchItemDataVO.getCreatby();//鍒涘缓鑰�
Date cretaeDon= searchItemDataVO.getCreatedon();//鍒涘缓鏃ユ湡 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
String lastchangeBy=searchItemDataVO.getLastchangedby();//鏇存敼鑰�
@@ -554,7 +677,7 @@
String isenabled= searchItemDataVO.getIsenabled();//瀛楃鍨嬶紝鏋氫妇鍊硷紱鍋滅敤锛�0锛涘惎鐢細1锛�
applyDataVO.setOperate(operation);
applyDataVO.setCode(code);
- if(isenabled.equals(0)){
+ if(isenabled.equals("0")){
applyDataVO.setStatus(CodeDefaultLC.DISABLE.getValue());
}else{
applyDataVO.setStatus(CodeDefaultLC.RELEASED.getValue());
--
Gitblit v1.9.3