From b3123380397990c9a82710dad430f87fb97b4b8f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 15 四月 2024 11:51:39 +0800
Subject: [PATCH] 内网开发环境代码合并
---
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreMetaAttr.java | 5 +++++
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/mapper/DockingPreMetaAttrMapper.java | 2 +-
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java | 5 ++---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreMetaAttrServiceImpl.java | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 2 +-
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreAttrMapping.java | 8 ++++++--
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 6 ++++--
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 8 ++++----
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IDockingPreMetaAttrService.java | 7 ++++---
9 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreAttrMapping.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreAttrMapping.java
index 3c13a2c..cb278c2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreAttrMapping.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreAttrMapping.java
@@ -35,18 +35,21 @@
*/
@ApiModelProperty(value = "婧愮郴缁熺殑灞炴�id")
private String metaListId;
+
/**
* 婧愬垎绫籭d
*/
@ApiModelProperty(value = "婧愮郴缁熺殑鍒嗙被oid")
@TableField(value = "sourceClsfId")
private String sourceClassifyId;
+
/**
* 婧愬垎绫诲悕绉�
*/
@ApiModelProperty(value = "婧愮郴缁熺殑鍒嗙被鍚嶇О")
@TableField(value = "sourceClsfName")
private String sourceClassifyName;
+
/**
* 婧愬睘鎬id
*/
@@ -90,22 +93,23 @@
@ApiModelProperty(value = "婧愮郴缁熷睘鎬у悕绉�")
private String sourceAttrName;
-
-
/***
* 瑙嗗浘鍚嶇О
*/
@ApiModelProperty(value = "妯″瀷瑙嗗浘鍚嶇О")
private String viewModelName;
+
/***
* 瑙嗗浘鍚嶇О
*/
@ApiModelProperty(value = "妯″瀷瑙嗗浘鍚嶇О")
private String viewName;
+
/***
* 鐩爣灞炴�у悕绉�
*/
@ApiModelProperty(value = "鐩爣灞炴�у悕绉�")
@TableField(value = "targetClsfName")
private String targetClassifyName;
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreMetaAttr.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreMetaAttr.java
index 4879628..cde2485 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreMetaAttr.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreMetaAttr.java
@@ -19,11 +19,13 @@
*/
@ApiModelProperty(value = "涓枃鍚嶇О")
private String chineseName;
+
/***
* 鑻辨枃鍚嶇О
*/
@ApiModelProperty(value = "闆嗗洟鍒嗙被涓婚敭")
private String englishName;
+
/***
* 灞炴�у瓧娈电被鍨�
*/
@@ -38,6 +40,7 @@
*/
@ApiModelProperty(value = "鍙栧�艰寖鍥�")
private String range;
+
/***
* 鐖跺睘鎬�
*/
@@ -50,12 +53,14 @@
@ApiModelProperty(value = "闆嗗洟鍒嗙被涓婚敭")
@TableField(value = "sourceClsfId")
private String sourceClassifyId;
+
/**
* 瑙嗗浘妯″瀷id
*/
@ApiModelProperty(value = "瑙嗗浘妯″瀷涓婚敭")
@TableField(value = "viewModeId")
private String viewModelId;
+
/***
* 榛樿鍊�
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index bc5298e..c456a78 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -41,8 +41,8 @@
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {
- @Value("${docking.apply.partCoe:10}")
- public String partCoe;
+ @Value("${docking.apply.partCode:10}")
+ public String partCode;
/**
* 闆嗗洟鐢宠鍗曟湇鍔�
@@ -318,8 +318,8 @@
try {
String jclassId =StringUtils.isBlank(jclassObject.getId())?"":jclassObject.getId();
Map<String, DockingPreViewModel> jviewmodelMap = new HashMap<String, DockingPreViewModel>();
- //Map<String, String> condtionMa = new HashMap<String, String>();
- // condtionMa.put("jsourceclsfid", jclassId);
+ // Map<String, String> condtionMa = new HashMap<String, String>();
+ // condtionMa.put("jsourceclsfid", jclassId);
List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,false));// 鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
for (DockingPreViewModel dockingPreViewModel : dockingPreViewModelList) {
jviewmodelMap.put(dockingPreViewModel.getViewName(),dockingPreViewModel);
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/mapper/DockingPreMetaAttrMapper.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/mapper/DockingPreMetaAttrMapper.java
index 44f70d3..0bc0e42 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/mapper/DockingPreMetaAttrMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/mapper/DockingPreMetaAttrMapper.java
@@ -3,5 +3,5 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreMetaAttr;
-public interface DockingPreMetaAttrMapper extends BaseMapper<DockingPreMetaAttr> {
+public interface DockingPreMetaAttrMapper extends BaseMapper<DockingPreMetaAttr> {
}
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IDockingPreMetaAttrService.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IDockingPreMetaAttrService.java
index fa19a31..5d74a3f 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IDockingPreMetaAttrService.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IDockingPreMetaAttrService.java
@@ -14,17 +14,18 @@
*/
public interface IDockingPreMetaAttrService extends IService<DockingPreMetaAttr> {
-
-
/***
* 鏋勯�犲櫒鏌ヨ鏂瑰紡
* @param wrapper 鏌ヨ灏佽鍣�
* @return
*/
-
public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper);
+
/***
* 鏍规嵁viewModel鏌ヨ妯″瀷瑙嗗浘灞炴��
+ * @param viewModelId
+ * @return
*/
List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId);
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 0711970..f864e8f 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -43,6 +43,7 @@
*/
@Autowired(required = false)
private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+
/***
* 涓绘暟鎹垎绫绘湇鍔�
*/
@@ -60,18 +61,17 @@
*/
@Autowired(required = false)
private IDockingPreMetaAttrService dockingPreMetaAttrService;
+
/***
* 灞炴�у彇鍊艰寖鍥存湇鍔�
*/
@Autowired(required = false)
private IDockingPreAttrRangeService dockingPreAttrRangeService;
-
/***
* 闆嗗洟鍒嗙被瑙嗗浘妯″瀷鏈嶅姟
*/
@Autowired(required = false)
-
private IDockingPreViewModelService dockingPreViewModelService;
/***
@@ -235,7 +235,6 @@
public R search(DokingAttributeSerchVO dokingAttributeSerchVO) {
return null;
}
-
/***
* 瀵硅薄杞崲
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreMetaAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreMetaAttrServiceImpl.java
index ed70788..0869e8f 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreMetaAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreMetaAttrServiceImpl.java
@@ -38,7 +38,7 @@
*/
@Override
public List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId) {
- log.info("鏍规嵁妯″瀷瑙嗗浘oid"+viewModelId+"鏌ヨ鏁版嵁 star");
+ log.info("鏍规嵁妯″瀷瑙嗗浘oid"+viewModelId+"鏌ヨ鏁版嵁 start");
List<DockingPreMetaAttr> dockingPreMetaAttrList= selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,viewModelId));
List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList= DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList);
log.info("鏍规嵁妯″瀷瑙嗗浘oid"+viewModelId+"鏌ヨ鏁版嵁 end");
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 102c534..11d6c37 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
@@ -19,6 +19,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.map.CaseInsensitiveMap;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
@@ -182,6 +183,7 @@
writeValueAsString = mp.writeValueAsString(dataObject);
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
+ throw new ServiceException("淇敼鐢宠鍗曟暟鎹椂杞崲鍑洪敊锛屽師鍥�"+e.getMessage());
}
Date date = new Date();
dockingPreApplyForm.setLastModifyTime(date);
@@ -202,6 +204,7 @@
writeValueAsString = mp.writeValueAsString(dataObject);
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
+ throw new ServiceException("鏂板鐢宠鍗曟暟鎹椂鏁版嵁杞崲鍑洪敊锛屽師鍥�"+e.getMessage());
}
Date date = new Date();
dockingPreApplyForm.setCreateTime(date);
@@ -402,12 +405,12 @@
}
});
} else {
+ Date date = new Date();
editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- Date date = new Date();
dockingPreApplyForm.setLastModifyTime(date);
dockingPreApplyForm.setTs(date);
dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
@@ -418,7 +421,6 @@
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- Date date = new Date();
dockingPreApplyForm.setCreateTime(date);
dockingPreApplyForm.setLastModifyTime(date);
dockingPreApplyForm.setTs(date);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index d32d2af..7d4cbcb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -85,7 +85,7 @@
@Service
@Slf4j
@VciWebservice(path = "/universalInterface")
-public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI {
+public class UniversalInterfaceImpl implements UniversalInterfaceI {
/***
* 鎿嶄綔绫诲瀷
--
Gitblit v1.9.3