From f21bdede8546a348e2b16ffc3bbe292df7eeba76 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 12 四月 2024 23:24:21 +0800
Subject: [PATCH] 集成相关代码修改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java |  171 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 116 insertions(+), 55 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 fcb7bbe..d9689cf 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,11 +3,13 @@
 
 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;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
+import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
 import com.vci.ubcs.code.constant.MdmDuckingConstant;
 import com.vci.ubcs.code.dto.CodeOrderDTO;
 import com.vci.ubcs.code.dto.CodeOrderSecDTO;
@@ -59,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;
@@ -71,11 +74,7 @@
 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.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
@@ -95,6 +94,7 @@
 @Service
 @Slf4j
 public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
+
 	@Value("${dataSyncPush.dataParamName:xmlData}")
 	public String DATA_PARAM_NAME;
 	@Value("${dataSyncPush.dataId:itemid}")
@@ -113,54 +113,79 @@
 
 	@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() {
 
@@ -222,6 +247,7 @@
 		});
 		return  R.success("鎵嬪姩鎺ㄩ�佸畬鎴�,璇锋牳瀵规槸鍚︽帹閫佹垚鍔�");
 	}
+
 	private SearchItemDataVO initData(String status,String itemCode,String mmCode){
 		SearchItemDataVO searchItemDataVO=new SearchItemDataVO();
 		searchItemDataVO.setLastchangedon(new Date());
@@ -255,14 +281,14 @@
 			}
 			org.springblade.core.tool.utils.WebUtil.setRequest(new ServletRequestAttributes(request));
 		}
-
 		return request;
 	}
+
 	/***
 	 * 鍚屾鍨嬪彿浠e彿
 	 */
 	@Override
-	public void saveItemDataSyncScheduing(String endDate) {
+	public void saveItemDataSyncScheduing(String endDate) throws ServiceException {
 		String paramString="";
 		String backString="鎴愬姛";
 		String msg="鎴愬姛";
@@ -276,28 +302,30 @@
 			calendar.set(Calendar.HOUR_OF_DAY, 0);
 			calendar.set(Calendar.MINUTE, 0);
 			calendar.set(Calendar.SECOND, 0);
-			log.info("鏌ヨ鏃堕棿------->"+calendar.getTime());
+			log.info("鏌ヨ鏃堕棿------->"+dft.format(new Date()));
 			lastchangedon= dft.format(calendar.getTime());
 		}else{
 			lastchangedon=endDate;
 		}
 		searchItemParam.setLastchangedon(lastchangedon);
-		searchItemParam.setStatus(itemStatus);//
-		Map<String,String>searchDataMap=  VciBaseUtil.objectToMapString(searchItemParam);
+		searchItemParam.setIsenabled("");
+		searchItemParam.setStatus(itemStatus);
+		//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("");
+			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("鍨嬪彿浠e彿鏁版嵁鍊�-------銆�"+paramString);
@@ -331,7 +359,7 @@
 					List<String> itemCodeList = new ArrayList<>();
 					ApplyDatasVO allDatasVO = new ApplyDatasVO();
 					List<ApplyDataVO> allObjectList = new ArrayList<>();
-					if (!CollectionUtils.isEmpty(dataList)) {
+					if (Func.isNotEmpty(dataList)) {
 						dataList.stream().forEach(searchItemDataVO -> {
 							String itemCode = StringUtils.isNotBlank(searchItemDataVO.getPROJECTITEM()) ? searchItemDataVO.getPROJECTITEM() : searchItemDataVO.getMMODELCODE();//椤圭洰浠e彿
 							dataVOMap.put(itemCode, searchItemDataVO);
@@ -437,12 +465,9 @@
 						paramString = Func.isEmpty(paramObject) ? "" : paramObject.toString();
 						Object backObject = JSONObject.toJSON(allResultDataObjectDetailDOS);
 						backString = Func.isEmpty(backObject) ? "" : backObject.toString();
-					}else{
-						throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
 					}
 				} catch (Throwable e) {
 					e.printStackTrace();
-					;
 					log.error("鏌ヨ澶辫触--->" + e);
 					success = false;
 					backString = "鏌ヨ澶辫触--->" + e;
@@ -459,7 +484,7 @@
 					}
 				}
 			}else{
-				throw  new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
+				throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
 			}
 		}catch (Throwable e1){
 			e1.printStackTrace();
@@ -474,8 +499,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());
 		}
 	}
 
@@ -510,7 +536,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);
 	}
 
 	/***
@@ -574,6 +600,7 @@
 		}
 		return codeOrderSecDTOList;
 	}
+
 	/***
 	 * 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
 	 * @param systemId
@@ -698,7 +725,8 @@
 			throw new   Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
 		}
 	}
- private void changeObjectToMap(SearchItemUpperCaseDataVO 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锛�
@@ -731,13 +759,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(StringUtils.isBlank(text)?"":text);
 	  vo.setValue(StringUtils.isBlank(value)?"":value);
 	  propList.add(vo);
   }
+
 	/***
 	 * 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
 	 * @param type
@@ -863,7 +893,7 @@
 		for (DockingTask dockingTask:dockingTaskList){
 			//姣忎釜task涓�涓簨鍔★紝寮�鍚�
 			String paramString="";
-			String sendString="";
+			Object sendString="";
 			String backString="";
 			//鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
 			String systeminfooid = dockingTask.getSysInfoOid();//sysininfo 鐨刼id
@@ -897,8 +927,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());
@@ -915,15 +945,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
@@ -935,13 +966,31 @@
 				//琛ㄧず鏄富鏁版嵁
 				CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
 				R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());
-
 				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 = ((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);
 				}
@@ -971,8 +1020,10 @@
 				}
 				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);
@@ -997,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());
@@ -1013,18 +1065,19 @@
 			}
 		}
 	}
+
 	/***
-	 * 璋冪敤鎺ュ彛
-	 * @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 {
@@ -1055,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);
@@ -1163,10 +1221,11 @@
 			}
 		}
 	}
+
 	/***
 	 * 鏌ヨ闇�瑕侀泦鎴愮殑涓氬姟鏁版嵁浠诲姟
 	 */
-	private void sendpushDataForService (){
+	private void sendpushDataForService(){
 		initSysadmin();
 		//鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
 		//VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
@@ -1186,12 +1245,11 @@
 	 */
 	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));
 		List<DockingTaskDO> dockingTaskDOS = dockingTaskDaoI.selectByWrapper(queryWrapper);*/
-
 		//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
 		LambdaQueryWrapper<DockingTask> queryWrapper = Wrappers.<DockingTask>lambdaQuery();
 		queryWrapper.eq(DockingTask::getSendFlag,MdmDuckingConstant.SEND_FLAG_FALSE);
@@ -1199,6 +1257,7 @@
 		List<DockingTask> dockingTaskDOS = dockingTaskService.list(queryWrapper);
 		sendpushClsfForService(dockingTaskDOS);
 	}
+
 	public void initSysadmin(){
 		SessionInfo sessionInfo = new SessionInfo();
 		sessionInfo.setUserId("sysAdmin");
@@ -1208,6 +1267,7 @@
 		sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+"");
 		WebUtil.setSessionInfo(sessionInfo);
 	}
+
 	/**
 	 * dockingdata鏍规嵁oid淇敼sendflag
 	 * @param oid
@@ -1223,5 +1283,6 @@
 		}
 		return u;
 	}
+
 }
 

--
Gitblit v1.9.3