From f9ca72d2c14bc64fce54aa2e8742d7b7f6ff3a35 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 四月 2024 00:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 699 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 407 insertions(+), 292 deletions(-)
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 227274c..c050f02 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
@@ -2,12 +2,13 @@
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.alibaba.fastjson.JSON;
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;
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;
@@ -36,27 +37,23 @@
import com.vci.ubcs.code.vo.webserviceModel.apply.ApplyDatasVO;
import com.vci.ubcs.code.vo.webserviceModel.apply.ProppertyVO;
import com.vci.ubcs.code.vo.webserviceModel.apply.SectionVO;
-import com.vci.ubcs.code.vo.webserviceModel.applybz.ApplyBZDataVO;
-import com.vci.ubcs.code.vo.webserviceModel.applybz.ApplyBZDatasVO;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.*;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.HttpUtils;
import com.vci.ubcs.code.util.WsErpClientUtil;
import com.vci.ubcs.starter.web.enumpck.UserSecretEnum;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
-import com.vci.ubcs.starter.web.util.BeanUtil;
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.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;
import org.springblade.core.secure.utils.AuthUtil;
@@ -64,10 +61,11 @@
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;
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;
@@ -76,15 +74,13 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
-import javax.jws.WebMethod;
import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
+import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK;
import static com.vci.ubcs.code.constant.MdmDuckingConstant.*;
import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC;
@@ -99,12 +95,15 @@
@Service
@Slf4j
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
+
@Value("${dataSyncPush.dataParamName:xmlData}")
public String DATA_PARAM_NAME;
@Value("${dataSyncPush.dataId:itemid}")
private String itemId;
@Value("${erp.item.attrKey:xhdh}")
public String attrKey;
+ @Value("${erp.item.itemStatus:2}")
+ public String itemStatus;
@Value("${erp.item.systemId:ERP}")
public String systemId;
@@ -113,62 +112,86 @@
@Value("${erp.item.secValue:A}")
public String secValue;
+ @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/api/pp/pp/ext/extend/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;
@Autowired
private ICodeClassifyValueService codeClassifyValueService;
+
@Autowired(required = false)
private AttributeMapConfig attributeMapConfig;
+
/***
* resdis缂撳瓨鏈嶅姟
*/
@Resource
private BladeRedis bladeRedis;
+
@Resource
private IDockingSysIntParamService dockingSysIntParamService;
+
@Resource
private IDockingSysIntHeaderService dockingSysIntHeaderService;
+
@Autowired(required = false)
private MdmSearchItemCodeProvider mdmSearchItemCodeProvider;
- @Autowired
- HttpServletRequest request;
+
+ @Resource
+ private ICodeAllCodeService codeAllCodeService;
+
@Override
public void DockingDataSyncScheduing() {
-
// insertCache2();
initPushDataTaks(1);
sendpushDataForService();
-
}
/***
@@ -223,6 +246,7 @@
});
return R.success("鎵嬪姩鎺ㄩ�佸畬鎴�,璇锋牳瀵规槸鍚︽帹閫佹垚鍔�");
}
+
private SearchItemDataVO initData(String status,String itemCode,String mmCode){
SearchItemDataVO searchItemDataVO=new SearchItemDataVO();
searchItemDataVO.setLastchangedon(new Date());
@@ -254,185 +278,229 @@
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.currentRequestAttributes();
request = servletRequestAttributes.getRequest();
}
+ org.springblade.core.tool.utils.WebUtil.setRequest(new ServletRequestAttributes(request));
}
return request;
}
+
/***
* 鍚屾鍨嬪彿浠ｅ彿
*/
@Override
- public void saveItemDataSyncScheduing(String btmName) {
- SearchItemParam searchItemParam=new SearchItemParam();
- searchItemParam.setSystag("VCI"); //璋冪敤绯荤粺鏍囪瘑
- Calendar calendar= Calendar.getInstance();
- calendar.set(Calendar.HOUR_OF_DAY,0);
- calendar.set(Calendar.MINUTE,0);
- calendar.set(Calendar.SECOND,0);
- log.info("鏌ヨ鏃堕棿------->"+calendar.getTime());
- SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String lastchangedon= dft.format(calendar.getTime());
- searchItemParam.setLastchangedon(lastchangedon);
- searchItemParam.setStatus("1");//
- Map<String,String>searchDataMap= VciBaseUtil.objectToMapString(searchItemParam);
- //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("");
+ public void saveItemDataSyncScheduing(String endDate) throws ServiceException {
String paramString="";
String backString="鎴愬姛";
String msg="鎴愬姛";
boolean success=true;
- if(searchItemVO!=null) {
- paramString = JSONObject.toJSON(searchItemVO).toString();
- try {
- //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ SearchItemParam searchItemParam=new SearchItemParam();
+ searchItemParam.setSystag("VCI"); //璋冪敤绯荤粺鏍囪瘑
+ SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String lastchangedon="";
+ if(StringUtils.isBlank(endDate)) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ log.info("鏌ヨ鏃堕棿------->"+dft.format(new Date()));
+ lastchangedon= dft.format(calendar.getTime());
+ }else{
+ lastchangedon=endDate;
+ }
+ searchItemParam.setLastchangedon(lastchangedon);
+ searchItemParam.setIsenabled("");
+ searchItemParam.setStatus(itemStatus);
+ //Map<String,String> searchDataMap = VciBaseUtil.objectToMapString(searchItemParam);
+ try {
+ String sendParamString=JSONObject.toJSON(searchItemParam).toString();
+ // 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+"/getppModelByElemNew",sendParamString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
+ // String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam);
+ SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class);
+ if (searchItemVO != null) {
+ if(!"200".equals(searchItemVO.getStatus())){
+ throw new ServiceException(String.format("鎺ュ彛杩斿洖鐘舵�佺爜涓猴細%s锛屽師鍥狅細%s",searchItemVO.getStatus(),searchItemVO.getMessage()));
+ }
+ BladeUser finalUser;
+ paramString = JSONObject.toJSON(searchItemVO).toString();
+ log.info("鍨嬪彿浠ｅ彿鏁版嵁鍊�-------銆�"+paramString);
+ HttpServletRequest request=getRequest();
try {
- passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),getRequest());
- }catch (Throwable e){
- throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
- }
- final BladeUser user = AuthUtil.getUser();
- List<CodeClassify> codeClassifyList = codeClassifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, btmName));
- if (CollectionUtils.isEmpty(codeClassifyList)) {
- throw new Throwable("鍒嗙被鏈煡璇㈠埌");
- }
- CodeClassify codeClassify= codeClassifyList.get(0);
- CodeClassifyTemplateVO templateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(codeClassify.getOid());
- if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
- }
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
- ((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
- ).collect(Collectors.toList());
- 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();//椤圭洰浠ｅ彿
- dataVOMap.put(itemCode, searchItemDataVO);
- itemCodeList.add(itemCode);
- });
- String tableName = "";
- R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(codeClassify.getBtmTypeId());
- if (!r.isSuccess()) {
- throw new Throwable(r.getMsg());
+ //鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+ try {
+ passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), request);
+ BladeUser user = AuthUtil.getUser();
+ if(Func.isEmpty(user)){
+ user=request.getAttribute("_BLADE_USER_REQUEST_ATTR_")==null?null:(BladeUser)request.getAttribute("_BLADE_USER_REQUEST_ATTR_");
+ }
+ finalUser = user;
+ } catch (Throwable e) {
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
}
- BtmTypeVO btmTypeVO = r.getData();
- if (btmTypeVO == null) {
- throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
+ List<CodeClassify> codeClassifyList = codeClassifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, btmName));
+ if (CollectionUtils.isEmpty(codeClassifyList)) {
+ throw new Throwable("鍒嗙被鏈煡璇㈠埌");
}
- tableName = btmTypeVO.getTableName();
- if (StringUtils.isBlank(tableName)) {
- throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
+ CodeClassify codeClassify = codeClassifyList.get(0);
+ CodeClassifyTemplateVO templateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(codeClassify.getOid());
+ if (templateVO == null || StringUtils.isBlank(templateVO.getOid())) {
+ throw new Throwable("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
}
- StringBuffer sb = new StringBuffer();
- sb.append(" select * from ");
- sb.append(tableName);
- sb.append(" where 1=1");
- sb.append(" and lastr=1 and lastv=1");
- sb.append(" and codeclsfid = '" + codeClassify.getOid() + "' ");
- 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();
- Map<String,String> newDateMap=new CaseInsensitiveMap<>(dataMap);
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(newDateMap,baseModel,true,user);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,user);
- //baseModelList.add(baseModel);
+ List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
+ ((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
+ ).collect(Collectors.toList());
+ List<SearchItemUpperCaseDataVO> dataList = searchItemVO.getData();
+ Map<String, SearchItemUpperCaseDataVO> dataVOMap = new HashMap<>();
+ List<String> itemCodeList = new ArrayList<>();
+ ApplyDatasVO allDatasVO = new ApplyDatasVO();
+ List<ApplyDataVO> allObjectList = new ArrayList<>();
+ if (Func.isNotEmpty(dataList)) {
+ dataList.stream().forEach(searchItemDataVO -> {
+ String itemCode = StringUtils.isNotBlank(searchItemDataVO.getPROJECTITEM()) ? searchItemDataVO.getPROJECTITEM() : searchItemDataVO.getMMODELCODE();//椤圭洰浠ｅ彿
+ dataVOMap.put(itemCode, searchItemDataVO);
+ itemCodeList.add(itemCode);
+ });
+ String tableName = "";
+ R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(codeClassify.getBtmTypeId());
+ if (!r.isSuccess()) {
+ throw new Throwable(r.getMsg());
+ }
+ BtmTypeVO btmTypeVO = r.getData();
+ if (btmTypeVO == null) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
+ }
+ tableName = btmTypeVO.getTableName();
+ if (StringUtils.isBlank(tableName)) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
+ }
+ StringBuffer sb = new StringBuffer();
+ sb.append(" select * from ");
+ sb.append(tableName);
+ sb.append(" where 1=1");
+ sb.append(" and lastr=1 and lastv=1");
+ sb.append(" and codeclsfid = '" + codeClassify.getOid() + "' ");
+ sb.append(" and " + VciBaseUtil.toInSql(attrKey, itemCodeList.toArray(new String[]{})));
+ List<Map<String, String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
- String attrKeyValue=newDateMap.getOrDefault(attrKey,"");
- baseModelMap.put(attrKeyValue,baseModel);
- });
+ //List<BaseModel> baseModelList=new ArrayList<>();
+ Map<String, BaseModel> baseModelMap = new HashMap<>();
+ if(!CollectionUtils.isEmpty(newDataList)) {
+ newDataList.stream().forEach(dataMap -> {
+ BaseModel baseModel = new BaseModel();
+ Map<String, String> newDateMap = new CaseInsensitiveMap<>(dataMap);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(newDateMap, baseModel, true, finalUser);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel, finalUser);
+ //baseModelList.add(baseModel);
+ String attrKeyValue = newDateMap.getOrDefault(attrKey, "");
+ if (StringUtils.isBlank(attrKeyValue)) {
+ log.info(baseModel.getId());
+ }
+ baseModelMap.put(attrKeyValue, baseModel);
+ });
+ }
+ List<ApplyDataVO> addObjectList = new ArrayList<>();
+ List<ApplyDataVO> editObjectList = new ArrayList<>();
- List<ApplyDataVO> addObjectList=new ArrayList<>();
- List<ApplyDataVO> editObjectList=new ArrayList<>();
- dataVOMap.forEach((key,value)->{
- if(baseModelMap.containsKey(key)){
- BaseModel baseModel=baseModelMap.get(key);
- changeObjectToMap(value,baseModel.getId(),user,"editstatus",editObjectList);
- }else{
- changeObjectToMap(value,"",user,"create",addObjectList);
+ dataVOMap.forEach((key, value) -> {
+ if (baseModelMap.containsKey(key)) {
+ BaseModel baseModel = baseModelMap.get(key);
+ changeObjectToMap(value, baseModel.getId(), finalUser, "editstatus", editObjectList);
+ } else {
+ changeObjectToMap(value, "", finalUser, "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());
+ if (classifyFullInfo == null || classifyFullInfo.getCurrentClassifyVO() == null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())) {
+ log.info("classifyFullInfo:" + "鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
+ throw new Throwable("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
+ }
+ CodeRuleVO ruleVO = mdmEngineServiceI.getCodeRuleByClassifyFullInfo(classifyFullInfo);
+ if (ruleVO == null || StringUtils.isBlank(ruleVO.getOid())) {
+ throw new Throwable("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旇鍒�");
+ }
+ DataObjectVO dataObjectVO = new DataObjectVO();
+ ApplyDatasVO applyDatasVO = new ApplyDatasVO();
+ applyDatasVO.setObject(addObjectList);
+ LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
+ 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(section, ruleVO, classifyFullInfo);
+ log.info("end锛氱爜娈佃幏鍙栧畬姣�");
+ orderDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
+ mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs, false);
+ allResultDataObjectDetailDOS.addAll(resultDataObjectDetailDOs);
}
- });
- allObjectList.addAll(addObjectList);
- allObjectList.addAll(editObjectList);
- allDatasVO.setObject(allObjectList);
- LinkedList<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new LinkedList<>();
- if(!CollectionUtils.isEmpty(addObjectList)){
- //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
- CodeClassifyFullInfoBO classifyFullInfo = codeClassifyService.getClassifyFullInfo(codeClassify.getOid());
- if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
- log.info("classifyFullInfo:"+"鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
+ //鏇存柊鏁版嵁锛堟洿鏂扮姸鎬侊級
+ 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);
}
- CodeRuleVO ruleVO = mdmEngineServiceI.getCodeRuleByClassifyFullInfo(classifyFullInfo);
- if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旇鍒�");
- }
- DataObjectVO dataObjectVO = new DataObjectVO();
- ApplyDatasVO applyDatasVO = new ApplyDatasVO();
- applyDatasVO.setObject(addObjectList);
- LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
- 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(section, ruleVO,classifyFullInfo);
- log.info("end锛氱爜娈佃幏鍙栧畬姣�");
- orderDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
- mdmIOService.batchSyncApplyCode(orderDTO, 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();
}
- //鏇存柊鏁版嵁锛堟洿鏂扮姸鎬侊級
- 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){
+ } catch (Throwable e) {
e.printStackTrace();
- log.error(e.getMessage());
+ log.error("鏌ヨ澶辫触--->" + e);
+ success = false;
+ backString = "鏌ヨ澶辫触--->" + e;
+ msg = "鏌ヨ澶辫触--->" + e;
+ throw new VciBaseException(e.getMessage());
+ } finally {
+ try {
+ //璁板綍鏃ュ織
+ this.saveLogs(systemId, systemId, paramString, backString, success, msg, "queryData");
+ } catch (Throwable e) {
+ e.printStackTrace();
+ log.error(e.getMessage());
+ throw new VciBaseException(e.getMessage());
+ }
}
+ }else{
+ throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
}
+ }catch (Throwable e1){
+ e1.printStackTrace();
+ log.error("鏌ヨ澶辫触--->" + e1);
+ //paramString="";
+ success = false;
+ backString = "鏌ヨ澶辫触--->" + e1;
+ msg = "鏌ヨ澶辫触--->" + e1;
+ try {
+ //璁板綍鏃ュ織
+ this.saveLogs(systemId, systemId, paramString, backString, success, msg, "queryData");
+ } catch (Throwable e) {
+ e.printStackTrace();
+ log.error(e.getMessage());
+ throw new ServiceException(e.getMessage());
+ }
+ throw new ServiceException(e1.getMessage());
}
}
@@ -467,7 +535,7 @@
dockingLoge.setInterfaceStatus("false");//鎺ュ彛闆嗘垚鐘舵��
}
dockingLogeService.save(dockingLoge);
- log.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
+ log.info("闆嗘垚鎺ㄩ�佹暟鎹�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
}
/***
@@ -531,6 +599,7 @@
}
return codeOrderSecDTOList;
}
+
/***
* 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
* @param systemId
@@ -655,26 +724,27 @@
throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
}
}
- private void changeObjectToMap(SearchItemDataVO searchItemDataVO, String code, BladeUser user,String operation,List<ApplyDataVO> object){
+
+ private void changeObjectToMap(SearchItemUpperCaseDataVO searchItemDataVO, String code, BladeUser user,String operation,List<ApplyDataVO> object){
ApplyDataVO applyDataVO=new ApplyDataVO();
List<ProppertyVO> propList=new ArrayList<>();
//String status= searchItemDataVO.getStatus();//鏁版嵁鐘舵�� 瀛楃鍨嬶紝鏋氫妇鍊硷紱鍒跺崟锛�0锛涘鎵逛腑锛�1锛涢�氳繃锛�2锛涢┏鍥烇細3锛�
- String mmodelCode=searchItemDataVO.getMmodelcode();//鍒堕�犲瀷鍙蜂唬鍙�
+ String mmodelCode=searchItemDataVO.getMMODELCODE();//鍒堕�犲瀷鍙蜂唬鍙�
initProperty("mmodelcode","",mmodelCode,propList);
- String projectCode= searchItemDataVO.getProjectcode();//椤圭洰缂栫爜
+ String projectCode= searchItemDataVO.getPROJECTCODE();//椤圭洰缂栫爜
initProperty("projectcode","",projectCode,propList);
- String projectItem=searchItemDataVO.getProjectitem();//椤圭洰浠ｅ彿
+ String projectItem=searchItemDataVO.getPROJECTITEM();//椤圭洰浠ｅ彿
initProperty("projectitem","",projectItem,propList);
- String materialCode=searchItemDataVO.getMaterialcode();//浜у搧缂栫爜
+ String materialCode=searchItemDataVO.getMATERIALCODE();//浜у搧缂栫爜
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();//鏇存敼鑰�
- Date lastchangeDon=searchItemDataVO.getLastchangedon();//鏇存敼鏃堕棿 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
- String isenabled= searchItemDataVO.getIsenabled();//瀛楃鍨嬶紝鏋氫妇鍊硷紱鍋滅敤锛�0锛涘惎鐢細1锛�
+ String creatBy=searchItemDataVO.getCREATBY();//鍒涘缓鑰�
+ Date cretaeDon= searchItemDataVO.getCREATEDON();//鍒涘缓鏃ユ湡 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
+ String lastchangeBy=searchItemDataVO.getLASTCHANGEDBY();//鏇存敼鑰�
+ Date lastchangeDon=searchItemDataVO.getLASTCHANGEDON();//鏇存敼鏃堕棿 鏃ユ湡鍨嬶紝濡傦細2023-09-08 19:24:11
+ String isenabled= searchItemDataVO.getISENABLED();//瀛楃鍨嬶紝鏋氫妇鍊硷紱鍋滅敤锛�0锛涘惎鐢細1锛�
applyDataVO.setOperate(operation);
applyDataVO.setCode(code);
if(isenabled.equals("0")){
@@ -688,13 +758,15 @@
applyDataVO.setProp(propList);
object.add(applyDataVO);
}
- private void initProperty(String key,String text,String value,List<ProppertyVO> propList){
+
+ private void initProperty(String key,String text,String value,List<ProppertyVO> propList){
ProppertyVO vo=new ProppertyVO();
vo.setKey(key);
- vo.setText(text);
- vo.setValue(value);
+ vo.setText(StringUtils.isBlank(text)?"":text);
+ vo.setValue(StringUtils.isBlank(value)?"":value);
propList.add(vo);
}
+
/***
* 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
* @param type
@@ -712,94 +784,104 @@
}
Map<String ,List<DockingSystemConfig>> sysIntInfoDOMap = new HashMap<>();//key=classifyoid,value=list<map>
for (DockingSystemConfig dockingSystemConfig:dockingSystemConfigList){
- List<DockingSystemConfig> dockingSystemList = sysIntInfoDOMap.get(dockingSystemConfig.getClassifyOid());
- if(dockingSystemList==null){
- dockingSystemList = new ArrayList<>();
- }
- dockingSystemList.add(dockingSystemConfig);
- sysIntInfoDOMap.put(dockingSystemConfig.getClassifyOid(),dockingSystemList);
- }
- //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
- LambdaQueryWrapper<DockingData> queryWrapper = Wrappers.<DockingData>lambdaQuery();
- queryWrapper.eq(DockingData::getSendFlag,"false");
- if(type==2){
- queryWrapper.eq(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
- }else {
- queryWrapper.notIn(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
- }
- List<DockingData> dataList = dockingDataService.list(queryWrapper);
-
- for (DockingData mapi:dataList){
- WebUtil.setPersistence(false);
- String dataoid = mapi.getOid();//data瀵硅薄鐨刼id
- String classifyoid = mapi.getClassifyOid();
- String id = mapi.getId();
- String uniquecode = mapi.getUniqueCode();
- String btmid = mapi.getBtmId();
- String btmoid = mapi.getBtmOid();
- String sendtype = mapi.getSendType();
- String classifyid = mapi.getClassifyId();
- String classifyname = mapi.getClassifyName();
- String curentClassOid=null;
- if(type==2){
- curentClassOid=btmoid;
- }else{
- curentClassOid=classifyoid;
- }
- List<DockingSystemConfig> effectiveSysIntInfoVOs=new ArrayList<>();
- //鏍规嵁褰撳墠鏁版嵁鐨刬d锛屾煡璇㈣幏鍙栧摢浜涚郴缁熼渶瑕佸仛闆嗘垚
- List<CodeClassify> parentLeveDO= codeClassifyService.selectAllLevelParentByOid(curentClassOid);
- if(CollectionUtils.isEmpty(parentLeveDO)){
- continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
- }
- Map<String, CodeClassify> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
-
- oidCodeclassifyDOMap.keySet().forEach(oid->{
- if(sysIntInfoDOMap.containsKey(oid)){
- List<DockingSystemConfig> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
- effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
+ String classifyOid= dockingSystemConfig.getClassifyOid();
+ String codeclassifOid=codeClassifyService.selectLeafByPid(classifyOid);
+ List<String> codeList= VciBaseUtil.str2List(codeclassifOid);
+ codeList.stream().forEach(oid -> {
+ List<DockingSystemConfig> dockingSystemList = sysIntInfoDOMap.get(oid);
+ if(Func.isEmpty(dockingSystemList)){
+ dockingSystemList=new ArrayList<>();
}
+ dockingSystemList.add(dockingSystemConfig);
+ sysIntInfoDOMap.put(oid,dockingSystemList);
});
- //濡傛灉鏍￠獙鐨勭郴缁熸帴鍙ｄ俊鎭笉瀛樺湪锛屽垯鏁版嵁涓嶄笉寰�淇℃伅閲屾帹閫�
- if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
- continue;
- }
- List<DockingTask> dockingTask_insert = new ArrayList<>();
- for (DockingSystemConfig sysIntInfoVOi:effectiveSysIntInfoVOs){
- DockingTask dockingTask = new DockingTask();
- dockingTask.setOid(VciBaseUtil.getPk());
- dockingTask.setSendFlag(SEND_FLAG_FALSE);
- dockingTask.setId(id);//缂栫爜
- dockingTask.setUniqueCode(uniquecode);
- dockingTask.setBtmOid(btmoid);//鏁版嵁oid
- dockingTask.setBtmId(btmid);//鏁版嵁涓氬姟绫诲瀷id
- dockingTask.setClassifyId(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
- dockingTask.setClassifyOid(classifyoid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
- dockingTask.setClassifyName(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
- dockingTask.setSendType(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
- dockingTask.setDataOid(dataoid);
- dockingTask.setCreateTime(new Date());
- dockingTask.setLastModifyTime(new Date());
- dockingTask.setCreator("sysAdmin");
- dockingTask.setLastModifier("sysAdmin");
- //intinfo
- dockingTask.setSysInfoOid(sysIntInfoVOi.getOid());//intinfo鐨刼id
- dockingTask.setSystemOid(sysIntInfoVOi.getSysBaseOid());//绯荤粺oid
- dockingTask.setSystemCode(sysIntInfoVOi.getSysBaseId());//绯荤粺缂栫爜
- dockingTask.setSystemName(sysIntInfoVOi.getSysBaseName());//绯荤粺name
- dockingTask_insert.add(dockingTask);
- }
-
- if(dockingTask_insert.size()!=0) {
- dockingTaskService.saveBatch(dockingTask_insert);
- }
- //dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
- boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
- if(!u){
- log.error("闆嗘垚data鍒嗚В浠诲姟澶辫触锛乨ataoid:"+dataoid);
- continue;
- }
}
+ sysIntInfoDOMap.forEach((classifyOid,effectiveSysIntInfoVOs)->{
+ //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
+ LambdaQueryWrapper<DockingData> queryWrapper = Wrappers.<DockingData>lambdaQuery();
+ queryWrapper.eq(DockingData::getSendFlag,"false");
+ if(type==2){
+ queryWrapper.eq(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY);
+ }else {
+ queryWrapper.ne(DockingData::getBtmId,DOCKING_DEFAULT_CLASSIFY);
+ queryWrapper.eq(DockingData::getClassifyOid,classifyOid);
+ }
+ List<DockingData> dataList = dockingDataService.list(queryWrapper);
+ for (DockingData mapi:dataList){
+ WebUtil.setPersistence(false);
+ String dataoid = mapi.getOid();//data瀵硅薄鐨刼id
+ String dataClassifyOid = mapi.getClassifyOid();
+ String id = mapi.getId();
+ String uniquecode = mapi.getUniqueCode();
+ String btmid = mapi.getBtmId();
+ String btmoid = mapi.getBtmOid();
+ String sendtype = mapi.getSendType();
+ String classifyid = mapi.getClassifyId();
+ String classifyname = mapi.getClassifyName();
+ String curentClassOid=null;
+ if(!dataClassifyOid.equals(classifyOid)){
+ continue;
+ }
+ /*if(type==2){
+ curentClassOid=btmoid;
+ }else{
+ curentClassOid=classifyoid;
+ }*/
+ /*//鏍规嵁褰撳墠鏁版嵁鐨刬d锛屾煡璇㈣幏鍙栧摢浜涚郴缁熼渶瑕佸仛闆嗘垚
+ List<CodeClassify> parentLeveDO= codeClassifyService.selectAllLevelParentByOid(curentClassOid);
+ if(CollectionUtils.isEmpty(parentLeveDO)){
+ continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
+ }
+ Map<String, CodeClassify> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
+
+ oidCodeclassifyDOMap.keySet().forEach(oid->{
+ if(sysIntInfoDOMap.containsKey(oid)){
+ List<DockingSystemConfig> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
+ effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
+ }
+ });
+ //濡傛灉鏍￠獙鐨勭郴缁熸帴鍙ｄ俊鎭笉瀛樺湪锛屽垯鏁版嵁涓嶄笉寰�淇℃伅閲屾帹閫�
+ if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
+ continue;
+ }*/
+ List<DockingTask> dockingTask_insert = new ArrayList<>();
+ for (DockingSystemConfig sysIntInfoVOi:effectiveSysIntInfoVOs){
+ DockingTask dockingTask = new DockingTask();
+ dockingTask.setOid(VciBaseUtil.getPk());
+ dockingTask.setSendFlag(SEND_FLAG_FALSE);
+ dockingTask.setId(id);//缂栫爜
+ dockingTask.setUniqueCode(uniquecode);
+ dockingTask.setBtmOid(btmoid);//鏁版嵁oid
+ dockingTask.setBtmId(btmid);//鏁版嵁涓氬姟绫诲瀷id
+ dockingTask.setClassifyId(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
+ dockingTask.setClassifyOid(dataClassifyOid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
+ dockingTask.setClassifyName(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
+ dockingTask.setSendType(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
+ dockingTask.setDataOid(dataoid);
+ dockingTask.setCreateTime(new Date());
+ dockingTask.setLastModifyTime(new Date());
+ dockingTask.setCreator("sysAdmin");
+ dockingTask.setLastModifier("sysAdmin");
+ //intinfo
+ dockingTask.setSysInfoOid(sysIntInfoVOi.getOid());//intinfo鐨刼id
+ dockingTask.setSystemOid(sysIntInfoVOi.getSysBaseOid());//绯荤粺oid
+ dockingTask.setSystemCode(sysIntInfoVOi.getSysBaseId());//绯荤粺缂栫爜
+ dockingTask.setSystemName(sysIntInfoVOi.getSysBaseName());//绯荤粺name
+ dockingTask_insert.add(dockingTask);
+ }
+
+ if(dockingTask_insert.size()!=0) {
+ dockingTaskService.saveBatch(dockingTask_insert);
+ }
+ //dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
+ boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
+ if(!u){
+ log.error("闆嗘垚data鍒嗚В浠诲姟澶辫触锛乨ataoid:"+dataoid);
+ continue;
+ }
+ }
+ });
+
}
/***
@@ -810,7 +892,7 @@
for (DockingTask dockingTask:dockingTaskList){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
String paramString="";
- String sendString="";
+ Object sendString="";
String backString="";
//鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
String systeminfooid = dockingTask.getSysInfoOid();//sysininfo 鐨刼id
@@ -844,8 +926,8 @@
DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
String paramType = dockingSystemConfig.getParamType();//xml/json
if(paramType.equals(DATATYPE_JSON)){
- Object object = JSONObject.toJSON(jsonRootDataDTO);
- sendString = object.toString();
+ Object object = JSONObject.toJSON(jsonRootDataDTO);
+ sendString = object;
}else{
//缁勭粐杩斿洖鎺ュ彛淇℃伅
XStream xStream = new XStream(new DomDriver());
@@ -862,15 +944,16 @@
}
}
}
+
/***
* 鍙戦�佺紪鐮佷富鏁版嵁
*/
- private void sendpushDataForService (List<DockingTask> dockingTaskS){
+ private void sendpushDataForService(List<DockingTask> dockingTaskS){
//姣忎釜task渚濇鎵ц鎺ㄩ��
for (DockingTask dockingTask:dockingTaskS){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
String paramString="";
- String sendString="";
+ Object sendString="";
String backString="";
try {
//鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
@@ -886,16 +969,35 @@
List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes();
Map<String/**鑻辨枃鍚嶇О**/, String/**涓枃鍚嶇О**/> attrIdNameMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(), (o1, o2) -> o2));
Map<String, String> data = new HashMap<>();
- if (r == null) {
- JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
- data = (Map) josni;
+ // TODO: 鍥炴敹缂栫爜鐨勬儏鍐碉紝浼氬嚭鐜版暟鎹凡缁忓洖鏀讹紝浣嗘槸浜嬪姟杩樻湭鎵ц鐨勬儏鍐碉紝
+ // 瀵艰嚧鍙栦笉鍒扮爜鍊硷紝鎵�浠ヨ繖鍎块�氳繃鏌ヨ鐮佸�艰〃涓瓨鍌ㄧ殑宸插洖鏀剁殑涓氬姟鏁版嵁淇℃伅锛岃В鏋愬嚭鏉�
+ if (!r.isSuccess() || Func.isEmpty(r.getData())) {
+ List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getId, dockingTask.getId()));
+ CodeAllCode codeAllCode = codeAllCodes.get(0);
+ BaseModel baseModel = JSONObject.parseObject(codeAllCode.getBusinessData(), BaseModel.class);
+ Map<String, Object> objectMap = VciBaseUtil.objectToMap(baseModel);
+ for (Map.Entry<String,Object> entry : objectMap.entrySet()){
+ if(entry.getKey().equals("data") && Func.isNotEmpty(entry.getValue())){
+ Map<String, Object> dataMap = (Map<String,Object>)((JSONObject) entry.getValue());
+ for(Map.Entry<String,Object> dataEntry : dataMap.entrySet()){
+ String v = String.valueOf(dataEntry.getValue());
+ data.put(dataEntry.getKey().toLowerCase(Locale.ROOT), v == null ? "" : v);
+ }
+ }else{
+ String key = entry.getKey().toLowerCase(Locale.ROOT);
+ String value = String.valueOf(entry.getValue());
+ data.put(key, value == null ? "" : value);
+ }
+ }
+ /*JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
+ data = (Map) josni;*/
} else {
data = r.getData().get(0);
}
List<NodeProDTO> nodeProDTOS = new ArrayList<>();
Map<String, String> finalData = data;
AtomicReference<String> newItemId= new AtomicReference<>("");
- attrIdNameMap.keySet().forEach(field -> {
+ finalData.keySet().forEach(field -> {
if(field.toLowerCase(Locale.ROOT).equals(itemId.toLowerCase(Locale.ROOT))){
String Value = finalData.get(field);
newItemId.set(Value);
@@ -914,12 +1016,14 @@
DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
boolean isGroupCodeFlage=false;
if(dockingSystemConfig!=null) {
- isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.getBoolean(dockingSystemConfig.getIsGroupCodeFlag());
+ isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.parseBoolean(dockingSystemConfig.getIsGroupCodeFlag());
}
if(isGroupCodeFlage){
code=data.getOrDefault("groupcode","");
- if(StringUtils.isBlank(code)) {//濡傛灉鏄泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
+ if(StringUtils.isBlank(code)) {
+ //濡傛灉鏄帹閫侀泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
dockingTask.setDescription("绛夊緟闆嗗洟鐢宠闆嗗洟鐮�");
+ // TODO锛氬彲鑳戒細鍑虹幇鏈幏鍙栧埌闆嗗洟鐮侊紝浣嗘槸鍙堢珛椹墽琛屼簡鍥炴敹锛屾鏃惰繖鏉′换鍔″氨姘歌繙鏃犳硶缁撴潫,鎵�浠ヨ繖鍎垮垽鏂彧瑕佹槸闆嗗洟鐮佷负绌猴紝骞朵笖鏄洖鏀剁殑灏卞叧闂帹閫佽繖鏉′换鍔�
dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
dockingTask.setLastModifyTime(new Date());
dockingTaskService.updateById(dockingTask);
@@ -944,7 +1048,8 @@
String paramType = dockingSystemConfig.getParamType();//xml/json
if (paramType.equals(DATATYPE_JSON)) {
Object object = JSONObject.toJSON(nodeJosnDTO);
- sendString = object.toString();
+ //sendString = object.toString();
+ sendString = object;
} else {
//缁勭粐杩斿洖鎺ュ彛淇℃伅
XStream xStream = new XStream(new DomDriver());
@@ -960,24 +1065,25 @@
}
}
}
+
/***
- * 璋冪敤鎺ュ彛
- * @param sendString
+ * 璋冪敤鎺ュ彛锛屼紶鍙備负JSON鏃朵紶object绫诲瀷,Content-Type鏀逛负鐣岄潰閰嶇疆鐨�
+ * @param sendObject
* @param dockingSystemConfig
* @param dockingTask
* @throws Throwable
*/
- private void callInterface(String sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation) throws Throwable{
+ private void callInterface(Object sendObject, DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation) throws Throwable{
String paramString = "";
-
String backString = "";
- String msg="";
+ String sendString = sendObject.toString();
+ String msg= "" ;
String url = dockingSystemConfig.getRequestUrl();//url
List<ResultNodeObjectDTO> resultNodeObjectDTOS =new ArrayList<>();
try {
boolean usedFlag= dockingSystemConfig.getUsedFlag().equals("true")?true:false;
if(!usedFlag){
- throw new Throwable("鎺ュ彛宸茬粡鍋滅敤锛�");
+ throw new Throwable("鎺ュ彛宸茬粡鍋滅敤锛�");
}
String type = dockingSystemConfig.getInterfaceType().toLowerCase(Locale.ROOT);//get/post/webserver/corba
String paramType = dockingSystemConfig.getParamType();//xml/json
@@ -1002,17 +1108,22 @@
paramString = sendurl;
backString = HttpUtils.get(sendurl);
} else if (requestmethod.equals(URLTYPE_POST)) {//POST璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) {
params.add(dockingSysIntParam.getParamKey(), dockingSysIntParam.getParamValue());
}
- params.add(DATA_PARAM_NAME,sendString);
+ params.add(DATA_PARAM_NAME,sendObject);
paramString = params.toString();
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
for (DockingSysIntHeader dockingSysIntHeader : dockingSysIntHeaderList) {
headers.add(dockingSysIntHeader.getHeaderKey(), dockingSysIntHeader.getHeaderValue());
}
- backString = HttpUtils.post(url, params, headers);
+ 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);
@@ -1110,10 +1221,11 @@
}
}
}
+
/***
* 鏌ヨ闇�瑕侀泦鎴愮殑涓氬姟鏁版嵁浠诲姟
*/
- private void sendpushDataForService (){
+ private void sendpushDataForService(){
initSysadmin();
//鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
//VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
@@ -1133,7 +1245,7 @@
*/
private void sendpushClsfForService(){
initSysadmin();
- /* //鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
+ /* //鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
queryWrapper.addQueryMap("sendFlag",MdmDuckingConstant.SEND_FLAG_FALSE);
queryWrapper.addQueryMap("btmId",DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT));
@@ -1146,6 +1258,7 @@
List<DockingTask> dockingTaskDOS = dockingTaskService.list(queryWrapper);
sendpushClsfForService(dockingTaskDOS);
}
+
public void initSysadmin(){
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId("sysAdmin");
@@ -1155,6 +1268,7 @@
sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+"");
WebUtil.setSessionInfo(sessionInfo);
}
+
/**
* dockingdata鏍规嵁oid淇敼sendflag
* @param oid
@@ -1170,5 +1284,6 @@
}
return u;
}
+
}
--
Gitblit v1.9.3