From becbe54034f5803eee6540f533be9eb35ef8b86e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 13 四月 2024 20:46:52 +0800
Subject: [PATCH] 内网开发环境代码合并

---
 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java       |    1 
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java |   61 +++++++++++++++++-------------
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java                                |   13 ++++--
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java                                              |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml                                                                 |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java                                         |    3 -
 Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java                                    |    7 ---
 7 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
index 25e7756..fb2d66d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -1,6 +1,5 @@
 package com.vci.ubcs.code.applyjtcodeservice.feign;
 
-
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingClassifyModelAttrVO;
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingReturnStoreVO;
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index 1cf91b0..102c534 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -141,10 +141,11 @@
 					log.info("鐢宠闆嗗洟鐮佹暟鎹牸寮�:->"+resultStr);
 					DockingResultVO resultDataObject = new DockingResultVO();
 					resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
+					log.info("鐢宠闆嗗洟鐮佽繑鍥炵粨鏋�:->"+JSONObject.toJSONString(resultDataObject));
 					code = resultDataObject.getCode();
 					msg = resultDataObject.getMsg();
 					boolean res=false;
-					if ("1".equals(code)) {
+					if("1".equals(code)) {
 						//缁撴灉姝g‘鐨勬儏鍐�
 						List<DockingDataVO> dataObjectVOList = resultDataObject.getData();
 						res=true;
@@ -154,7 +155,7 @@
 							DockingMainDataVO data2 = dataObject.getData();
 							String applyId = data2.getApplyId();//鐢宠鍗昳d
 							BaseModel baseModel = baseModelMap.get(applyId);
-							String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//闆嗗洟鐮佹
+							String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();
 							msg = dataObject.getMsg();
 							if (code2.equals("1")) {//缁撴灉姝g‘鐨勬儏鍐�
 								if (!"".equals(customCoding)) {
@@ -183,9 +184,9 @@
 								} catch (JsonProcessingException e) {
 								}
 								Date date = new Date();
-								baseModel.setLastModifyTime(date);
-								baseModel.setTs(date);
-								baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+								dockingPreApplyForm.setLastModifyTime(date);
+								dockingPreApplyForm.setTs(date);
+								dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
 								//DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
 							}
 							//鏂板鐨勭敵璇峰崟鏁版嵁
@@ -205,17 +206,17 @@
 								Date date = new Date();
 								dockingPreApplyForm.setCreateTime(date);
 								dockingPreApplyForm.setLastModifyTime(date);
-								dockingPreApplyForm.setTs(date);
-								dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
 								dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
 								dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+								dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+								dockingPreApplyForm.setTs(date);
 								// DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
 							}
 							//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
 							if (isEditDatas) {
 								if (baseModelMap.containsKey(applyId)) {
 									baseModel = baseModelMap.get(applyId);
-									Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
+									//Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
 									/*String classOid=baseModel.getId();
 									if(partCode.equals(classOid)){
 										baseModel.setId(10+customCoding);
@@ -234,15 +235,18 @@
 						});
 					} else {
 						res=false;
+						Date date = new Date();
 						editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
 							dockingPreApplyForm.setCode("2");
 							dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
 							dockingPreApplyForm.setContent("");
 							dockingPreApplyForm.setGroupCode("");
-							Date date = new Date();
+							dockingPreApplyForm.setCreateTime(date);
 							dockingPreApplyForm.setLastModifyTime(date);
-							dockingPreApplyForm.setTs(date);
+							dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
 							dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+							dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+							dockingPreApplyForm.setTs(date);
 							//DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
 						});
 						addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
@@ -250,13 +254,12 @@
 							dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
 							dockingPreApplyForm.setContent("");
 							dockingPreApplyForm.setGroupCode("");
-							Date date = new Date();
 							dockingPreApplyForm.setCreateTime(date);
 							dockingPreApplyForm.setLastModifyTime(date);
-							dockingPreApplyForm.setTs(date);
+							dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
 							dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
 							dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
-							dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+							dockingPreApplyForm.setTs(date);
 							//DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
 						});
 					}
@@ -275,7 +278,7 @@
 				}
 				return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
 			} catch (VciBaseException e) {
-				return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触" + e);
+				return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触" + e.getMessage());
 			}
 		}else{
 			return R.fail("鐢宠鎺ュ彛寮�鍏冲凡鍏抽棴锛屼笉鐢宠闆嗗洟鐮�");
@@ -372,8 +375,8 @@
 							Date date = new Date();
 							dockingPreApplyForm.setCreateTime(date);
 							dockingPreApplyForm.setLastModifyTime(date);
-							dockingPreApplyForm.setTs(date);
 							dockingPreApplyForm.setBtmname(MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+							dockingPreApplyForm.setTs(date);
 							dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
 							dockingPreApplyForm.setCreator(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
 							//DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
@@ -391,8 +394,8 @@
 								baseModel.setLastModifyTime(date);
 								baseModel.setTs(date);
 								baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
-								DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
-								//	baseModel.setId(customCoding);
+								//DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+								//baseModel.setId(customCoding);
 								baseModel.getData().put("GROUPCODE", customCoding);
 								updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
 							}
@@ -555,7 +558,7 @@
 						dockingPreClassify.setVersionValue(version);
 						dockingPreClassifyList.add(dockingPreClassify);
 					});
-					boolean res=	dockingPreClassifyService.saveOrUpdateBatch(dockingPreClassifyList);
+					boolean res = dockingPreClassifyService.saveOrUpdateBatch(dockingPreClassifyList);
 					if(res){
 						R.success(message);
 					}else{
@@ -670,7 +673,7 @@
 		VciBaseUtil.alertNotNull(operationType,"闆嗘垚鎿嶄綔绫诲瀷");
 		try {
 			if(operationType.equals("all")){
-				return	queryMdmModel();
+				return queryMdmModel();
 			}else{
 				VciBaseUtil.alertNotNull(classifyId,"闆嗗洟鍒嗙被涓婚敭");
 				return queryClassModel(classifyId);
@@ -926,7 +929,7 @@
 	 * @return
 	 * @throws VciBaseException
 	 */
-	private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel>  codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm>  editDockingPreApplyFormMap,Map<String,BaseModel>  codeWupinMap) throws VciBaseException{
+	private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm>  editDockingPreApplyFormMap,Map<String,BaseModel>  codeWupinMap) throws VciBaseException{
 		try {
 			// TODO锛氫富鏁版嵁鎺ㄩ�佽繃鏉ョ殑鏁版嵁鏄嬁涓嶅埌鍙互鐢宠闆嗗洟鐮佺殑鐢ㄦ埛淇℃伅鐨勶紝骞朵笖杩欎竴鍧楀効鐨勯�昏緫涔熻繕娌℃暡瀹氾紝鎵�浠ヨ繖鍎块噰鐢ㄩ厤缃殑鐢ㄦ埛鏉ョ敵璇烽泦鍥㈢爜
 			String curUserName = Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount();
@@ -961,7 +964,8 @@
 					addDockingPreApplyFormMap.put(applyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
 				//	}
 
-				codeWupinMap.put(applyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+				//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+				codeWupinMap.put(applyCode, dataBusinessObject);
 				// conditionsMap = new HashMap<String, String>();
 				// conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
 
@@ -982,13 +986,16 @@
 					dockingPreApplyForm.setGroupCode(groucode);
 					mainData.setCustomCoding(groucode);
 				}
-				mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
-				mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
+				//瀵嗙骇锛岄粯璁や负鍐呴儴
+				mainData.setSecretLevel("鍐呴儴");
+				//鑾峰彇瑙嗗浘妯″瀷
+				mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));
 				mainDataList.add(mainData);
 			}
 			//鏍规嵁鏁版嵁妯″瀷锛岀粍缁囨墍闇�瑕佹暟鎹�
-			DockingGroupDataVO postParameters=new DockingGroupDataVO();
-			postParameters.setSysName(dockingApplySysName);//绯荤粺鏍囪瘑
+			DockingGroupDataVO postParameters = new DockingGroupDataVO();
+			//绯荤粺鏍囪瘑
+			postParameters.setSysName(dockingApplySysName);
 			postParameters.setMainData(mainDataList);//
 			return postParameters;
 		} catch (Throwable e) {
@@ -1058,7 +1065,7 @@
 			String jenglishname=dockingPreMetaAttr.getEnglishName();////闆嗗洟閰嶇疆灞炴��
 			if(jintegmappconfigMap.containsKey(jenglishname)){
 				DockingPreAttrMapping dockingPreAttrMapping=jintegmappconfigMap.get(jenglishname);
-				String attrId = dockingPreAttrMapping.getTargetAttrId();//缂栫爜灞炴�d
+				// String attrId = dockingPreAttrMapping.getTargetAttrId();//缂栫爜灞炴�d
 				String jtargetattrkey = dockingPreAttrMapping.getTargetAttrKey();//缂栫爜灞炴�d
 				Object newVaue=null;
 				if(StringUtils.isNotBlank(jtargetattrkey)){
@@ -1077,7 +1084,7 @@
 				}else{
 					newVaue = getVaue(dockingPreMetaAttr, "");
 				}
-				if(newVaue==null||"".equals(newVaue)){
+				if(newVaue==null || "".equals(newVaue)){
 					newVaue= dockingPreMetaAttr.getDefaultValue();
 				}
 				//newVaue= Func.isNotEmpty(newVaue)?newVaue:"";
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index 9058165..c93fd06 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -1,6 +1,5 @@
 package com.vci.ubcs.code.controller;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,11 +32,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.rmi.ServerException;
 import java.util.*;
 
 @RestController
-//@AllArgsConstructor
 @RequestMapping("/mdmEngineController")
 @Api(value = "缂栫爜鏁版嵁绠$悊", tags = "缂栫爜鏁版嵁绠$悊")
 public class MdmEngineController {
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 d9689cf..6235a85 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,6 +2,7 @@
 
 
 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;
@@ -9,7 +10,6 @@
 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;
@@ -80,6 +80,7 @@
 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;
@@ -966,11 +967,12 @@
 				//琛ㄧず鏄富鏁版嵁
 				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<>();
 				// 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);
@@ -978,7 +980,7 @@
 					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());
+							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);
@@ -986,7 +988,7 @@
 						}else{
 							String key = entry.getKey().toLowerCase(Locale.ROOT);
 							String value = String.valueOf(entry.getValue());
-							data.put(key, value == null ? "":value);
+							data.put(key, value == null ? "" : value);
 						}
 					}
 					/*JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
@@ -1023,7 +1025,7 @@
 					if(StringUtils.isBlank(code)) {
 						//濡傛灉鏄帹閫侀泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
 						dockingTask.setDescription("绛夊緟闆嗗洟鐢宠闆嗗洟鐮�");
-						// TODO锛氬彲鑳戒細鍑虹幇鏈幏鍙栧埌闆嗗洟鐮侊紝灏辫鐐逛簡鍥炴敹锛岃繖鏃跺��
+						// TODO锛氬彲鑳戒細鍑虹幇鏈幏鍙栧埌闆嗗洟鐮侊紝浣嗘槸鍙堢珛椹墽琛屼簡鍥炴敹锛屾鏃惰繖鏉′换鍔″氨姘歌繙鏃犳硶缁撴潫,鎵�浠ヨ繖鍎垮垽鏂彧瑕佹槸闆嗗洟鐮佷负绌猴紝骞朵笖鏄洖鏀剁殑灏卞叧闂帹閫佽繖鏉′换鍔�
 						dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
 						dockingTask.setLastModifyTime(new Date());
 						dockingTaskService.updateById(dockingTask);
@@ -1250,6 +1252,7 @@
 		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);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
index fbc1f4f..d9ac268 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/BaseMdodelWrapper.java
@@ -7,7 +7,6 @@
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml
index 2f65641..3c1db79 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CommonsMapper.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.CommonsMapper">
 
-
     <select id="selectByCount" resultType="java.util.Map">
         select COUNT(w.OID) count
         from ${tableName} w
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
index d2212fb..5c13be2 100644
--- a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java
@@ -4,24 +4,17 @@
 import com.vci.ubcs.deploy.entity.DeployApps;
 import com.vci.ubcs.deploy.service.IDeployAppsService;
 import com.vci.ubcs.deploy.vo.DeployAppsVO;
-import com.vci.ubcs.starter.util.LocalFileUtil;
-import com.vci.ubcs.starter.web.util.ControllerUtil;
-import com.vci.ubcs.starter.web.util.LangBaseUtil;
 import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.auth.AuthenticationException;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.ServletRequest;
-import java.io.File;
 import java.util.List;
 
 /**

--
Gitblit v1.9.3