From fb5a9f2aa4dab720ff32ac229ac68f98de532a2a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 15 四月 2024 18:32:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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/controller/DockingPreApplyCodeController.java | 1
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java | 121 ++++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 179 +++++----
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java | 1
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/MdmIOServiceImpl.java | 9
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 57 ++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java | 7
Source/UBCS-WEB/src/views/modeling/BusinessEdit.vue | 2
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 27
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/controller/DeployAppsController.java | 9
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 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-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java | 29 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 93 ++--
Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java | 2
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/MainData.java | 26 +
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 201 ++++++++---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java | 3
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 | 5
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingReturnStoreVO.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java | 159 ++++++++-
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IDockingPreMetaAttrService.java | 7
33 files changed, 647 insertions(+), 336 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 3289b7c..7cfaf5b 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -618,6 +618,8 @@
this.attrRef.queryNotIn += (item.id + ",")
});
this.attrRef.data = [];
+ this.$refs.attrRef.selectClear();
+ this.attrRef.selectData = [];
this.closeAttrDialog();
},
// 鍙栨秷灞炴�ф睜鍕鹃��
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessEdit.vue b/Source/UBCS-WEB/src/views/modeling/BusinessEdit.vue
index 1abbe6e..4508f71 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessEdit.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessEdit.vue
@@ -660,6 +660,8 @@
});
this.attrRef.queryNotIn += (item.id + ",")
});
+ this.$refs.attrRef.selectClear();
+ this.attrRef.selectData = [];
this.attrRef.data = [];
this.closeAttrDialog();
},
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-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 ed8224f..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,7 +1,5 @@
package com.vci.ubcs.code.applyjtcodeservice.feign;
-
-import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingClassifyModelAttrVO;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingReturnStoreVO;
@@ -63,7 +61,7 @@
* @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
*/
@PostMapping(RETURNGROUPCODE)
- public R getApplyGroupCode( @RequestBody DockingReturnStoreVO dockingResultVO);
+ public R getApplyGroupCode(@RequestBody DockingReturnStoreVO dockingResultVO);
/***
* 涓绘暟鎹ā鍨嬭鍥惧彂甯�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingReturnStoreVO.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingReturnStoreVO.java
index cf61965..88d283b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingReturnStoreVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingReturnStoreVO.java
@@ -8,10 +8,12 @@
* @date 2023-5-26
*/
public class DockingReturnStoreVO {
+
/**
* 鍒嗙被id
*/
private String classId;
+
/**
* 婧愮郴缁熷悕绉�
*/
@@ -45,6 +47,5 @@
public void setMainData(List<MainData> mainData) {
this.mainData = mainData;
}
-
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/MainData.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/MainData.java
index 668849f..9630ab2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/MainData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/MainData.java
@@ -4,43 +4,68 @@
public class MainData {
+
/**
* 鐢宠鍗曞彿
*/
private String applyId;
+
/**
* 鐢宠鍗曠姸鎬侊紙1 闆嗗洟瀹℃牳涓�,2闆嗗洟瀹℃牳涓�, 3 闆嗗洟瀹℃牳涓�,4 瀹℃牳缁撴潫锛岃祴鐮佸け璐�,5瀹℃牳缁撴潫锛岃祴鐮佹垚鍔� 6锛氬緟301璧嬬爜 7:宸茶祴鐮� 8锛氬凡璧嬬爜锛堟部鐢級9锛氬鏍镐腑锛�
*/
private String formState;
+
/**
* 涓绘暟鎹紪鐮�
*/
private String customCoding;
+
+ /**
+ * 瀹℃煡鎰忚
+ */
+ private String examineOpinion;
+
/**
* 鐢宠鍗曚腑缂栫爜瑙嗗浘淇℃伅
*/
private List<DockingViewVO> viewInfos;
+
public String getApplyId() {
return applyId;
}
+
public void setApplyId(String applyId) {
this.applyId = applyId;
}
+
public String getFormState() {
return formState;
}
+
public void setFormState(String formState) {
this.formState = formState;
}
+
public String getCustomCoding() {
return customCoding;
}
+
public void setCustomCoding(String customCoding) {
this.customCoding = customCoding;
}
+
+ public String getExamineOpinion() {
+ return examineOpinion;
+ }
+
+ public void setExamineOpinion(String examineOpinion) {
+ this.examineOpinion = examineOpinion;
+ }
+
public List<DockingViewVO> getViewInfos() {
return viewInfos;
}
+
public void setViewInfos(List<DockingViewVO> viewInfos) {
this.viewInfos = viewInfos;
}
@@ -54,4 +79,5 @@
", viewInfos=" + viewInfos +
'}';
}
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
index 9c47ad8..2b61960 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
@@ -5,116 +5,152 @@
/**
* 闅跺睘鍗曚綅浠ｇ爜
*/
- private String company_code;
+ private String company_code;
+
/**
* 闅跺睘鍗曚綅鍚嶇О/鎵�灞炲叕鍙�
*/
- private String company_name;
+ private String company_name;
+
/**
* 閮ㄩ棬缂栫爜
*/
private String department_code;
+
/**
* 閮ㄩ棬鍚嶇О
*/
private String department_name;
+
/**
* 閮ㄩ棬绫诲瀷 1=鏅�氶儴闂紝2=鍐崇瓥閮ㄩ棬
*/
private String department_type;
+
/**
* 涓婄骇閮ㄩ棬缂栫爜 鎵�灞嬩笂绾ч儴闂紝寮曠敤閮ㄩ棬涓绘暟鎹紝闆嗗洟鍛藉悕鈥滀笂绾ч儴闂ㄤ唬鐮�
*/
- private String parent_department_code;
+ private String parent_department_code;
+
/**
* 涓婄骇閮ㄩ棬鍚嶇О
*/
- private String parent_department_name;
+ private String parent_department_name;
+
/**
* 閮ㄩ棬璐熻矗浜�
*/
- private String department_head;
+ private String department_head;
+
/***
* 璐熻矗浜虹紪鐮�
*/
private String department_head_code;
+
/***
* 鐢佃瘽
*/
private String telephone_number;
+
/***
* 鎺掑簭鍙�
*/
- private String sort_order;
+ private String sort_order;
+
/**
*鍚敤鐘舵�� 1=鏈惎鐢紝2=宸插惎鐢紝3e宸插仠鐢�
*/
- private int enable_datus;
+ private int enable_status;
+
/**
* 閮ㄩ棬灞傜骇
*/
private String department_level;
+
/***
* 鏄铏氭嫙閮ㄩ棬
*/
private String is_virtual;
+
/***
* 閮ㄩ棬鐘舵��,鏈夋晥銆佷綔搴�
*/
- private String department_status;
+ private String department_status;
+
/***
* 閮ㄩ棬鏄剧ず鐘舵��,鏄剧ず銆佷笉鏄剧ず
*/
- private String diplay_status;
+ private String display_status;
+
/***
* 閮ㄩ棬ID璺緞
*/
private String id_route;
+
/***
*閮ㄩ棬鍚嶇О璺緞
*/
private String name_route;
+
/***
*鑺傜偣绫诲瀷,褰撳墠鏂板姞鑺傜偣鐨勭被鍒紝閮ㄩ棬锛屼紒涓�(娉曚汉鍗曚綅)锛岄粯璁�
*/
private String node_type;
+
/***
* 閮ㄩ棬鍘熺紪鐮�,璁板綍璇ラ儴闂ㄧ殑鍘熸湁缂栫爜锛屼綔涓烘崲鍙锋椂鐨勫瑙�
*/
- private String onginal_code;
+ private String original_code;
+
/**
* 鍒涘缓鑰�
*/
private String creator;
+
/***
* 鍒涘缓鏃堕棿
*/
private String createtime;
+
/***
* 淇敼鑰�
*/
private String modifier;
+
/**
* 淇敼鏃堕棿
*/
private String modifytime;
+
private String mdm_parentcode;
+
private int mdm_workflow_status;
+
private String mdm_datastatus;
+
private String mdm_cleanstatus;
+
private String link_fieldvalue;
- private String floy_middatastatus;
- private String originalcode;
+
+ private String flow_middatastatus;
+
private String pk_mdm;
+
private String mdm_duplicate;
+
private String mdm_code;
+
private String mdm_version;
- private String original_nane;
+
+ private String original_name;
+
private String ts;
+
/***
*0:姝ｅ父锛�1鏁版嵁琚垹闄わ紝榛樿涓�0;
*/
private int dr;
+
private String dr_ndm_code;
public String getCompany_code() {
@@ -205,12 +241,12 @@
this.sort_order = sort_order;
}
- public int getEnable_datus() {
- return enable_datus;
+ public int getEnable_status() {
+ return enable_status;
}
- public void setEnable_datus(int enable_datus) {
- this.enable_datus = enable_datus;
+ public void setEnable_status(int enable_status) {
+ this.enable_status = enable_status;
}
public String getDepartment_level() {
@@ -237,12 +273,12 @@
this.department_status = department_status;
}
- public String getDiplay_status() {
- return diplay_status;
+ public String getDisplay_status() {
+ return display_status;
}
- public void setDiplay_status(String diplay_status) {
- this.diplay_status = diplay_status;
+ public void setDisplay_status(String display_status) {
+ this.display_status = display_status;
}
public String getId_route() {
@@ -269,12 +305,12 @@
this.node_type = node_type;
}
- public String getOnginal_code() {
- return onginal_code;
+ public String getOriginal_code() {
+ return original_code;
}
- public void setOnginal_code(String onginal_code) {
- this.onginal_code = onginal_code;
+ public void setOriginal_code(String original_code) {
+ this.original_code = original_code;
}
public String getCreator() {
@@ -349,20 +385,12 @@
this.link_fieldvalue = link_fieldvalue;
}
- public String getFloy_middatastatus() {
- return floy_middatastatus;
+ public String getFlow_middatastatus() {
+ return flow_middatastatus;
}
- public void setFloy_middatastatus(String floy_middatastatus) {
- this.floy_middatastatus = floy_middatastatus;
- }
-
- public String getOriginalcode() {
- return originalcode;
- }
-
- public void setOriginalcode(String originalcode) {
- this.originalcode = originalcode;
+ public void setFlow_middatastatus(String flow_middatastatus) {
+ this.flow_middatastatus = flow_middatastatus;
}
public String getPk_mdm() {
@@ -397,12 +425,12 @@
this.mdm_version = mdm_version;
}
- public String getOriginal_nane() {
- return original_nane;
+ public String getOriginal_name() {
+ return original_name;
}
- public void setOriginal_nane(String original_nane) {
- this.original_nane = original_nane;
+ public void setOriginal_name(String original_name) {
+ this.original_name = original_name;
}
public String getTs() {
@@ -443,15 +471,14 @@
", department_head_code='" + department_head_code + '\'' +
", telephone_number='" + telephone_number + '\'' +
", sort_order='" + sort_order + '\'' +
- ", enable_datus=" + enable_datus +
+ ", enable_status=" + enable_status +
", department_level='" + department_level + '\'' +
", is_virtual='" + is_virtual + '\'' +
", department_status='" + department_status + '\'' +
- ", diplay_status='" + diplay_status + '\'' +
+ ", display_status='" + display_status + '\'' +
", id_route='" + id_route + '\'' +
", name_route='" + name_route + '\'' +
", node_type='" + node_type + '\'' +
- ", onginal_code='" + onginal_code + '\'' +
", creator='" + creator + '\'' +
", createtime='" + createtime + '\'' +
", modifier='" + modifier + '\'' +
@@ -461,13 +488,13 @@
", mdm_datastatus='" + mdm_datastatus + '\'' +
", mdm_cleanstatus='" + mdm_cleanstatus + '\'' +
", link_fieldvalue='" + link_fieldvalue + '\'' +
- ", floy_middatastatus='" + floy_middatastatus + '\'' +
- ", originalcode='" + originalcode + '\'' +
+ ", flow_middatastatus='" + flow_middatastatus + '\'' +
+ ", original_code='" + original_code + '\'' +
", pk_mdm='" + pk_mdm + '\'' +
", mdm_duplicate='" + mdm_duplicate + '\'' +
", mdm_code='" + mdm_code + '\'' +
", mdm_version='" + mdm_version + '\'' +
- ", original_nane='" + original_nane + '\'' +
+ ", original_name='" + original_name + '\'' +
", ts='" + ts + '\'' +
", dr=" + dr +
", dr_ndm_code='" + dr_ndm_code + '\'' +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java
index 5223442..692423b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java
@@ -2,8 +2,6 @@
import lombok.Data;
-import java.util.List;
-
/**
* @author ludc
* @date 2024/3/20 16:39
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
index 7c200d0..16381da 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonMasterData.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.vo.webserviceModel.person;
public class PersonMasterData {
+
/***
* 鏁版嵁鍦ㄦ绯荤粺涓敮涓�鏍囪瘑
*/
@@ -15,51 +16,62 @@
* 闆嗗洟鍛樺伐缂栧彿
*/
private String group_code;
+
/***
* 鍛樺伐濮撳悕
*/
private String name;
+
/**
* 涓绘暟鎹紪鐮�
*/
private String mdm_code;
+
/***
*0:姝ｅ父锛�1鏁版嵁琚垹闄わ紝榛樿涓�0;
*/
private int dr;
+
/***
* 琛屾斂鍖哄煙鍖�
*/
private String admin_division;
+
/***
* 琛屾斂鍖哄煙鍖栧彿鐮�
*/
private String admin_division_code;
+
/**
* 鍑虹敓鏃ユ湡(yyyy-MM-dd)
*/
private String birthday;
+
/**
* 鍑虹敓鍦�
*/
private String birthplace;
+
/***
* 绫嶈疮
*/
- private String cittizenship;
+ private String citizenship;
/**
* 鍥藉/鍦板尯
*/
private String country;
+
/***
* 閮ㄩ棬
*/
private String dept_type;
+
/***
* 閮ㄩ棬鍚嶇О
*/
- private String deptName;
+ private String dept_name;
+
/***
* 瀛﹀巻
*/
@@ -69,37 +81,42 @@
* 浠昏亴鍗曚綅缂栫爜
*/
private String employer_code;
+
/***
* 鐢ㄥ伐褰㈠紡
*/
private String employment_form;
-
/**
* 韬唤璇佺紪鍙�
*/
private String id_number;
+
/***
* 璇佷欢绫诲瀷
*/
private String id_type;
+
/***
* 鏄惁涓昏亴
*/
private String is_keyposion;
+
/**
* 濠氬Щ鐘跺喌
*/
private String marital_status;
+
/**
* 鎵嬫満鍙风爜
*/
private String mobile_phone;
/***
- * 鍚嶆棌
+ * 姘戞棌
*/
private String nationality;
+
/**
* 鍔炲叕鐢佃瘽
*/
@@ -114,6 +131,7 @@
*涓婄骇闂ㄧ紪鐮�
*/
private String parent_dept_code;
+
/***
*涓婄骇闂ㄥ悕绉�
*/
@@ -123,6 +141,7 @@
*鏀挎不闈㈣矊
*/
private String politiccountenance;
+
/***
* 宀椾綅
*/
@@ -132,10 +151,16 @@
* 鑱岀О
*/
private String work_title;
+
/***
* 浜哄憳绫诲埆
*/
private String worker_category;
+
+ /**
+ * 浜哄憳绫诲埆缂栫爜
+ */
+ private String worker_category_code;
/***
* 鑱屽姟
@@ -153,6 +178,31 @@
private String worker_level;
/***
+ * 鑱岀骇缂栫爜
+ */
+ private String worker_level_code;
+
+ /**
+ * 鍥藉瘑绛夌骇缂栫爜
+ */
+ private String country_level_code;
+
+ /**
+ * 鍥藉瘑绛夌骇鍚嶇О
+ */
+ private String country_level_name;
+
+ /**
+ * 鍟嗗瘑绛夌骇缂栫爜
+ */
+ private String business_level_code;
+
+ /**
+ * 鍟嗗瘑绛夌骇鍚嶇О
+ */
+ private String business_level_name;
+
+ /***
* 浜哄憳瀵嗙骇
*/
private String worker_security_level;
@@ -161,44 +211,62 @@
* 娴佺▼鐘舵��
*/
private int mdm_workflow;
+
/***
* 淇敼鑰�
*/
private String modifier;
+
/***
* 淇敼鏃堕棿
*/
private String modifytime;
+
/***
* 鍒涘缓鑰�
*/
private String creator;
+
/***
* 鍒涘缓鏃堕棿
*/
private String createtime;
-
/**
* 鏁版嵁鐘舵��
*/
private int mdm_datastatus;
+
private String link_fieldvalue;
+
private String flow_middatastatus;
+
private String employer;
+
private int mdm_duplicate;
+
private EnumerableData gender_entity;
+
private EnumerableData employment_type_entity;
- private String gerder;
+
+ private String gender;
+
private String employment_type;
+
private String employment_type_nane;
+
private String mdm_cleanstatus;
+
private String mdm_parentcode;
+
private String mdm_yersion;
+
private String dr_mdm_code;
+
private String pk_mdm;
private String gender_name;
+
private String ts;
public String getId() {
@@ -281,12 +349,36 @@
this.birthplace = birthplace;
}
- public String getCittizenship() {
- return cittizenship;
+ public String getCitizenship() {
+ return citizenship;
}
- public void setCittizenship(String cittizenship) {
- this.cittizenship = cittizenship;
+ public void setCitizenship(String citizenship) {
+ this.citizenship = citizenship;
+ }
+
+ public String getWorker_category_code() {
+ return worker_category_code;
+ }
+
+ public String getWorker_level_code() {
+ return worker_level_code;
+ }
+
+ public String getCountry_level_code() {
+ return country_level_code;
+ }
+
+ public String getCountry_level_name() {
+ return country_level_name;
+ }
+
+ public String getBusiness_level_code() {
+ return business_level_code;
+ }
+
+ public String getBusiness_level_name() {
+ return business_level_name;
}
public String getCountry() {
@@ -297,6 +389,30 @@
this.country = country;
}
+ public void setWorker_category_code(String worker_category_code) {
+ this.worker_category_code = worker_category_code;
+ }
+
+ public void setWorker_level_code(String worker_level_code) {
+ this.worker_level_code = worker_level_code;
+ }
+
+ public void setCountry_level_code(String country_level_code) {
+ this.country_level_code = country_level_code;
+ }
+
+ public void setCountry_level_name(String country_level_name) {
+ this.country_level_name = country_level_name;
+ }
+
+ public void setBusiness_level_code(String business_level_code) {
+ this.business_level_code = business_level_code;
+ }
+
+ public void setBusiness_level_name(String business_level_name) {
+ this.business_level_name = business_level_name;
+ }
+
public String getDept_type() {
return dept_type;
}
@@ -305,12 +421,12 @@
this.dept_type = dept_type;
}
- public String getDeptName() {
- return deptName;
+ public String getDept_name() {
+ return dept_name;
}
- public void setDeptName(String deptName) {
- this.deptName = deptName;
+ public void setDept_name(String dept_name) {
+ this.dept_name = dept_name;
}
public String getEducation() {
@@ -577,12 +693,12 @@
this.employment_type_entity = employment_type_entity;
}
- public String getGerder() {
- return gerder;
+ public String getGender() {
+ return gender;
}
- public void setGerder(String gerder) {
- this.gerder = gerder;
+ public void setGender(String gender) {
+ this.gender = gender;
}
public String getEmployment_type() {
@@ -670,10 +786,10 @@
", admin_division_code='" + admin_division_code + '\'' +
", birthday='" + birthday + '\'' +
", birthplace='" + birthplace + '\'' +
- ", cittizenship='" + cittizenship + '\'' +
+ ", citizenship='" + citizenship + '\'' +
", country='" + country + '\'' +
", dept_type='" + dept_type + '\'' +
- ", deptName='" + deptName + '\'' +
+ ", dept_name='" + dept_name + '\'' +
", education='" + education + '\'' +
", employer_code='" + employer_code + '\'' +
", employment_form='" + employment_form + '\'' +
@@ -707,7 +823,7 @@
", mdm_duplicate=" + mdm_duplicate +
", gender_entity=" + gender_entity +
", employment_type_entity=" + employment_type_entity +
- ", gerder='" + gerder + '\'' +
+ ", gender='" + gender + '\'' +
", employment_type='" + employment_type + '\'' +
", employment_type_nane='" + employment_type_nane + '\'' +
", mdm_cleanstatus='" + mdm_cleanstatus + '\'' +
@@ -719,4 +835,5 @@
", ts='" + ts + '\'' +
'}';
}
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index c7adc5e..4e4877b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -118,8 +118,9 @@
public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
BaseModel baseModel = object;
try {
- baseModel.setLastModifyTime(new Date());
- baseModel.setTs(new Date());
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
// 鐢ㄦ埛id
// String userId = AuthUtil.getUserId().toString();
// 瑕佹眰鏀规垚璐﹀彿
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index 734f872..7650067 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -1,6 +1,5 @@
package com.vci.ubcs.code.applyjtcodeservice.controller;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
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 344f981..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
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.applyjtcodeservice.feigh;
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.toolkit.Wrappers;
@@ -12,12 +13,14 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.starter.util.SaveLogUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -38,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;
/**
* 闆嗗洟鐢宠鍗曟湇鍔�
@@ -78,6 +81,8 @@
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
+
+ private final SaveLogUtil saveLogUtil;
/***
* 鐢宠闆嗗洟缂栫爜
@@ -119,9 +124,6 @@
}
}
- /*
- * 涓绘暟鎹笟鍔℃湇鍔�
- */
/**
* 鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹�
* @param dockingReturnStoreVO
@@ -133,7 +135,6 @@
log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� start");
try {
Map<String,List<BaseModel>> editObjectMap = new HashMap<>();
-
List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
//String classId = javaObject.getClassId();
//String sysName = javaObject.getSysName();
@@ -170,6 +171,8 @@
} else if ("9".equals(formState)) {
msg = "瀹℃牳涓�";
}
+ // 濡傛灉杩斿洖浜嗗鏌ユ剰瑙佸氨鐢ㄨ繑鍥炵殑
+ msg = Func.isNotBlank(mainData.getExamineOpinion()) ? msg+"锛屾剰瑙侊細"+mainData.getExamineOpinion():msg;
jcontent.put("applyId", applyId);
jcontent.put("formState", formState);
jcontent.put("customCoding", customCoding);
@@ -182,6 +185,7 @@
DockingPreApplyForm dockingPreApplyForm = oldDockingPreApplyFormList.get(0);
dockingPreApplyForm.setMsg(msg);
dockingPreApplyForm.setCode("1");
+ dockingPreApplyForm.setLastModifyTime(new Date());
if (res) {
dockingPreApplyForm.setGroupCode(customCoding);
}
@@ -220,9 +224,11 @@
if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
}
+ saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",false, JSON.toJSONString(dockingReturnStoreVO.getMainData()));
}catch (Throwable e){
e.printStackTrace();
- return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
+ saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",true,"閿欒淇℃伅锛�"+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));
+ return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
}
log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� end");
return R.success("闆嗗洟鐮佽祴鍊兼垚鍔�");
@@ -307,14 +313,13 @@
* @param jclassObject
* @throws Throwable
*/
- private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
- throws Throwable {
+ private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list) throws Throwable {
String nodeLinkName = jclassObject.getNodeLinkName();
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 c22e677..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
@@ -6,14 +6,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.feign.IMdmEngineClient;
import com.vci.ubcs.code.applyjtcodeservice.entity.*;
-import com.vci.ubcs.code.applyjtcodeservice.service.IGroupMdmInterService;
import com.vci.ubcs.code.applyjtcodeservice.vo.*;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.webserviceModel.apply.ApplyDataVO;
-import com.vci.ubcs.code.vo.webserviceModel.apply.InterParameterVO;
-import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.code.applyjtcodeservice.feign.MdmApplyGroupCodeProvider;
import com.vci.ubcs.code.applyjtcodeservice.mapper.DockingPreAttrMappingMapper;
@@ -23,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;
@@ -50,7 +47,7 @@
private String msg="";
@Value("${docking.apply.partCode:101}")
- public String partCoe;
+ public String partCode;
@Value("${docking.apply.usedFlag:false}")
public boolean usedFlag;
@@ -61,6 +58,9 @@
@Value("${docking.apply.sysName:410-MDM}")
public String dockingApplySysName;
+ @Value("${docking.apply.personUserAccount:28201728}")
+ public String applyCodeUserAccount;
+
@Autowired(required = false)
private MdmApplyGroupCodeProvider mdmApplyGroupCodeProvider;
@@ -68,36 +68,37 @@
* 闆嗗洟鍒嗙被鏈嶅姟
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreClassifyService dockingPreClassifyService;
+ private IDockingPreClassifyService dockingPreClassifyService;
/***
* 鐢宠鍗曟湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreApplyFormService dockingPreApplyFormService;
+ private IDockingPreApplyFormService dockingPreApplyFormService;
/***
* 妯″瀷瑙嗗浘鍗曟湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreViewModelService dockingPreViewModelService;
+ private IDockingPreViewModelService dockingPreViewModelService;
/***
* 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
*/
@Autowired(required = false)
private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+
/***
* 灞炴�у彇鍊艰寖鍥存湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;
+ private IDockingPreAttrRangeService dockingPreAttrRangeService;
/***
* 闆嗗洟灞炴�ф湇鍔�
*/
@Autowired(required = false)
- private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreMetaAttrService dockingPreMetaAttrService;
+ private IDockingPreMetaAttrService dockingPreMetaAttrService;
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
@@ -109,8 +110,8 @@
* @return 杩斿洖缁撴灉淇℃伅
* @throws Exception
*/
- @Transactional(rollbackFor = VciBaseException.class)
@Override
+ @Transactional(rollbackFor = Exception.class)
public R applyGroupCode(String oids, String btmName) throws VciBaseException {
if(usedFlag) {
try {
@@ -141,10 +142,12 @@
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(resultDataObject.getCode())) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+ if("1".equals(code)) {
+ //缁撴灉姝ｇ‘鐨勬儏鍐�
List<DockingDataVO> dataObjectVOList = resultDataObject.getData();
res=true;
dataObjectVOList.stream().forEach(dataObject -> {
@@ -153,7 +156,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")) {//缁撴灉姝ｇ‘鐨勬儏鍐�
if (!"".equals(customCoding)) {
@@ -164,7 +167,7 @@
if (editDockingPreApplyFormMap.containsKey(applyId)) {
DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
dockingPreApplyForm.setCode(code2);
- //dockingPreApplyForm.setDescription(baseModel.getId());
+ dockingPreApplyForm.setDescription(baseModel.getId());
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
if(StringUtils.isBlank(dockingPreApplyForm.getGroupCode())) {
dockingPreApplyForm.setGroupCode(customCoding);
@@ -180,8 +183,13 @@
writeValueAsString = mp.writeValueAsString(dataObject);
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
+ throw new ServiceException("淇敼鐢宠鍗曟暟鎹椂杞崲鍑洪敊锛屽師鍥�"+e.getMessage());
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ Date date = new Date();
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
}
//鏂板鐨勭敵璇峰崟鏁版嵁
if (addDockingPreApplyFormMap.containsKey(applyId)) {
@@ -196,22 +204,33 @@
writeValueAsString = mp.writeValueAsString(dataObject);
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
+ throw new ServiceException("鏂板鐢宠鍗曟暟鎹椂鏁版嵁杞崲鍑洪敊锛屽師鍥�"+e.getMessage());
}
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ Date date = new Date();
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(date);
+ 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(partCoe.equals(classOid)){
+ if(partCode.equals(classOid)){
baseModel.setId(10+customCoding);
customCoding=10+customCoding;
}*/
BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
- // DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
+ baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
baseModel.getData().put("GROUPCODE",customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
}
@@ -219,19 +238,32 @@
});
} else {
res=false;
+ Date date = new Date();
editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(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) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(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.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -249,7 +281,7 @@
}
return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
} catch (VciBaseException e) {
- return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触" + e);
+ return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触" + e.getMessage());
}
}else{
return R.fail("鐢宠鎺ュ彛寮�鍏冲凡鍏抽棴锛屼笉鐢宠闆嗗洟鐮�");
@@ -263,8 +295,8 @@
* @return 杩斿洖缁撴灉淇℃伅
* @throws Throwable
*/
- @Transactional(rollbackFor = VciBaseException.class)
@Override
+ @Transactional(rollbackFor = Exception.class)
public R receiveEditApply(String oids, String btmName) throws VciBaseException {
if(!usedFlag) {
log.info("鏇存柊鎺ュ彛鍔熻兘宸插叧闂紒->"+usedFlag);
@@ -322,7 +354,11 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ Date date = new Date();
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
}
//鏂板鐨勭敵璇峰崟鏁版嵁
if (addDockingPreApplyFormMap.containsKey(applyId)) {
@@ -339,7 +375,14 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ Date date = new Date();
+ dockingPreApplyForm.setCreateTime(date);
+ dockingPreApplyForm.setLastModifyTime(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);
}
//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
if (isEditDatas) {
@@ -347,30 +390,44 @@
BaseModel baseModel = baseModelMap.get(applyId);
//BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
/*String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
- if(partCoe.equals(classOid)){
+ if(partCode.equals(classOid)){
baseModel.setId(10+customCoding);
}*/
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
- // baseModel.setId(customCoding);
+ Date date = new Date();
+ baseModel.setLastModifyTime(date);
+ baseModel.setTs(date);
+ baseModel.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ //baseModel.setId(customCoding);
baseModel.getData().put("GROUPCODE", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
}
}
});
} else {
+ Date date = new Date();
editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ dockingPreApplyForm.setLastModifyTime(date);
+ dockingPreApplyForm.setTs(date);
+ dockingPreApplyForm.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ 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());
+ //DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -503,7 +560,7 @@
dockingPreClassify.setVersionValue(version);
dockingPreClassifyList.add(dockingPreClassify);
});
- boolean res= dockingPreClassifyService.saveOrUpdateBatch(dockingPreClassifyList);
+ boolean res = dockingPreClassifyService.saveOrUpdateBatch(dockingPreClassifyList);
if(res){
R.success(message);
}else{
@@ -558,6 +615,11 @@
dockingModelQueryVO.setSysName(dockingApplySysName);
DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO = mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
+ if(Func.isEmpty(dockingApplyFormQueryStatusVO)){
+ log.error("鑾峰彇鐢宠鍗曚负绌猴紒");
+ return R.fail("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭紒");
+ }
+
int code=dockingApplyFormQueryStatusVO.getCode();
String mesg=dockingApplyFormQueryStatusVO.getMsg();
if(code==1){
@@ -591,7 +653,7 @@
e.printStackTrace();
//message=""+e;
log.error("鑾峰彇鐢宠鍗曠姸鎬佸け璐�"+e);
- throw new VciBaseException(e.getMessage());
+ throw new VciBaseException(e.getMessage());
}
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd");
return R.success(message);
@@ -613,7 +675,7 @@
VciBaseUtil.alertNotNull(operationType,"闆嗘垚鎿嶄綔绫诲瀷");
try {
if(operationType.equals("all")){
- return queryMdmModel();
+ return queryMdmModel();
}else{
VciBaseUtil.alertNotNull(classifyId,"闆嗗洟鍒嗙被涓婚敭");
return queryClassModel(classifyId);
@@ -861,10 +923,18 @@
/**
* 缁勭粐鏁版嵁
- * */
- private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModel> codeWupinMap) throws VciBaseException{
+ * @param optationtype
+ * @param codeWupins
+ * @param addDockingPreApplyFormMap
+ * @param editDockingPreApplyFormMap
+ * @param codeWupinMap
+ * @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{
try {
- String curUserName =AuthUtil.getUser().getUserName();
+ // TODO锛氫富鏁版嵁鎺ㄩ�佽繃鏉ョ殑鏁版嵁鏄嬁涓嶅埌鍙互鐢宠闆嗗洟鐮佺殑鐢ㄦ埛淇℃伅鐨勶紝骞朵笖杩欎竴鍧楀効鐨勯�昏緫涔熻繕娌℃暡瀹氾紝鎵�浠ヨ繖鍎块噰鐢ㄩ厤缃殑鐢ㄦ埛鏉ョ敵璇烽泦鍥㈢爜
+ String curUserName = Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount();
//鐢宠鐨勬暟鎹�
List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
for (BaseModel dataBusinessObject : codeWupins) {
@@ -876,29 +946,30 @@
String oid = dataBusinessObject.getOid();
DockingPreApplyForm dockingPreApplyForm = new DockingPreApplyForm();
- String dataOid = dataBusinessObject.getOid();
- Map<String, String> conditionsMap = new HashMap<String, String>();
- //List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, optationtype));
- // DockingPreApplyForm dockingPreApplyForm=new DockingPreApplyForm();
- String apllyCode = "";
+ // String dataOid = dataBusinessObject.getOid();
+ // Map<String, String> conditionsMap = new HashMap<String, String>();
+ // List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, optationtype));
+ // DockingPreApplyForm dockingPreApplyForm=new DockingPreApplyForm();
+ String applyCode = "";
/*if (!CollectionUtils.isEmpty(applyFormObjects)) {
dockingPreApplyForm = applyFormObjects.get(0);
- apllyCode = dockingPreApplyForm.getId();
- editDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ applyCode = dockingPreApplyForm.getId();
+ editDockingPreApplyFormMap.put(applyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
} else {*/
- apllyCode = dockingApplyUnitCode + "-" + format;
- dockingPreApplyForm.setId(apllyCode);
+ applyCode = dockingApplyUnitCode + "-" + format;
+ dockingPreApplyForm.setId(applyCode);
dockingPreApplyForm.setName("");
dockingPreApplyForm.setOperationType(optationtype+"");
dockingPreApplyForm.setDescription(dataBusinessObject.getId());//鑾峰彇鏁版嵁鎻忚堪淇℃伅
dockingPreApplyForm.setDataOid(oid);
dockingPreApplyForm.setDataBtmName(btmName);
- addDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
- // }
+ addDockingPreApplyFormMap.put(applyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ // }
- codeWupinMap.put(apllyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
- conditionsMap = new HashMap<String, String>();
- conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
+ //鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+ codeWupinMap.put(applyCode, dataBusinessObject);
+ // conditionsMap = new HashMap<String, String>();
+ // conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
List<DockingPreAttrMapping> dockingPreAttrMappingList = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, codeclsfid));
if (CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
@@ -909,7 +980,7 @@
DockingPreClassify dockingPreClassify = dockingPreClassifyService.getById(jsourceclsfid);
DockingMainData mainData = new DockingMainData();
mainData.setApplyEntId(dockingApplyUnitCode);//鐢宠鍗曚綅浠ｇ爜
- mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
+ mainData.setApplyId(applyCode);//鐢宠鍗曞彿
mainData.setClassName(dockingPreClassify.getNodeLinkName());//鍒嗙被鍚嶇О
mainData.setCreateBy(curUserName);//
if(optationtype==2) {
@@ -917,18 +988,21 @@
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) {
// TODO Auto-generated catch block
- throw new VciBaseException("鏌ヨ鏁版嵁鍑洪敊"+e);
+ throw new VciBaseException("鏌ヨ鏁版嵁鍑洪敊锛屽師鍥狅細"+e.getMessage());
}
}
@@ -993,7 +1067,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)){
@@ -1012,7 +1086,7 @@
}else{
newVaue = getVaue(dockingPreMetaAttr, "");
}
- if(newVaue==null||"".equals(newVaue)){
+ if(newVaue==null || "".equals(newVaue)){
newVaue= dockingPreMetaAttr.getDefaultValue();
}
//newVaue= Func.isNotEmpty(newVaue)?newVaue:"";
@@ -1035,14 +1109,15 @@
if(attrRangeMap.containsKey(jmetalistoid)) {
return;
}
- Map<String,String>conditionsMap=new HashMap<String, String>();
- conditionsMap.put("jmetalistid", jmetalistoid);//瑙嗗浘oid
+ // Map<String,String>conditionsMap=new HashMap<String, String>();
+ // conditionsMap.put("jmetalistid", jmetalistoid);//瑙嗗浘oid
List<DockingPreAttrRange> dockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, jmetalistoid));
if (CollectionUtils.isEmpty(dockingPreAttrRangeList)) {
return;
}
Map<String, DockingPreAttrRange> rangeMap = new HashMap<String, DockingPreAttrRange>();
- rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getNumTextValue(), t -> t, (o1, o2) -> o2));
+ // TODO: 杩欏効瀛樺唴閮ㄥ瓨鍌ㄥ�硷紝鏃犳硶鍦ㄥ悗缁繘琛岃浆鎹�
+ rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getTargetNumText(), t -> t, (o1, o2) -> o2));
attrRangeMap.put(jmetalistoid, rangeMap);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
index 315f97a..c7efaee 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
@@ -23,7 +23,7 @@
@Slf4j
public class DockingDataSyncScheduling {
-// private Logger logger = LoggerFactory.getLogger(getClass());
+ // private Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private ICodeDuckingSyncService codeDuckingSyncServiceI;
@@ -44,7 +44,9 @@
FINISH_INIT = "true";
}
- //榛樿姣忓垎閽熸墽琛屾柟娉�
+ /**
+ * 榛樿姣忓垎閽熸墽琛屾柟娉�
+ */
@Scheduled(cron = "${dataSyncPush.cronTime:0 0/10 * * * ?}")
public void scheduled() {
log.info("鎵ц涓绘暟鎹泦鎴愭暟鎹帹閫� start:");
@@ -57,4 +59,5 @@
}
log.info("鎵ц涓绘暟鎹泦鎴愭暟鎹帹閫� end: "+ "寮�鍏虫槸鍚﹀紑鍚�:" +DATA_SYNC_PUSH_ISSTARE);
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
index 23fc0bb..45fbdb6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
@@ -1,7 +1,6 @@
package com.vci.ubcs.code.controller;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import com.vci.ubcs.code.service.UniversalInterfaceI;
import com.vci.ubcs.code.vo.webserviceModel.person.*;
import org.slf4j.Logger;
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 540cb51..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 {
@@ -358,7 +355,7 @@
* @param baseModelDTO 鏁版嵁浼犺緭瀵硅薄
* @return 鎵ц缁撴灉
*/
- @PostMapping("changeStatus")
+ @PostMapping("/changeStatus")
public R changeStatus(@RequestBody BaseModelDTO baseModelDTO) {
engineService.changeStatus(baseModelDTO);
return R.success("鎿嶄綔鎴愬姛锛�");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java
index 2f22a7a..4129fb2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CommonsMapper.java
@@ -68,6 +68,6 @@
Map<String,Object> getCurrentRevision(@Param("tableName")String tableName,@Param("nameoid") String nameoid);
-// Integer updateByTaleAndOid(@Param("tableName")String tableName, @Param("nameoid") String nameoid, @Param("lcStatus") String lcStatus);
+ // Integer updateByTaleAndOid(@Param("tableName")String tableName, @Param("nameoid") String nameoid, @Param("lcStatus") String lcStatus);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java
index fc2d124..3e09485 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java
@@ -2,12 +2,9 @@
import com.vci.ubcs.code.vo.webserviceModel.person.OrgData;
import com.vci.ubcs.code.vo.webserviceModel.person.PersonData;
import com.vci.ubcs.code.vo.webserviceModel.person.ResultOrgData;
-import org.springframework.web.bind.annotation.RequestParam;
import javax.jws.WebService;
-import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
/**
* 缁熶竴鎺ュ彛
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 f7ee151..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;
@@ -51,7 +52,6 @@
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.xkcoding.http.support.Http;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.springblade.core.redis.cache.BladeRedis;
@@ -66,7 +66,6 @@
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;
@@ -81,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;
@@ -123,7 +123,6 @@
@Value("${erp.item.tenant:10000}")
private String ERPXHDHTENANT;
-
/**
* 涓氬姟绫诲瀷鐨勬湇鍔�
@@ -185,8 +184,8 @@
@Autowired(required = false)
private MdmSearchItemCodeProvider mdmSearchItemCodeProvider;
- @Autowired
- HttpServletRequest request;
+ @Resource
+ private ICodeAllCodeService codeAllCodeService;
@Override
public void DockingDataSyncScheduing() {
@@ -283,7 +282,6 @@
}
org.springblade.core.tool.utils.WebUtil.setRequest(new ServletRequestAttributes(request));
}
-
return request;
}
@@ -311,20 +309,24 @@
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 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",paramString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
+ 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);
@@ -948,7 +950,7 @@
/***
* 鍙戦�佺紪鐮佷富鏁版嵁
*/
- private void sendpushDataForService (List<DockingTask> dockingTaskS){
+ private void sendpushDataForService(List<DockingTask> dockingTaskS){
//姣忎釜task渚濇鎵ц鎺ㄩ��
for (DockingTask dockingTask:dockingTaskS){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
@@ -969,9 +971,28 @@
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);
}
@@ -1001,8 +1022,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);
@@ -1204,7 +1227,7 @@
/***
* 鏌ヨ闇�瑕侀泦鎴愮殑涓氬姟鏁版嵁浠诲姟
*/
- private void sendpushDataForService (){
+ private void sendpushDataForService(){
initSysadmin();
//鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
//VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
@@ -1224,7 +1247,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));
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 6e1dacc..614bb51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -147,6 +147,7 @@
*/
@Value("${bzApply.seriesFlow:seriesFlow}")
private String seriesFlow;
+
/***
* 鏄惁鍙樻洿绯诲垪
*/
@@ -316,6 +317,12 @@
public static final String BTM_NAME = "btm:name";
/**
+ * 閰嶇疆鐨勭敤鏉ョ敵璇烽泦鍥㈢爜鐨勭敤鎴�
+ */
+ @Value("${docking.apply.personUserAccount:28201728}")
+ public String applyCodeUserAccount;
+
+ /**
* 瀵嗙骇鐨勫瓧娈�
*/
public static final String SECRET_FILED = "secretgrade";
@@ -451,7 +458,7 @@
}
R r = updateBatchByBaseModel(baseModelDTO.getBtmname(), baseModels);
if (!r.isSuccess()) {
- throw new VciBaseException("鏇存柊鏁版嵁鍑洪敊锛岄噸璇曪紒" + r.getMsg());
+ throw new VciBaseException("鏇存柊鏁版嵁鍑洪敊锛岃閲嶈瘯锛�" + r.getMsg());
}
}
// 鍒氬ソ椤哄簭鏄竴鑷寸殑锛屾墍浠ョ洿鎺ユ寜鐓odeallcode鐨勯『搴忔潵鎷夸笟鍔℃暟鎹�
@@ -3468,19 +3475,19 @@
cbos.add(data);
});
-// List<ClientBusinessObject> cbos = boService.queryByOnlySql(sqlBO.getSqlUnPage());
+ // List<ClientBusinessObject> cbos = boService.queryByOnlySql(sqlBO.getSqlUnPage());
if (CollectionUtils.isEmpty(cbos)) {
- throw new VciBaseException("鏁版嵁鍦ㄧ郴缁熶腑涓嶅瓨鍦紝鏄惁鍥犱负淇敼杩囦笟鍔＄被鍨嬶紵");
+ return R.fail("鏁版嵁鍦ㄧ郴缁熶腑涓嶅瓨鍦紝鏄惁鍥犱负淇敼杩囦笟鍔＄被鍨嬶紵");
}
-// Map<String, String> data = new HashMap<>();
+ // Map<String, String> data = new HashMap<>();
Map<String, String> cbo = cbos.get(0);
-// WebUtil.copyValueToMapFromCbos(cbo, data);
+ // WebUtil.copyValueToMapFromCbos(cbo, data);
List<Map<String, String>> dataList = new ArrayList<>();
dataList.add(cbo);
wrapperData(dataList, templateVO, sqlBO.getSelectFieldList(), true);
R<List<Map<String, String>>> result = R.data(Collections.singletonList(cbo));
if(templateVO.getAttributes().isEmpty()){
- throw new ServiceException(String.format("涓婚敭涓猴細{}鐨勬ā鏉夸笅锛屾ā鏉垮睘鎬ч厤缃负绌猴紒",templateVO.getOid()));
+ return R.fail(String.format("涓婚敭涓猴細%s鐨勬ā鏉夸笅锛屾ā鏉垮睘鎬ч厤缃负绌猴紒",templateVO.getOid()));
}
//澶勭悊杩斿洖鏁版嵁涓庢ā鏉挎暟鎹厤缃殑瀛楁涓嶄竴鏍烽棶棰�
templateVO.getAttributes().stream().forEach(e -> {
@@ -3493,42 +3500,42 @@
});
//鎴戜滑瑕佺湅鏄惁涓嶆槸鍗囩増鐨勶紝鍗囩増鐨勮瘽锛岄渶瑕佸姣斾笉鐩哥瓑鐨勫睘鎬�
-/* String copy = cbo.get("copyfromversion");
-// if (StringUtils.isBlank(copy)) {
-// copy = cbo.getAttributeValue("copyfromversion");
-// }
- if (StringUtils.isNotBlank(copy)) {
- //璇存槑鏈夊彉鏇寸殑鍐呭
+ /* String copy = cbo.get("copyfromversion");
+ // if (StringUtils.isBlank(copy)) {
+ // copy = cbo.getAttributeValue("copyfromversion");
+ // }
+ if (StringUtils.isNotBlank(copy)) {
+ //璇存槑鏈夊彉鏇寸殑鍐呭
- CodeTemplateAttrSqlBO oldSqlBO = getSqlByTemplateVO(btmId, templateVO, WebUtil.getOidQuery(copy), new PageHelper(-1));
- //鎴戜滑浣跨敤鍜屼笟鍔＄被鍨嬬殑鏉ユ煡璇�
-// List<Map> cbos = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
- List<Map> oldCbos = commonsMapper.selectBySql(oldSqlBO.getSqlUnPage());
- if (!CollectionUtils.isEmpty(oldCbos)) {
-// Map<String, String> newData = new HashMap<>();
-// WebUtil.copyValueToMapFromCbos(cbo, newData);
- Map<String, String> oldData = new HashMap<>();
- oldData = oldCbos.get(0);
- Map<String, String> difFieldMap = new HashMap<>();
- Map<String, String> finalOldData = oldData;
- cbo.forEach((key, value) -> {
- // 杩欏効oldmap涓殑鍏ㄦ槸澶у啓锛岃�宑bo涓殑鍏ㄦ槸灏忓啓鎵�浠ヤ細鎷夸笉鍒板彧锛岃繖鍎跨洿鎺ュ鐞嗘垚灏忓啓鎷夸笉鍒板氨鐢ㄥぇ鍐欐嬁
- String oldValue = String.valueOf(finalOldData.getOrDefault(key.toUpperCase(Locale.ROOT), finalOldData.getOrDefault(key, "")));
- if (value == null || value == "null") {
- value = "";
- }
- if (oldValue == null || oldValue == "null") {
- oldValue = "";
- }
- if (!value.equalsIgnoreCase(oldValue)) {
- difFieldMap.put(key, oldValue);
- }
- });
- List<Map<String, String>> difFieldList = new ArrayList<>();
- difFieldList.add(difFieldMap);
- result.setData(difFieldList);
- }
- }*/
+ CodeTemplateAttrSqlBO oldSqlBO = getSqlByTemplateVO(btmId, templateVO, WebUtil.getOidQuery(copy), new PageHelper(-1));
+ //鎴戜滑浣跨敤鍜屼笟鍔＄被鍨嬬殑鏉ユ煡璇�
+ // List<Map> cbos = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
+ List<Map> oldCbos = commonsMapper.selectBySql(oldSqlBO.getSqlUnPage());
+ if (!CollectionUtils.isEmpty(oldCbos)) {
+ // Map<String, String> newData = new HashMap<>();
+ // WebUtil.copyValueToMapFromCbos(cbo, newData);
+ Map<String, String> oldData = new HashMap<>();
+ oldData = oldCbos.get(0);
+ Map<String, String> difFieldMap = new HashMap<>();
+ Map<String, String> finalOldData = oldData;
+ cbo.forEach((key, value) -> {
+ // 杩欏効oldmap涓殑鍏ㄦ槸澶у啓锛岃�宑bo涓殑鍏ㄦ槸灏忓啓鎵�浠ヤ細鎷夸笉鍒板彧锛岃繖鍎跨洿鎺ュ鐞嗘垚灏忓啓鎷夸笉鍒板氨鐢ㄥぇ鍐欐嬁
+ String oldValue = String.valueOf(finalOldData.getOrDefault(key.toUpperCase(Locale.ROOT), finalOldData.getOrDefault(key, "")));
+ if (value == null || value == "null") {
+ value = "";
+ }
+ if (oldValue == null || oldValue == "null") {
+ oldValue = "";
+ }
+ if (!value.equalsIgnoreCase(oldValue)) {
+ difFieldMap.put(key, oldValue);
+ }
+ });
+ List<Map<String, String>> difFieldList = new ArrayList<>();
+ difFieldList.add(difFieldMap);
+ result.setData(difFieldList);
+ }
+ }*/
return result;
}
@@ -4399,8 +4406,8 @@
if (cboMap.containsKey(oid)) {
CodeAllCode codeAllCode = cboMap.get(oid);
codeAllCode.setId(baseModel.getId());
- // codeAllCode.setLastModifier(AuthUtil.getUser().getUserName());
- codeAllCode.setLastModifier(AuthUtil.getUser().getAccount());
+ // 涓绘暟鎹帹閫佸舰寮忥紝鏄嬁涓嶅埌鐢ㄦ埛淇℃伅鐨�
+ codeAllCode.setLastModifier(Func.isBlank(AuthUtil.getUserAccount()) ? applyCodeUserAccount:AuthUtil.getUserAccount());
codeAllCode.setLastModifyTime(new Date());
codeAllCode.setLcStatus(baseModel.getLcStatus());
newCodeAllCodeList.add(codeAllCode);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index db7167c..4345114 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -2826,9 +2826,9 @@
List<CodeAllCode> codeAllCodeList = new ArrayList<>();
List<String> deleteList = new ArrayList<>();
- CodeClassifyTemplateVO firstTemplateVO = templateService.getObjectHasAttrByOid(orderDTOMap.values().stream().findFirst().get().getTemplateOid());
+ // CodeClassifyTemplateVO firstTemplateVO = templateService.getObjectHasAttrByOid(orderDTOMap.values().stream().findFirst().get().getTemplateOid());
Map<String, ClientBusinessObject> cboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
- // boolean finalIsProcess = isProcess;
+ // boolean finalIsProcess = isProcess;
orderDTOMap.keySet().stream().forEach(code -> {
CodeOrderDTO orderDTO = orderDTOMap.get(code);
ClientBusinessObject cbo = cboMap.get(code);
@@ -2981,9 +2981,6 @@
//鏄惁璋冪敤闆嗗洟鎺ュ彛鐢宠鎺ュ彛
if(isCodeOrGroupCode){
List<String> IdList=resultDataObjectDetailDOs.stream().filter(xMLResultDataObjectDetailDO-> com.alibaba.cloud.commons.lang.StringUtils.isNotBlank(xMLResultDataObjectDetailDO.getId())).map(XMLResultDataObjectDetailDO::getId).distinct().collect(Collectors.toList());
-
-
-
if(!CollectionUtils.isEmpty(IdList)) {
this.sendApplyGroupcode(IdList, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue());
}
@@ -5286,8 +5283,8 @@
* @param file
* @return
*/
- @Transactional(rollbackFor = VciBaseException.class)
@Override
+ @Transactional(rollbackFor = Exception.class)
public String importGroupCode(String codeClassifyOid, File file) throws Throwable {
VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
ReadExcelOption reo = new ReadExcelOption();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 9a6311d..14524ab 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -360,7 +360,7 @@
List<CodeBasicSecVO> attrSecVOList = new ArrayList<>();
for (int i = 0; i < secVOList.size(); i++) {
CodeBasicSecVO secVO = secVOList.get(i);
- try {
+ try{
switchSecValue(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
}catch (Exception e){
throw new ServiceException("鐮佸�艰浆鎹㈡椂鍑虹幇閿欒锛屽師鍥狅細"+e.getMessage());
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 0c37fdb..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
@@ -69,10 +69,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -86,7 +85,7 @@
@Service
@Slf4j
@VciWebservice(path = "/universalInterface")
-public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI {
+public class UniversalInterfaceImpl implements UniversalInterfaceI {
/***
* 鎿嶄綔绫诲瀷
@@ -114,11 +113,13 @@
*/
@Value("${bzApply.seriesFlow:seriesFlow}")
private String seriesFlow;
+
/***
* 鏄惁鍙樻洿绯诲垪
*/
@Value("${bzApply.isEditSeries:isEditSeries}")
private String isEditSeries;
+
/***
* 鎺у埗鏄惁鍐欏叆鍊肩殑鐮佹鍚嶇О
*/
@@ -130,7 +131,6 @@
*/
@Value("${bzApply.yearSecName:骞翠唬鍙穧")
private String yearSecName;
-
@Value("${code.universalinterface.checkSystemConfig:true}")
public boolean CODE_CHECKCONFIG;
@@ -203,8 +203,14 @@
*/
@Resource
private IDockingLogeService dockingLogeService;
+
@Resource
private IPasswordFreeLoginService passwordFreeLoginService;
+
+ /**
+ * 鑷畾涔夊苟鍙慒orkJoinPool
+ */
+ private static final ForkJoinPool customForkJoinPool = new ForkJoinPool(Runtime.getRuntime().availableProcessors() - 1);
private static String separator="##VCI##";
private String errorid="0";
@@ -290,17 +296,17 @@
throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
}
List<ClassfyVO> classVOList = classfysVO.getClassify();
- InterParameterVO finalInterParameterVO = interParameterVO;
+ //InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
sessionInfo.setUserName(userVo.getTrueName());
sessionInfo.setIp(userVo.getIp());
VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
-// List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
+ //List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
String finalSystemId = systemId;
classVOList.stream().forEach(classVO -> {
- log.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
+ log.info("鍙傛暟锛氬垎绫籆ode:" + classVO.getClassCode());
boolean isCodeOrGroupCode=false;
LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
String libray ="";
@@ -451,7 +457,6 @@
*/
@Override
public ResultOrgData syncDataForPerson(PersonData personData) {
-
boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
ResultOrgData resultOrgData=new ResultOrgData();
@@ -483,7 +488,7 @@
ClassfyVO classfyVO = new ClassfyVO();
classfyVO.setLibrary(personLibrary);
classfyVO.setClassCode(personClassCode);
- CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+ CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
log.info("end锛氬垎绫绘煡璇㈠畬姣�");
//鑾峰彇鍒嗙被妯℃澘淇℃伅
if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -501,8 +506,7 @@
).collect(Collectors.toList());
List<PersonMasterData> personMasterDataList= personData.getMasterData();
- List<Map> dataList=new ArrayList<>();
-
+ //List<Map> dataList=new ArrayList<>();
List<String> codeList=new ArrayList<>();
List<ApplyDataVO> applyDataVOList=new ArrayList<>();
@@ -521,7 +525,7 @@
*/
fields.stream().forEach(field->{
if(dataMap.containsKey(field)){
- String enumFiled= dataMap.get(field);
+ String enumFiled = dataMap.get(field);
EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class);
String enumCode=enumerableData.getCode();
//String enumCodeValue=enumerableData.getName();
@@ -541,11 +545,11 @@
object.setProp(proppertyVOList);
if(personMasterData.getDr()==1){
- object.setOperate("delete");//鎿嶄綔绫诲瀷
+ //鎿嶄綔绫诲瀷
+ object.setOperate("delete");
deleteDataVOList.add(object);
}else{
- String worker_category=personMasterData.getWorker_category();
-
+ //String worker_category=personMasterData.getWorker_category();
object.setOperate("create");
applyDataVOList.add(object);
}
@@ -573,7 +577,7 @@
sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
sb.append(")");
List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
-
+ DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
List<ClientBusinessObject> cboList= ChangeMapTOClientBusinessObjects(dataMapList);
ApplyDatasVO applyDatasVO=new ApplyDatasVO();
ApplyDatasVO editDatasVO=new ApplyDatasVO();
@@ -618,7 +622,8 @@
throw new Throwable("缂栫爜瑙勫垯");
}
List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
- dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+ final List<RowDatas> rowDatas = dataObjectVO.getRowData();
+ rowDatas.parallelStream().forEach(rowData->{
String mesg="";
try {
CodeOrderDTO orderDTO = new CodeOrderDTO();
@@ -681,16 +686,19 @@
resultDataObjectDetailDOs.addAll(xDOs);
boolean finalSuccess1 = success.get();
String finalMessage1 = message;
- resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
- ResultMdMapping resultMdMapping=new ResultMdMapping();
- resultMdMapping.setBusiDataId(resultDataObjectDetailDO.getId());
- resultMdMapping.setSuccess(finalSuccess1);
- resultMdMapping.setEntityCode(" ");
- resultMdMapping.setMdmCode(resultDataObjectDetailDO.getCode());
- resultMdMapping.setMessage(finalMessage1);
- resultMdMapping.setSubMdMappings(null);
- resultMdMappingList.add(resultMdMapping);
- });
+ // 闄愬埗绾跨▼骞惰鏁伴噺
+ customForkJoinPool.submit(()->{
+ resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
+ ResultMdMapping resultMdMapping=new ResultMdMapping();
+ resultMdMapping.setBusiDataId(resultDataObjectDetailDO.getId());
+ resultMdMapping.setSuccess(finalSuccess1);
+ resultMdMapping.setEntityCode(" ");
+ resultMdMapping.setMdmCode(resultDataObjectDetailDO.getCode());
+ resultMdMapping.setMessage(finalMessage1);
+ resultMdMapping.setSubMdMappings(null);
+ resultMdMappingList.add(resultMdMapping);
+ });
+ }).join();
log.info("end锛氱敵璇疯幏鍙栧畬姣�");
}
}catch (Throwable e){
@@ -713,7 +721,7 @@
resultOrgData.setMessage(message);
resultOrgData.setSuccess(success.get());
resultOrgData.setMdMappings(resultMdMappingList);
- Object object = JSONObject.toJSON(resultOrgData);
+ //Object object = JSONObject.toJSON(resultOrgData);
}
String resultStr = JSONObject.toJSONString(resultOrgData);
String data = JSONObject.toJSONString(personData);
@@ -738,13 +746,13 @@
public ResultOrgData syncDataForOrg(OrgData orgData) {
boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
ResultOrgData resultOrgData=new ResultOrgData();
- boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
+ // boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
AtomicBoolean success= new AtomicBoolean(true);
String message="";
String systemCode="";
if(isUsedFlag){
- List<OrgMasterData> orgMasterDataList=new ArrayList<>();
+ List<OrgMasterData> orgMasterDataList = new ArrayList<>();
List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields());
try {
if(orgData==null){
@@ -767,7 +775,7 @@
ClassfyVO classfyVO = new ClassfyVO();
classfyVO.setLibrary(deptLibrary);
classfyVO.setClassCode(deptClassCode);
- CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,deptLibrary);
+ CodeClassifyVO codeClassifyVO = this.getClassfy(classfyVO,deptLibrary);
log.info("end锛氬垎绫绘煡璇㈠畬姣�");
//鑾峰彇鍒嗙被妯℃澘淇℃伅
if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -783,7 +791,6 @@
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<Map> dataList=new ArrayList<>();
List<String> codeList=new ArrayList<>();
List<ApplyDataVO> applyDataVOList=new ArrayList<>();
List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
@@ -792,10 +799,10 @@
object.setCode(orgMasterData.getMdm_code());//缂栫爜
object.setCreator(orgMasterData.getCreator());//鍒涘缓鑰�
object.setEditor(orgMasterData.getModifier());//淇敼鑰�
- object.setId(orgMasterData.getPk_mdm());//涓婚敭
+ object.setId(orgMasterData.getDepartment_code());//涓婚敭
object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
- List<ProppertyVO> proppertyVOList=new ArrayList<>();
+ List<ProppertyVO> proppertyVOList = new ArrayList<>();
/***
* 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊�
*/
@@ -824,7 +831,6 @@
object.setOperate("delete");//鎿嶄綔绫诲瀷
deleteDataVOList.add(object);
}else{
-
object.setOperate("create");
applyDataVOList.add(object);
}
@@ -840,10 +846,10 @@
throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
}
String tableName = btmTypeVO.getTableName();
- if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+ if (StringUtils.isBlank(tableName)) {
throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
}
- StringBuffer sb=new StringBuffer();
+ StringBuffer sb = new StringBuffer();
sb.append(" select * from ");
sb.append(tableName);
sb.append(" where 1=1 ");
@@ -851,15 +857,16 @@
sb.append(" and id in (");
sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
sb.append(")");
- List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
- List<ClientBusinessObject> cboList= ChangeMapTOClientBusinessObjects(dataMapList);
+ List<Map<String,String>> dataMapList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+ DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
+ List<ClientBusinessObject> cboList = ChangeMapTOClientBusinessObjects(dataMapList);
ApplyDatasVO applyDatasVO=new ApplyDatasVO();
ApplyDatasVO editDatasVO=new ApplyDatasVO();
if(!CollectionUtils.isEmpty(cboList)){
- Map<String,ClientBusinessObject> oldpplyDataVOMap= cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+ Map<String,ClientBusinessObject> oldpplyDataVOMap = cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
//鏁版嵁搴撲笉瀛樺湪鐨�
List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
- String code =cbo.getCode();
+ String code = cbo.getCode();
return !oldpplyDataVOMap.containsKey(code);
}).collect(Collectors.toList());
applyDatasVO.setObject(applyApplyDataVOList);
@@ -882,7 +889,7 @@
DataObjectVO dataObjectVO = new DataObjectVO();
this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- boolean personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
+ boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
}
@@ -896,32 +903,34 @@
throw new Throwable("缂栫爜瑙勫垯");
}
List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
- dataObjectVO.getRowData().parallelStream().forEach(rowData->{
- String mesg="";
- try {
- CodeOrderDTO orderDTO = new CodeOrderDTO();
- List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
- orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
- orderDTO.setTemplateOid(templateVO.getOid());
- orderDTO.setCreator(rowData.getCreator());
- orderDTO.setLastModifier(rowData.getEditor());
- orderDTO.setLcStatus(rowData.getStatus());
- if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
- ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
- if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
- CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
- CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
- CodeOrderSecDTO.setSecValue(rowData.getCode());
- codeOrderSecDTOList.add(CodeOrderSecDTO);
-
- }
- });
- }
- orderDTO.setCodeRuleOid(ruleVO.getOid());
- orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
- orderDTO.setData(rowData.getFiledValue());
- String code=engineService.addSaveCodeNotauthUser(orderDTO,false);
- if(StringUtils.isNotBlank(code)) {
+ //闄愬埗绾跨▼骞惰鏁伴噺
+ customForkJoinPool.submit(()->{
+ dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+ String mesg="";
+ try {
+ CodeOrderDTO orderDTO = new CodeOrderDTO();
+ List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
+ orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
+ orderDTO.setTemplateOid(templateVO.getOid());
+ orderDTO.setCreator(rowData.getCreator());
+ orderDTO.setLastModifier(rowData.getEditor());
+ orderDTO.setLcStatus(rowData.getStatus());
+ if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
+ ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
+ if (codeBasicSecVO.getSecType().equals("codevariablesec")) {
+ //瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
+ CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
+ CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
+ CodeOrderSecDTO.setSecValue(rowData.getOid());
+ codeOrderSecDTOList.add(CodeOrderSecDTO);
+ }
+ });
+ }
+ orderDTO.setCodeRuleOid(ruleVO.getOid());
+ orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
+ orderDTO.setData(rowData.getFiledValue());
+ String code = engineService.addSaveCodeNotauthUser(orderDTO,false);
+ /*if(StringUtils.isNotBlank(code)) {
//rowData.setCode(code);
StringBuffer sqlsb = new StringBuffer();
sqlsb.append(" select * from ");
@@ -943,20 +952,21 @@
mesg = "鏁版嵁淇濆瓨鎴愬姛锛岀瓑寰呯敵璇烽泦鍥㈢爜";
}
}
+ }*/
+ } catch (Exception e) {
+ mesg=e.getMessage();
+ e.printStackTrace();
+ throw new ServiceException(e.getMessage());
+ }finally {
+ XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
+ x.setId(rowData.getOid());
+ x.setCode(rowData.getCode());
+ x.setMsg(mesg);
+ x.setErrorid("1");
+ xDOs.add(x);
}
- } catch (Exception e) {
- mesg=e.getMessage();
- e.printStackTrace();
- throw new ServiceException(e.getMessage());
- }finally {
- XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
- x.setId(rowData.getOid());
- x.setCode(rowData.getCode());
- x.setMsg(mesg);
- x.setErrorid("1");
- xDOs.add(x);
- }
- });
+ });
+ }).join();
resultDataObjectDetailDOs.addAll(xDOs);
boolean finalSuccess1 = success.get();
String finalMessage1 = message;
@@ -1059,7 +1069,7 @@
throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
}
List<ClassfyVO> classVOList = classfysVO.getClassify();
- InterParameterVO finalInterParameterVO = interParameterVO;
+ //InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
SessionInfo sessionInfo = new SessionInfo();
sessionInfo.setUserId(userVo.getUserName());
@@ -1501,7 +1511,8 @@
sb.append(" and lastr=1 and lastv=1" );
sb.append(" and codeclsfid in (" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) +")");
sb.append(" and Lcstatus in (" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) +")");
- List<Map<String,String>> newDataList= commonsMapper.queryByOnlySqlForMap(sb.toString());
+ List<Map<String,String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+ DefaultAttrAssimtUtil.mapToLowerCase(newDataList,true);
List<ClientBusinessObject> clientBusinessObjects= ChangeMapTOClientBusinessObjects(newDataList);
List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
if(!CollectionUtils.isEmpty(clientBusinessObjects)){
@@ -2447,7 +2458,7 @@
*/
public void getConfigDatas(String systemId,String libray, ApplyBZDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
- LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
+ // LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
Map<String, String> attrMapConfigMap=new HashMap<>();
Map<String, String> propMaps=new HashMap<>();
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 ac00e01..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;
/**
@@ -70,7 +63,7 @@
*/
@PostMapping("/saveOrUpdateServiceInfo")
public R saveOrUpdateDefault(@RequestBody DeployAppsVO deployAppsVO) throws ServiceException {
- return R.status(deployAppsService.saveOrUpdateServiceInfo(deployAppsVO));
+ return deployAppsService.saveOrUpdateServiceInfo(deployAppsVO);
}
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java
index 3538c88..b5d4429 100644
--- a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/IDeployAppsService.java
@@ -40,7 +40,7 @@
* @return
* @throws ServiceException
*/
- boolean saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException;
+ R saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException;
/**
* 鏂板鏈嶅姟淇℃伅
diff --git a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
index 7785b88..c1f0c39 100644
--- a/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-deploy/src/main/java/com/vci/ubcs/deploy/service/impl/DeployAppsServiceImpl.java
@@ -202,8 +202,12 @@
* @throws ServiceException
*/
@Override
- public boolean saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException {
- return this.saveOrUpdate(deployAppsVO);
+ public R saveOrUpdateServiceInfo(DeployAppsVO deployAppsVO) throws ServiceException {
+ boolean checkBoolean = checkCmdVer(deployAppsVO.getStartCmd()) && checkCmdVer(deployAppsVO.getStopCmd()) && checkCmdVer(deployAppsVO.getRestartCmd());
+ if(checkBoolean){
+ return R.fail("閰嶇疆鐨勫懡浠や腑鍖呭惈鍗遍櫓鍛戒护锛屽锛歳m銆乵v銆乺m -rf銆乧hmod绛夊懡浠ゅ拰鍏抽敭瀛楋紒 ");
+ }
+ return R.status(this.saveOrUpdate(deployAppsVO));
}
/**
@@ -349,6 +353,9 @@
if(Func.isEmpty(cmd)){
return "The executed command is empty";
}
+ if(checkCmdVer(cmd)){
+ return "閰嶇疆鐨勫懡浠や腑鍖呭惈鍗遍櫓鍛戒护锛屽锛歳m銆乵v銆乺m -rf銆乧hmod绛夊懡浠ゅ拰鍏抽敭璇嶏紒 ";
+ }
// 鎵цLinux鍛戒护
log.info("寮�濮嬫墽琛屽懡浠わ細"+cmd);
// Process process = Runtime.getRuntime().exec(cmd);
@@ -429,4 +436,22 @@
return "8080";
}
+ /**
+ * 鍚姩銆佸仠姝€�侀噸鍚懡浠ゆ牎楠�
+ * @param cmd
+ * @return true: 鍖呭惈楂橀闄╁懡浠わ紝 false锛氫笉鍖呭惈
+ */
+ private boolean checkCmdVer(String cmd){
+ if(Func.isEmpty(cmd)){
+ return false;
+ }
+ String[] highRiskCommands = {"rm", "rmdir", "mv", "unlink", "rm -rf", "mv -rf", "dd", "chmod", "chown", "mkfs", "shutdown", "reboot", "kill"};
+ for(String highRiskCmd : highRiskCommands){
+ if(cmd.contains(highRiskCmd)){
+ return true;
+ }
+ }
+ return false;
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleServiceImpl.java
index b145ad3..ec11961 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/RoleServiceImpl.java
@@ -204,7 +204,7 @@
@Override
public String getRoleIds(String tenantId, String roleNames) {
- List<Role> roleList = baseMapper.selectList(Wrappers.<Role>query().lambda().eq(Role::getTenantId, tenantId).in(Role::getRoleName, Func.toStrList(roleNames)));
+ List<Role> roleList = baseMapper.selectList(Wrappers.<Role>query().lambda().eq(Role::getTenantId, tenantId).in(Role::getRoleAlias, Func.toStrList(roleNames)));
if (roleList != null && roleList.size() > 0) {
return roleList.stream().map(role -> Func.toStr(role.getId())).distinct().collect(Collectors.joining(","));
}
--
Gitblit v1.9.3