From ac0ff6946b0568f9b512ef91ca79312dd39cb78f Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 21 六月 2023 16:43:19 +0800
Subject: [PATCH] 集成接口配置模块管理开发
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java | 12
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntParamWrapper.java | 69 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntHeaderWrapper.java | 67 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntHeaderMapper.java | 7
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntHeaderServiceImpl.java | 13
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntHeaderVO.java | 55 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntParamMapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java | 383 ---------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 29
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntParamMapper.xml | 42 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntParamService.java | 8
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingTaskServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntHeaderDTO.java | 57 ++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java | 66 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java | 19
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntParamVO.java | 54 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 143 +++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 27 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 132 +++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntParamDTO.java | 57 ++
/dev/null | 81 ---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntHeaderService.java | 7
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java | 60 ++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java | 4
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntParamServiceImpl.java | 13
26 files changed, 936 insertions(+), 484 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntHeaderDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntHeaderDTO.java
new file mode 100644
index 0000000..1dc500e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntHeaderDTO.java
@@ -0,0 +1,57 @@
+package com.vci.ubcs.code.dto;
+
+
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
+
+/**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
+ *
+ * @author xiejun
+ * @date 2023-06-21
+ */
+@Data
+public class DockingSysIntHeaderDTO extends BaseModel {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 4615707117695864945L;
+
+ /**
+ * SysIntInfoDO 鐨刼id
+ */
+ private String infoOid;
+
+ /**
+ * 鍙傛暟key
+ */
+ private String headerKey;
+
+ /**
+ * 鍙傛暟value
+ */
+ private String headerValue;
+
+ /**
+ * 鏄惁浣跨敤
+ */
+ private String usedFlag;
+
+
+ /***
+ * 鏄惁浣跨敤鏄剧ず鏂囨湰
+ */
+ private String usedFlagText;
+
+ @Override
+ public String toString() {
+ return "DockingSysIntHeaderDTO{" +
+ "infoOid='" + infoOid + '\'' +
+ ", headerKey='" + headerKey + '\'' +
+ ", headerValue='" + headerValue + '\'' +
+ ", usedFlag='" + usedFlag + '\'' +
+ ", usedFlagText='" + usedFlagText + '\'' +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntParamDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntParamDTO.java
new file mode 100644
index 0000000..c23c50d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntParamDTO.java
@@ -0,0 +1,57 @@
+package com.vci.ubcs.code.dto;
+
+
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
+
+/**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
+ *
+ * @author weidy
+ * @date 2022-04-11
+ */
+@Data
+public class DockingSysIntParamDTO extends BaseModel {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 4615707120661255093L;
+
+ /**
+ * SysIntInfoDO 鐨刼id
+ */
+ private String infoOid;
+
+ /**
+ * 鍙傛暟key
+ */
+ private String paramkey;
+
+ /**
+ * 鍙傛暟value
+ */
+ private String paramvalue;
+
+ /**
+ * 鏄惁浣跨敤
+ */
+ private String usedflag;
+
+
+ /***
+ * 鏄惁浣跨敤鏄剧ず鏂囨湰
+ */
+ private String usedFlagText;
+
+ @Override
+ public String toString() {
+ return "DockingSysIntParamDTO{" +
+ "infoOid='" + infoOid + '\'' +
+ ", paramkey='" + paramkey + '\'' +
+ ", paramvalue='" + paramvalue + '\'' +
+ ", usedflag='" + usedflag + '\'' +
+ ", usedFlagText='" + usedFlagText + '\'' +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
index 5edd5d6..8473859 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
@@ -1,9 +1,10 @@
package com.vci.ubcs.code.dto;
-import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingSysIntHeaderVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingSysIntParamVO;
import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
import java.util.List;
@@ -13,6 +14,7 @@
* @author lihang
* @date 2022-03-07
*/
+@Data
public class DockingSystemConfigDTO extends BaseModel {
/**
@@ -245,381 +247,12 @@
/***
* 鍙傛暟淇℃伅瀵硅薄
*/
- private List<SysIntParamVO> sysIntParamVOs;
+ private List<DockingSysIntParamDTO> sysIntParamDTOS;
/***
* header淇℃伅瀵硅薄
*/
- private List<SysIntHeaderVO> sysIntHeaderVOs;
-
- public String getAuthorityOid() {
- return authorityOid;
- }
-
- public void setAuthorityOid(String authorityOid) {
- this.authorityOid = authorityOid;
- }
-
- public String getAuthorityOidName() {
- return authorityOidName;
- }
-
- public void setAuthorityOidName(String authorityOidName) {
- this.authorityOidName = authorityOidName;
- }
-
- public String getAuthorityType() {
- return authorityType;
- }
-
- public void setAuthorityType(String authorityType) {
- this.authorityType = authorityType;
- }
-
- public String getAuthorityTypeText() {
- return authorityTypeText;
- }
-
- public void setAuthorityTypeText(String authorityTypeText) {
- this.authorityTypeText = authorityTypeText;
- }
-
- public String getUserAccount() {
- return userAccount;
- }
-
- public void setUserAccount(String userAccount) {
- this.userAccount = userAccount;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public String getToken() {
- return token;
- }
-
- public void setToken(String token) {
- this.token = token;
- }
-
- public String getInterfaceFunction() {
- return interfaceFunction;
- }
-
- public void setInterfaceFunction(String interfaceFunction) {
- this.interfaceFunction = interfaceFunction;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getInterfaceType() {
- return interfaceType;
- }
-
- public void setInterfaceType(String interfaceType) {
- this.interfaceType = interfaceType;
- }
-
- public String getInterfaceTypeText() {
- return interfaceTypeText;
- }
-
- public void setInterfaceTypeText(String interfaceTypeText) {
- this.interfaceTypeText = interfaceTypeText;
- }
-
- public String getParamType() {
- return paramType;
- }
-
- public void setParamType(String paramType) {
- this.paramType = paramType;
- }
-
- public String getParamTypeText() {
- return paramTypeText;
- }
-
- public void setParamTypeText(String paramTypeText) {
- this.paramTypeText = paramTypeText;
- }
-
- public String getRequestMethod() {
- return requestMethod;
- }
-
- public void setRequestMethod(String requestMethod) {
- this.requestMethod = requestMethod;
- }
-
- public String getRequestMethodText() {
- return requestMethodText;
- }
-
- public void setRequestMethodText(String requestMethodText) {
- this.requestMethodText = requestMethodText;
- }
-
- public String getClassifyOid() {
- return classifyOid;
- }
-
- public void setClassifyOid(String classifyOid) {
- this.classifyOid = classifyOid;
- }
-
- public String getUsedFlag() {
- return usedFlag;
- }
-
- public void setUsedFlag(String usedFlag) {
- this.usedFlag = usedFlag;
- }
-
- public String getSysBaseOid() {
- return sysBaseOid;
- }
-
- public void setSysBaseOid(String sysBaseOid) {
- this.sysBaseOid = sysBaseOid;
- }
-
- public String getSysBaseId() {
- return sysBaseId;
- }
-
- public void setSysBaseId(String sysBaseId) {
- this.sysBaseId = sysBaseId;
- }
-
- public String getSysBaseName() {
- return sysBaseName;
- }
-
- public void setSysBaseName(String sysBaseName) {
- this.sysBaseName = sysBaseName;
- }
-
- public String getRequestUrl() {
- return requestUrl;
- }
-
- public void setRequestUrl(String requestUrl) {
- this.requestUrl = requestUrl;
- }
-
- public String getReturnType() {
- return returnType;
- }
-
- public void setReturnType(String returnType) {
- this.returnType = returnType;
- }
-
- public String getReturnTypeText() {
- return returnTypeText;
- }
-
- public void setReturnTypeText(String returnTypeText) {
- this.returnTypeText = returnTypeText;
- }
-
- public String getSourceSystemOid() {
- return sourceSystemOid;
- }
-
- public void setSourceSystemOid(String sourceSystemOid) {
- this.sourceSystemOid = sourceSystemOid;
- }
-
- public String getSourceSysName() {
- return sourceSysName;
- }
-
- public void setSourceSysName(String sourceSysName) {
- this.sourceSysName = sourceSysName;
- }
-
- public String getSourceSysId() {
- return sourceSysId;
- }
-
- public void setSourceSysId(String sourceSysId) {
- this.sourceSysId = sourceSysId;
- }
-
- public String getSourceSystemOidName() {
- return sourceSystemOidName;
- }
-
- public void setSourceSystemOidName(String sourceSystemOidName) {
- this.sourceSystemOidName = sourceSystemOidName;
- }
-
- public String getTargetSystemOid() {
- return targetSystemOid;
- }
-
- public void setTargetSystemOid(String targetSystemOid) {
- this.targetSystemOid = targetSystemOid;
- }
-
- public String getTargetSysName() {
- return targetSysName;
- }
-
- public void setTargetSysName(String targetSysName) {
- this.targetSysName = targetSysName;
- }
-
- public String getTargetSysId() {
- return targetSysId;
- }
-
- public void setTargetSysId(String targetSysId) {
- this.targetSysId = targetSysId;
- }
-
- public String getTargetSystemOidName() {
- return targetSystemOidName;
- }
-
- public void setTargetSystemOidName(String targetSystemOidName) {
- this.targetSystemOidName = targetSystemOidName;
- }
-
- public String getClassPath() {
- return classPath;
- }
-
- public void setClassPath(String classPath) {
- this.classPath = classPath;
- }
-
- public String getDataFlowType() {
- return dataFlowType;
- }
-
- public void setDataFlowType(String dataFlowType) {
- this.dataFlowType = dataFlowType;
- }
-
- public String getDataFlowTypeText() {
- return dataFlowTypeText;
- }
-
- public void setDataFlowTypeText(String dataFlowTypeText) {
- this.dataFlowTypeText = dataFlowTypeText;
- }
-
- public String getBtmTypeId() {
- return btmTypeId;
- }
-
- public void setBtmTypeId(String btmTypeId) {
- this.btmTypeId = btmTypeId;
- }
-
- public String getBtmTypeName() {
- return btmTypeName;
- }
-
- public void setBtmTypeName(String btmTypeName) {
- this.btmTypeName = btmTypeName;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- public String getSoapAction() {
- return soapAction;
- }
-
- public void setSoapAction(String soapAction) {
- this.soapAction = soapAction;
- }
-
- public String getCxfAxis() {
- return cxfAxis;
- }
-
- public void setCxfAxis(String cxfAxis) {
- this.cxfAxis = cxfAxis;
- }
-
- public String getTargetName() {
- return targetName;
- }
-
- public void setTargetName(String targetName) {
- this.targetName = targetName;
- }
-
- public String getPushType() {
- return pushType;
- }
-
- public void setPushType(String pushType) {
- this.pushType = pushType;
- }
-
- public String getPushTypeText() {
- return pushTypeText;
- }
-
- public void setPushTypeText(String pushTypeText) {
- this.pushTypeText = pushTypeText;
- }
-
- public String getClassifyId() {
- return classifyId;
- }
-
- public void setClassifyId(String classifyId) {
- this.classifyId = classifyId;
- }
-
- public String getClassifyName() {
- return classifyName;
- }
-
- public void setClassifyName(String classifyName) {
- this.classifyName = classifyName;
- }
-
- public List<SysIntParamVO> getSysIntParamVOs() {
- return sysIntParamVOs;
- }
-
- public void setSysIntParamVOs(List<SysIntParamVO> sysIntParamVOs) {
- this.sysIntParamVOs = sysIntParamVOs;
- }
-
- public List<SysIntHeaderVO> getSysIntHeaderVOs() {
- return sysIntHeaderVOs;
- }
+ private List<DockingSysIntHeaderDTO> sysIntHeaderDTOS;
- public void setSysIntHeaderVOs(List<SysIntHeaderVO> sysIntHeaderVOs) {
- this.sysIntHeaderVOs = sysIntHeaderVOs;
- }
@Override
public String toString() {
@@ -668,8 +301,8 @@
", pushTypeText='" + pushTypeText + '\'' +
", classifyId='" + classifyId + '\'' +
", classifyName='" + classifyName + '\'' +
- ", sysIntParamVOs=" + sysIntParamVOs +
- ", sysIntHeaderVOs=" + sysIntHeaderVOs +
+ ", sysIntParamDTOS=" + sysIntParamDTOS +
+ ", sysIntHeaderDTOS=" + sysIntHeaderDTOS +
'}';
}
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java
deleted file mode 100644
index 6910120..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.vci.ubcs.code.dto;
-
-
-import com.vci.ubcs.starter.revision.model.BaseModel;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
- *
- * @author weidy
- * @date 2022-04-11
- */
-public class SysIntHeaderDTO extends BaseModel {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 4615707117695864945L;
-
- /**
- * SysIntInfoDO 鐨刼id
- */
- private String infoOid;
-
- /**
- * 鍙傛暟key
- */
- private String headerkey;
-
- /**
- * 鍙傛暟value
- */
- private String headeralue;
-
- /**
- * 鏄惁浣跨敤
- */
- private String usedflag;
-
- public String getInfoOid() {
- return infoOid;
- }
-
- public void setInfoOid(String infoOid) {
- this.infoOid = infoOid;
- }
-
- public String getHeaderkey() {
- return headerkey;
- }
-
- public void setHeaderkey(String headerkey) {
- this.headerkey = headerkey;
- }
-
- public String getHeaderalue() {
- return headeralue;
- }
-
- public void setHeaderalue(String headeralue) {
- this.headeralue = headeralue;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- @Override
- public String toString() {
- return "SysIntHeaderDO{" +
- "infoOid='" + infoOid + '\'' +
- ", headerkey='" + headerkey + '\'' +
- ", headeralue='" + headeralue + '\'' +
- ", usedflag='" + usedflag + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
deleted file mode 100644
index c5cc1cb..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.vci.ubcs.code.dto;
-
-import com.vci.ubcs.starter.revision.model.BaseModel;
-
-import java.util.List;
-
-public class SysIntInfoBseDTO extends BaseModel {
- private DockingSystemConfigDTO sysIntInfoDTO;
-
- private List<SysIntParamDTO> sysIntParamDTO;
-
- private List<SysIntHeaderDTO> sysIntHeaderDTOS;
-
- public DockingSystemConfigDTO getSysIntInfoDTO() {
- return sysIntInfoDTO;
- }
-
- public void setSysIntInfoDTO(DockingSystemConfigDTO sysIntInfoDTO) {
- this.sysIntInfoDTO = sysIntInfoDTO;
- }
-
- public List<SysIntParamDTO> getSysIntParamDTO() {
- return sysIntParamDTO;
- }
-
- public void setSysIntParamDTO(List<SysIntParamDTO> sysIntParamDTO) {
- this.sysIntParamDTO = sysIntParamDTO;
- }
-
- public List<SysIntHeaderDTO> getSysIntHeaderDTOS() {
- return sysIntHeaderDTOS;
- }
-
- public void setSysIntHeaderDTOS(List<SysIntHeaderDTO> sysIntHeaderDTOS) {
- this.sysIntHeaderDTOS = sysIntHeaderDTOS;
- }
-
- @Override
- public String toString() {
- return "SysIntInfoBseDTO{" +
- "sysIntInfoDTO=" + sysIntInfoDTO +
- ", sysIntParamDTO=" + sysIntParamDTO +
- ", sysIntHeaderDTOS=" + sysIntHeaderDTOS +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java
deleted file mode 100644
index 8317e0a..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.vci.ubcs.code.dto;
-
-
-import com.vci.ubcs.starter.revision.model.BaseModel;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
- *
- * @author weidy
- * @date 2022-04-11
- */
-public class SysIntParamDTO extends BaseModel {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 4615707120661255093L;
-
- /**
- * SysIntInfoDO 鐨刼id
- */
- private String infoOid;
-
- /**
- * 鍙傛暟key
- */
- private String paramkey;
-
- /**
- * 鍙傛暟value
- */
- private String paramvalue;
-
- /**
- * 鏄惁浣跨敤
- */
- private String usedflag;
-
-
- public String getInfoOid() {
- return infoOid;
- }
-
- public void setInfoOid(String infoOid) {
- this.infoOid = infoOid;
- }
-
- public String getParamkey() {
- return paramkey;
- }
-
- public void setParamkey(String paramkey) {
- this.paramkey = paramkey;
- }
-
- public String getParamvalue() {
- return paramvalue;
- }
-
- public void setParamvalue(String paramvalue) {
- this.paramvalue = paramvalue;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- @Override
- public String toString() {
- return "SysIntParamDO{" +
- "infoOid='" + infoOid + '\'' +
- ", paramkey='" + paramkey + '\'' +
- ", paramvalue='" + paramvalue + '\'' +
- ", usedflag='" + usedflag + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java
new file mode 100644
index 0000000..d94e7fc
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java
@@ -0,0 +1,60 @@
+package com.vci.ubcs.code.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/****
+ * 鎺ュ彛澶村崗璁�
+ */
+@Data
+@TableName(CodeTableNameConstant.PL_CODE_SYSINTPAREMTER)
+@ApiModel(value = "DockingSysIntHeader", description = "闆嗘垚鎺ュ彛-鎺ュ彛澶村崗璁璞�")
+@EqualsAndHashCode(callSuper = true)
+public class DockingSysIntHeader extends BaseModel {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 4615707117938037102L;
+
+ /**
+ * SysIntInfoDO 鐨刼id
+ */
+ @ApiModelProperty(value = "閰嶇疆涓婚敭")
+
+ private String infoOid;
+
+ /**
+ * 鍙傛暟key
+ */
+ @ApiModelProperty(value = "閰嶇疆涓婚敭")
+ private String headerKey;
+
+ /**
+ * 鍙傛暟value
+ */
+ @ApiModelProperty(value = "閰嶇疆涓婚敭")
+ @TableField(value = "headeralue")
+ private String headerValue;
+
+ /**
+ * 鏄惁浣跨敤
+ */
+ @ApiModelProperty(value = "閰嶇疆涓婚敭")
+ private String usedFlag;
+
+ /**
+ * 鏄惁浣跨敤
+ */
+ @ApiModelProperty(value = "閰嶇疆涓婚敭")
+ @TableField(exist = true)
+ private String usedFlagText;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java
new file mode 100644
index 0000000..9b8d9b8
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java
@@ -0,0 +1,66 @@
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勫弬鏁板璞�
+ *
+ * @author weidy
+ * @date 2022-04-11
+ */
+@Data
+@TableName(CodeTableNameConstant.PL_CODE_SYSINTPAREMTER)
+@ApiModel(value = "DockingSysIntParam", description = "闆嗘垚鎺ュ彛-鎺ュ彛鐨勫弬鏁板璞�")
+@EqualsAndHashCode(callSuper = true)
+public class DockingSysIntParam extends BaseModel {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 4615707118871819648L;
+
+ /**
+ * SysIntInfoDO 鐨刼id
+ */
+ @ApiModelProperty(value = "鎺ュ彛閰嶇疆涓婚敭")
+ private String infoOid;
+
+ /**
+ * 鍙傛暟key
+ */
+ @ApiModelProperty(value = "鍙傛暟key")
+ private String paramKey;
+
+ /**
+ * 鍙傛暟value
+ */
+ @ApiModelProperty(value = "鍙傛暟value")
+ private String paramValue;
+ /**
+ * 鏄惁浣跨敤
+ */
+ @ApiModelProperty(value = "鏄惁浣跨敤")
+ private String usedFlag;
+ /**
+ * 鏄惁浣跨敤鏄剧ず鍊�
+ */
+ @ApiModelProperty(value = "鏄惁浣跨敤鏄剧ず鍊�")
+ @TableField(exist = true)
+ private String usedFlagText;
+
+ @Override
+ public String toString() {
+ return "DockingSysIntParamVO{" +
+ "infoOid='" + infoOid + '\'' +
+ ", paramKey='" + paramKey + '\'' +
+ ", paramValue='" + paramValue + '\'' +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
index 800ffdd..c18ddf3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -2,16 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.List;
/***
* 闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠＄悊瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntHeaderVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntHeaderVO.java
new file mode 100644
index 0000000..a0ecf6d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntHeaderVO.java
@@ -0,0 +1,55 @@
+package com.vci.ubcs.code.vo.pagemodel;
+
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
+
+/**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
+ *
+ * @author weidy
+ * @date 2022-04-11
+ */
+@Data
+public class DockingSysIntHeaderVO extends BaseModel {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 4615707117938037102L;
+
+ /**
+ * SysIntInfoDO 鐨刼id
+ */
+ private String infoOid;
+
+ /**
+ * 鍙傛暟key
+ */
+ private String headerKey;
+
+ /**
+ * 鍙傛暟value
+ */
+ private String headerValue;
+
+ /**
+ * 鏄惁浣跨敤
+ */
+ private String usedFlag;
+
+ /***
+ * 鏄惁浣跨敤鏄剧ず鏂囨湰
+ */
+ private String usedFlagText;
+
+ @Override
+ public String toString() {
+ return "DockingSysIntHeaderVO{" +
+ "infoOid='" + infoOid + '\'' +
+ ", headerKey='" + headerKey + '\'' +
+ ", headerValue='" + headerValue + '\'' +
+ ", usedFlag='" + usedFlag + '\'' +
+ ", usedFlagText='" + usedFlagText + '\'' +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntParamVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntParamVO.java
new file mode 100644
index 0000000..576d9df
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntParamVO.java
@@ -0,0 +1,54 @@
+package com.vci.ubcs.code.vo.pagemodel;
+
+
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
+
+/**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
+ *
+ * @author xiejun
+ * @date 2023-06-21
+ */
+@Data
+public class DockingSysIntParamVO extends BaseModel {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 4615707118871819648L;
+
+ /**
+ * SysIntInfoDO 鐨刼id
+ */
+ private String infoOid;
+
+ /**
+ * 鍙傛暟key
+ */
+ private String paramKey;
+
+ /**
+ * 鍙傛暟value
+ */
+ private String paramValue;
+ /***
+ * 鏄惁浣跨敤
+ */
+ private String usedFlag;
+ /***
+ * 鏄惁浣跨敤鏄剧ず鏂囨湰
+ */
+ private String usedFlagText;
+
+ @Override
+ public String toString() {
+ return "DockingSysIntParamVO{" +
+ "infoOid='" + infoOid + '\'' +
+ ", paramKey='" + paramKey + '\'' +
+ ", paramValue='" + paramValue + '\'' +
+ ", usedFlag='" + usedFlag + '\'' +
+ ", usedFlagText='" + usedFlagText + '\'' +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
index 8f74d87..de9096b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
@@ -241,11 +241,11 @@
/***
* 鍙傛暟淇℃伅瀵硅薄
*/
- private List<SysIntParamVO> sysIntParamVOs;
+ private List<DockingSysIntParamVO> sysIntParamVOs;
/***
* header淇℃伅瀵硅薄
*/
- private List<SysIntHeaderVO> sysIntHeaderVOs;
+ private List<DockingSysIntHeaderVO> sysIntHeaderVOs;
public String getAuthorityOid() {
@@ -602,19 +602,19 @@
this.classifyName = classifyName;
}
- public List<SysIntParamVO> getSysIntParamVOs() {
+ public List<DockingSysIntParamVO> getSysIntParamVOs() {
return sysIntParamVOs;
}
- public void setSysIntParamVOs(List<SysIntParamVO> sysIntParamVOs) {
+ public void setSysIntParamVOs(List<DockingSysIntParamVO> sysIntParamVOs) {
this.sysIntParamVOs = sysIntParamVOs;
}
- public List<SysIntHeaderVO> getSysIntHeaderVOs() {
+ public List<DockingSysIntHeaderVO> getSysIntHeaderVOs() {
return sysIntHeaderVOs;
}
- public void setSysIntHeaderVOs(List<SysIntHeaderVO> sysIntHeaderVOs) {
+ public void setSysIntHeaderVOs(List<DockingSysIntHeaderVO> sysIntHeaderVOs) {
this.sysIntHeaderVOs = sysIntHeaderVOs;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java
deleted file mode 100644
index 8825e59..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.vci.ubcs.code.vo.pagemodel;
-
-import com.vci.ubcs.starter.revision.model.BaseModel;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
- *
- * @author weidy
- * @date 2022-04-11
- */
-public class SysIntHeaderVO extends BaseModel {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 4615707117938037102L;
-
- /**
- * SysIntInfoDO 鐨刼id
- */
- private String infoOid;
-
- /**
- * 鍙傛暟key
- */
- private String headerkey;
-
- /**
- * 鍙傛暟value
- */
- private String headeralue;
-
- /**
- * 鏄惁浣跨敤
- */
- private String usedflag;
-
-
- public String getInfoOid() {
- return infoOid;
- }
-
- public void setInfoOid(String infoOid) {
- this.infoOid = infoOid;
- }
-
- public String getHeaderkey() {
- return headerkey;
- }
-
- public void setHeaderkey(String headerkey) {
- this.headerkey = headerkey;
- }
-
- public String getHeaderalue() {
- return headeralue;
- }
-
- public void setHeaderalue(String headeralue) {
- this.headeralue = headeralue;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- @Override
- public String toString() {
- return "SysIntHeaderDO{" +
- "infoOid='" + infoOid + '\'' +
- ", headerkey='" + headerkey + '\'' +
- ", headeralue='" + headeralue + '\'' +
- ", usedflag='" + usedflag + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java
deleted file mode 100644
index 9ce2ae2..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.vci.ubcs.code.vo.pagemodel;
-
-
-import com.vci.ubcs.starter.revision.model.BaseModel;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
- *
- * @author weidy
- * @date 2022-04-11
- */
-public class SysIntParamVO extends BaseModel {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 4615707118871819648L;
-
- /**
- * SysIntInfoDO 鐨刼id
- */
- private String infoOid;
-
- /**
- * 鍙傛暟key
- */
- private String paramkey;
-
- /**
- * 鍙傛暟value
- */
- private String paramvalue;
-
- /**
- * 鏄惁浣跨敤
- */
- private String usedflag;
-
-
- public String getInfoOid() {
- return infoOid;
- }
-
- public void setInfoOid(String infoOid) {
- this.infoOid = infoOid;
- }
-
- public String getParamkey() {
- return paramkey;
- }
-
- public void setParamkey(String paramkey) {
- this.paramkey = paramkey;
- }
-
- public String getParamvalue() {
- return paramvalue;
- }
-
- public void setParamvalue(String paramvalue) {
- this.paramvalue = paramvalue;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- @Override
- public String toString() {
- return "SysIntParamDO{" +
- "infoOid='" + infoOid + '\'' +
- ", paramkey='" + paramkey + '\'' +
- ", paramvalue='" + paramvalue + '\'' +
- ", usedflag='" + usedflag + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
index 7637bda..84b8d0f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
@@ -122,4 +122,10 @@
*/
public static final String PL_CODE_SYSINTINFO = "PL_CODE_SYSINTINFO";
+ /**
+ * 闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠＄悊瀵硅薄
+ * platformbtm_sysintparemter
+ */
+ public static final String PL_CODE_SYSINTPAREMTER = "PL_CODE_SYSINTPAREMTER";
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index e3e0864..0ddb3ad 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSystemDTO;
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.entity.DockingSystem;
@@ -51,7 +52,7 @@
* @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
*@return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
*/
- @GetMapping("/gridSysIntBase")
+ @GetMapping("/gridDockingSystem")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "dockingSystem")
public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
@@ -64,8 +65,8 @@
* @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
- @PostMapping( "/addSave")
- public R<DockingSystemVO> addSave(@RequestBody DockingSystemDTO dockingSystemDTO){
+ @PostMapping( "/addSaveDockingSystem")
+ public R<DockingSystemVO> addSaveDockingSystem(@RequestBody DockingSystemDTO dockingSystemDTO){
boolean res= dockingSystemService.addSave(dockingSystemDTO);
return R.status(res);
}
@@ -76,8 +77,8 @@
* @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
- @PutMapping("/editSave")
- public R<DockingSystemVO> editSave(@RequestBody DockingSystemDTO dockingSystemDTO){
+ @PutMapping("/editSaveDockingSystem")
+ public R<DockingSystemVO> editSaveDockingSystem(@RequestBody DockingSystemDTO dockingSystemDTO){
DockingSystemVO dockingSystemVO = dockingSystemService.editSave(dockingSystemDTO);
return R.data(dockingSystemVO);
}
@@ -102,12 +103,26 @@
* @param DockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
*/
- @GetMapping("/gridSysIntInfo")
+ @GetMapping("/gridSystemConfig")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "DockingSystemConfig")
- public R<IPage<DockingSystemConfigVO>> gridSysIntInfo(DockingSystemConfig DockingSystemConfig, Query query){
+ public R<IPage<DockingSystemConfigVO>> gridSystemConfig(DockingSystemConfig DockingSystemConfig, Query query){
IPage<DockingSystemConfig> pages = dockingSystemConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
return R.data(DockingSystemConfigWrapper.build().pageVO(pages));
}
+ /**
+ * 澧炲姞 绯荤粺闆嗘垚鍩虹淇℃伅
+ * @param systemConfigDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping( "/addSaveSystemConfig")
+ public R addSaveSystemConfig(@RequestBody DockingSystemConfigDTO systemConfigDTO){
+ try {
+ boolean res = dockingSystemConfigService.addSave(systemConfigDTO);
+ return R.success("淇濆瓨鎴愬姛!");
+ }catch (Throwable e){
+ return R.fail("淇濆瓨澶辫触!");
+ }
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntHeaderMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntHeaderMapper.java
new file mode 100644
index 0000000..e3089c7
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntHeaderMapper.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.entity.DockingSysIntHeader;
+
+public interface DockingSysIntHeaderMapper extends BaseMapper<DockingSysIntHeader> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntParamMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntParamMapper.java
new file mode 100644
index 0000000..c489801
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntParamMapper.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.entity.DockingSysIntParam;
+
+public interface DockingSysIntParamMapper extends BaseMapper<DockingSysIntParam> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntHeaderService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntHeaderService.java
new file mode 100644
index 0000000..a781bf7
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntHeaderService.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.entity.DockingSysIntHeader;
+
+public interface IDockingSysIntHeaderService extends IService<DockingSysIntHeader> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntParamService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntParamService.java
new file mode 100644
index 0000000..7a22834
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntParamService.java
@@ -0,0 +1,8 @@
+package com.vci.ubcs.code.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.entity.DockingSysIntParam;
+
+public interface IDockingSysIntParamService extends IService<DockingSysIntParam> {
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
index 7a208c3..373ccab 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -1,8 +1,9 @@
package com.vci.ubcs.code.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.DockingSystem;
+import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.entity.DockingSystemConfig;
+import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
/***
* 绯荤粺鎺ュ彛绠＄悊-鎺ュ彛閰嶇疆鏈嶅姟
@@ -10,4 +11,20 @@
* @date 2023-06-01
*/
public interface IDockingSystemConfigService extends IService<DockingSystemConfig> {
+
+ /**
+ * 澧炲姞 绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�
+ * @param dockingSystemConfigDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO);
+ /**
+ * 淇敼 绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�
+ * @param dockingSystemConfigDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ DockingSystemVO editSave(DockingSystemConfigDTO dockingSystemConfigDTO);
+
+
+ boolean deleteDataById(String oids);
}
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 a3f53b6..c17b3a8 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
@@ -1,10 +1,18 @@
package com.vci.ubcs.code.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.service.ICodeDuckingSyncService;
+import com.vci.ubcs.code.service.IDockingSystemService;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/*
@@ -17,9 +25,16 @@
@Slf4j
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
+ @Resource
+ private IDockingSystemService dockingSystemService;
+
@Override
public void DockingDataSyncScheduing() {
+
+// insertCache2();
+ initPushDataTaks(1);
+ //sendpushDataForService();
}
@@ -32,5 +47,122 @@
public R sendData(String oids) {
return null;
}
+
+
+ /***
+ * 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
+ * @param type
+ */
+ private void initPushDataTaks(int type){
+// //initSysadmin();
+// //sysintinfo鏌ヨ瑕佹帹閫佺殑涓婚搴撳拰鐩稿叧绯荤粺淇℃伅
+// Map<String, String> conditionMap = new HashMap<>();
+// conditionMap.put("usedflag","true");
+// conditionMap.put("pushType",type==2?"2":"1") ;//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
+//
+// Wrappers wrappers=new Wrappers();
+//
+// List<DockingSystem> sysIntInfoVOList = dockingSystemService.list(Wrappers.query().lambda().eq());
+// if(CollectionUtils.isEmpty(sysIntInfoVOList)){
+// String title=type==2?"鍒嗙被鎺ㄩ��":"鏁版嵁鎺ㄩ��";
+// log.info("info->鎵�鏈夐泦鎴愮郴缁燂紝鏈煡璇㈠埌鐩稿叧鐨勩��"+title+"銆戠殑鎺ュ彛閰嶇疆淇℃伅锛岄厤缃�");
+// return;
+// }
+// Map<String ,List<DockingSystem>> sysIntInfoDOMap = new HashMap<String ,List<DockingSystem>>();//key=classifyoid,value=list<map>
+// for (SysIntInfoDO sysIntInfoVOi:sysIntInfoVOList){
+// List<SysIntInfoDO> SysIntInfoVOListi = sysIntInfoDOMap.get(sysIntInfoVOi.getClassifyoid());
+// if(SysIntInfoVOListi==null){
+// SysIntInfoVOListi = new ArrayList<SysIntInfoDO>();
+// }
+// SysIntInfoVOListi.add(sysIntInfoVOi);
+// sysIntInfoDOMap.put(sysIntInfoVOi.getClassifyoid(),SysIntInfoVOListi);
+// }
+// //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
+// VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingDataDO.class);
+// queryWrapperForDO.addQueryMap("sendflag","false");
+// if(type==2){
+// queryWrapperForDO.addQueryMap("btmTypeId",DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
+// }else {
+// queryWrapperForDO.addQueryMap("btmTypeId", QueryOptionConstant.NOTIN + "(" + VciBaseUtil.toInSql(DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT)) + ")");
+// }
+// List<DockingDataDO> dataList = dockingDataDaoI.selectByWrapper(queryWrapperForDO);
+//
+// for (DockingDataDO mapi:dataList){
+// WebUtil.setPersistence(false);
+// BatchCBO batchCBO = new BatchCBO();
+// String dataoid = mapi.getOid();//data瀵硅薄鐨刼id
+// String classifyoid = mapi.getClassifyoid();
+// String id = mapi.getId();
+// String uniquecode = mapi.getUniquecode();
+// String btmid = mapi.getBtmid();
+// String btmoid = mapi.getBtmoid();
+// String sendtype = mapi.getSendtype();
+// String classifyid = mapi.getClassifyid();
+// String classifyname = mapi.getClassifyname();
+// String curentClassOid=null;
+// if(type==2){
+// curentClassOid=btmoid;
+// }else{
+// curentClassOid=classifyoid;
+// }
+// List<SysIntInfoDO> effectiveSysIntInfoVOs=new ArrayList<>();
+// //鏍规嵁褰撳墠鏁版嵁鐨刬d锛屾煡璇㈣幏鍙栧摢浜涚郴缁熼渶瑕佸仛闆嗘垚
+// List<CodeClassifyDO> parentLeveDO= codeClassifyDaoI.selectAllLevelParentByOid(curentClassOid);
+// if(CollectionUtils.isEmpty(parentLeveDO)){
+// continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
+// }
+// Map<String, CodeClassifyDO> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
+//
+// oidCodeclassifyDOMap.keySet().forEach(oid->{
+// if(sysIntInfoDOMap.containsKey(oid)){
+// List<SysIntInfoDO> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
+// effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
+// }
+// });
+// //濡傛灉鏍￠獙鐨勭郴缁熸帴鍙ｄ俊鎭笉瀛樺湪锛屽垯鏁版嵁涓嶄笉寰�淇℃伅閲屾帹閫�
+// if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
+// continue;
+// }
+// List<DockingTaskDO> dockingTaskDO_insert = new ArrayList<DockingTaskDO>();
+// for (SysIntInfoDO sysIntInfoVOi:effectiveSysIntInfoVOs){
+// DockingTaskDO dockingTaskDO = new DockingTaskDO();
+// dockingTaskDO.setOid(redisService.getUUIDEveryDay());
+// dockingTaskDO.setSendflag(SEND_FLAG_FALSE);
+// dockingTaskDO.setId(id);//缂栫爜
+// dockingTaskDO.setUniquecode(uniquecode);
+// dockingTaskDO.setBtmoid(btmoid);//鏁版嵁oid
+// dockingTaskDO.setBtmid(btmid);//鏁版嵁涓氬姟绫诲瀷id
+// dockingTaskDO.setClassifyid(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
+// dockingTaskDO.setClassifyoid(classifyoid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
+// dockingTaskDO.setClassifyname(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
+// dockingTaskDO.setSendtype(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
+// dockingTaskDO.setDataoid(dataoid);
+//
+// //intinfo
+// dockingTaskDO.setSysinfooid(sysIntInfoVOi.getOid());//intinfo鐨刼id
+// dockingTaskDO.setSystemoid(sysIntInfoVOi.getSysbaseoid());//绯荤粺oid
+// dockingTaskDO.setSystemcode(sysIntInfoVOi.getSysbaseid());//绯荤粺缂栫爜
+// dockingTaskDO.setSystemname(sysIntInfoVOi.getSysbasename());//绯荤粺name
+// dockingTaskDO_insert.add(dockingTaskDO);
+// }
+//
+// BatchCBO bi = null;
+// if(dockingTaskDO_insert.size()!=0) {
+// bi = dockingTaskDaoI.batchInsert(dockingTaskDO_insert);
+// batchCBO.copyFromOther(bi);
+// }
+// WebUtil.setPersistence(true);
+// boService.persistenceBatch(batchCBO);
+// //dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
+// boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
+// if(!u){
+// log.error("闆嗘垚data鍒嗚В浠诲姟澶辫触锛乨ataoid:"+dataoid);
+// continue;
+// }
+//
+// }
+ }
+
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntHeaderServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntHeaderServiceImpl.java
new file mode 100644
index 0000000..b24b7b9
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntHeaderServiceImpl.java
@@ -0,0 +1,13 @@
+package com.vci.ubcs.code.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.DockingSysIntHeader;
+import com.vci.ubcs.code.mapper.DockingSysIntHeaderMapper;
+import com.vci.ubcs.code.service.IDockingSysIntHeaderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class DockingSysIntHeaderServiceImpl extends ServiceImpl<DockingSysIntHeaderMapper, DockingSysIntHeader> implements IDockingSysIntHeaderService {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntParamServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntParamServiceImpl.java
new file mode 100644
index 0000000..98a9f01
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntParamServiceImpl.java
@@ -0,0 +1,13 @@
+package com.vci.ubcs.code.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.DockingSysIntParam;
+import com.vci.ubcs.code.mapper.DockingSysIntParamMapper;
+import com.vci.ubcs.code.service.IDockingSysIntParamService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class DockingSysIntParamServiceImpl extends ServiceImpl<DockingSysIntParamMapper, DockingSysIntParam> implements IDockingSysIntParamService {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index 2341b7d..4d9af0a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -1,23 +1,156 @@
package com.vci.ubcs.code.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
+import com.vci.ubcs.code.dto.DockingSysIntHeaderDTO;
+import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
+import com.vci.ubcs.code.dto.DockingSysIntParamDTO;
+import com.vci.ubcs.code.entity.DockingSysIntHeader;
+import com.vci.ubcs.code.entity.DockingSysIntParam;
+import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.entity.DockingSystemConfig;
+import com.vci.ubcs.code.enumpack.SysIntegrationRequestTypeEnum;
+import com.vci.ubcs.code.mapper.DockingSysIntHeaderMapper;
+import com.vci.ubcs.code.mapper.DockingSysIntParamMapper;
import com.vci.ubcs.code.mapper.DockingSystemConfigMapper;
+import com.vci.ubcs.code.mapper.DockingSystemMapper;
+import com.vci.ubcs.code.service.IDockingSysIntHeaderService;
+import com.vci.ubcs.code.service.IDockingSysIntParamService;
import com.vci.ubcs.code.service.IDockingSystemConfigService;
+import com.vci.ubcs.code.vo.pagemodel.DockingSysIntHeaderVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Function;
+import java.util.*;
/***
* 绯荤粺鎺ュ彛绠＄悊-鎺ュ彛閰嶇疆鏈嶅姟
* @author xiejun
* @date 2023-06-01
*/
+@Slf4j
@Service
public class DockingSystemConfigServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDockingSystemConfigService{
+ /***
+ * 闆嗘垚绯荤粺绠＄悊鏈嶅姟
+ */
+ @Autowired(required = false)
+ private DockingSystemConfigMapper dockingSystemConfigMapper;
+
+ /***
+ * 闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠＄悊鍙傛暟鏈嶅姟
+ */
+ @Autowired(required = false)
+ private IDockingSysIntParamService dockingSysIntParamService;
+
+
+
+ /***
+ * 闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠＄悊鍙傛暟鏈嶅姟
+ */
+ @Autowired(required = false)
+ private IDockingSysIntHeaderService dockingSysIntHeaderService;
+
+
+ /***
+ * 闆嗘垚鎺ュ彛-闆嗘垚绯荤粺鏈嶅姟
+ */
+ @Autowired(required = false)
+ private DockingSystemMapper dockingSystemMapper;
+
+ /**
+ * 瀵硅薄鐨勬搷浣�
+ */
+ @Autowired
+ private RevisionModelUtil revisionModelUtil;
+ /**
+ * 澧炲姞绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�
+ * @param dockingSystemConfigDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) {
+ log.info(" 澧炲姞绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭�:"+dockingSystemConfigDTO.toString());
+ VciBaseUtil.alertNotNull(dockingSystemConfigDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
+ checkColumnNotNull(dockingSystemConfigDTO);
+ String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();
+ DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
+ dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
+ dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
+ dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
+ dockingSystemConfigDTO.setUsedFlag("true");//璁剧疆榛樿鍚敤鐘舵��
+
+ //灏咲TO杞崲涓篋O
+ DockingSystemConfig dockingSystemConfig = new DockingSystemConfig();
+ revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
+
+
+ List<DockingSysIntParamDTO> sysIntParamDTOList= dockingSystemConfigDTO.getSysIntParamDTOS();
+ List<DockingSysIntParam> sysIntParamList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(sysIntParamDTOList)) {
+ sysIntParamDTOList.stream().forEach(sysIntParamDTO -> {
+ DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
+ sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
+ BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO,MdmBtmTypeConstant.SYS_INT_PARAMTERY);
+ sysIntParamList.add(sysIntParamDO);
+ });
+ }
+ List<DockingSysIntHeaderDTO> sysIntHeaderDTOs= dockingSystemConfigDTO.getSysIntHeaderDTOS();
+ List<DockingSysIntHeader> sysIntHeaderList = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
+ sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
+ DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
+ sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
+ BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
+ sysIntHeaderList.add(dockingSysIntHeader);
+ });
+ }
+ dockingSysIntParamService.saveBatch(sysIntParamList);
+ dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
+ dockingSystemConfigMapper.insert(dockingSystemConfig);
+
+ return true;
+
+ }
+
+ @Override
+ public DockingSystemVO editSave(DockingSystemConfigDTO dockingSystemDTO) {
+ return null;
+ }
+
+ @Override
+ public boolean deleteDataById(String oids) {
+ return false;
+ }
+
+ /**
+ * 绯荤粺闆嗘垚鎺ュ彛鍩虹淇℃伅Null瀛楁妫�楠�
+ * @param dockingSystemConfigDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
+ * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
+ */
+ private void checkColumnNotNull(DockingSystemConfigDTO dockingSystemConfigDTO) throws VciBaseException {
+ if (SysIntegrationRequestTypeEnum.HTTP.getValue().equals(dockingSystemConfigDTO.getInterfaceType())){
+ VciBaseUtil.alertNotNull(dockingSystemConfigDTO.getRequestUrl(),"HTTP鎺ュ彛鐨勮姹傚湴鍧�",dockingSystemConfigDTO.getRequestMethod(),"HTTP鎺ュ彛鐨勮姹傛柟寮�");
+ }
+ if (SysIntegrationRequestTypeEnum.WEB_SERVICE.getValue().equals(dockingSystemConfigDTO.getInterfaceType())){
+ VciBaseUtil.alertNotNull(dockingSystemConfigDTO.getInterfaceFunction(),"WebService鐨勬帴鍙ｅ嚱鏁�");
+ }
+ if (SysIntegrationRequestTypeEnum.CLASSPATH.getValue().equals(dockingSystemConfigDTO.getInterfaceType())){
+ VciBaseUtil.alertNotNull(dockingSystemConfigDTO.getClassPath(),"绫昏矾寰�");
+ }
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingTaskServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingTaskServiceImpl.java
index d9d9908..b104c18 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingTaskServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingTaskServiceImpl.java
@@ -1,9 +1,7 @@
package com.vci.ubcs.code.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.CodeClassifyValue;
import com.vci.ubcs.code.entity.DockingTask;
-import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
import com.vci.ubcs.code.mapper.DockingTaskMapper;
import com.vci.ubcs.code.service.IDockingTaskService;
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 c324801..4d865ed 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
@@ -1895,9 +1895,30 @@
getFieldIndexMap(titleRowData, attrNameIdMap, fieldIndexMap);
Map<String, String> cboOidMap = new HashMap<>();
cboOidMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])) + ")");
- R<BtmTypeVO> r= btmTypeClient.getDetail(templateVO.getBtmTypeId());
- BtmTypeVO btmTypeVO =r.getData();
- String tableName=btmTypeVO.getTableName();
+ String tableName ="";
+ try {
+ R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
+ if(r.getCode()!=200) {
+ throw new Throwable(r.getMsg());
+ }
+ BtmTypeVO btmTypeVO = r.getData();
+ if (btmTypeVO == null) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
+ }
+ tableName = btmTypeVO.getTableName();
+ if (StringUtils.isBlank(tableName)) {
+ throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
+ }
+ }catch (Throwable e){
+ log.error("鏌ヨ涓氬姟瀵硅薄琛�"+e);
+ XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
+ xmlResultDataObjectDetailDO.setErrorid("103");
+ xmlResultDataObjectDetailDO.setMsg("鏌ヨ涓氬姟瀵硅薄琛�"+e);
+ xmlResultDataObjectDetailDO.setId("");
+ xmlResultDataObjectDetailDO.setCode("");
+ resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+ return;
+ }
StringBuffer sb=new StringBuffer();
sb.append(" select * from ");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntHeaderWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntHeaderWrapper.java
new file mode 100644
index 0000000..db46ab7
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntHeaderWrapper.java
@@ -0,0 +1,67 @@
+package com.vci.ubcs.code.wrapper;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.vci.ubcs.code.entity.DockingSysIntHeader;
+import com.vci.ubcs.code.vo.pagemodel.DockingSysIntHeaderVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+public class DockingSysIntHeaderWrapper extends BaseEntityWrapper<DockingSysIntHeader, DockingSysIntHeaderVO> {
+ public static DockingSysIntHeaderWrapper build() {
+ return new DockingSysIntHeaderWrapper();
+ }
+ @Override
+ public DockingSysIntHeaderVO entityVO(DockingSysIntHeader entity) {
+ DockingSysIntHeaderVO vo = Objects.requireNonNull(BeanUtil.copy(entity, DockingSysIntHeaderVO.class));
+ return vo;
+ }
+
+ /***
+ * 鏁扮粍瀵硅薄杞崲
+ * @param entitys
+ * @return
+ */
+ public List<DockingSysIntHeaderVO> entityVOs(Collection<DockingSysIntHeader> entitys) {
+ if(CollectionUtils.isEmpty(entitys)) {
+ return new ArrayList<>();
+ }
+ List<DockingSysIntHeaderVO> vos=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(entitys)) {
+ entitys.stream().forEach(DockingSystem -> {
+ vos.add(entityVO(DockingSystem));
+ });
+ }
+ return vos;
+ }
+
+ /***
+ * 鏁扮粍瀵硅薄杞崲
+ * @param vos
+ * @return
+ */
+ public List<DockingSysIntHeader> voentitys(Collection<DockingSysIntHeaderVO> vos) {
+ if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
+ List<DockingSysIntHeader>entitys =new ArrayList<>();
+ if(!CollectionUtils.isEmpty(vos)) {
+ vos.stream().forEach(entity -> {
+ entitys.add(voentity(entity));
+ });
+ }
+ return entitys;
+ }
+
+ /***
+ * 鏁扮粍瀵硅薄杞崲
+ * @param vo
+ * @return
+ */
+ public DockingSysIntHeader voentity(DockingSysIntHeaderVO vo) {
+ DockingSysIntHeader entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingSysIntHeader.class));
+ return entity;
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntParamWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntParamWrapper.java
new file mode 100644
index 0000000..f1cac56
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntParamWrapper.java
@@ -0,0 +1,69 @@
+package com.vci.ubcs.code.wrapper;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.vci.ubcs.code.entity.DockingSysIntParam;
+import com.vci.ubcs.code.vo.pagemodel.DockingSysIntParamVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+public class DockingSysIntParamWrapper extends BaseEntityWrapper<DockingSysIntParam, DockingSysIntParamVO> {
+
+
+ public static DockingSysIntParamWrapper build() {
+ return new DockingSysIntParamWrapper();
+ }
+ @Override
+ public DockingSysIntParamVO entityVO(DockingSysIntParam entity) {
+ DockingSysIntParamVO vo = Objects.requireNonNull(BeanUtil.copy(entity, DockingSysIntParamVO.class));
+ return vo;
+ }
+
+ /***
+ * 鏁扮粍瀵硅薄杞崲
+ * @param entitys
+ * @return
+ */
+ public List<DockingSysIntParamVO> entityVOs(Collection<DockingSysIntParam> entitys) {
+ if(CollectionUtils.isEmpty(entitys)) {
+ return new ArrayList<>();
+ }
+ List<DockingSysIntParamVO> vos=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(entitys)) {
+ entitys.stream().forEach(DockingSystem -> {
+ vos.add(entityVO(DockingSystem));
+ });
+ }
+ return vos;
+ }
+
+ /***
+ * 鏁扮粍瀵硅薄杞崲
+ * @param vos
+ * @return
+ */
+ public List<DockingSysIntParam> voentitys(Collection<DockingSysIntParamVO> vos) {
+ if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
+ List<DockingSysIntParam>entitys =new ArrayList<>();
+ if(!CollectionUtils.isEmpty(vos)) {
+ vos.stream().forEach(entity -> {
+ entitys.add(voentity(entity));
+ });
+ }
+ return entitys;
+ }
+
+ /***
+ * 鏁扮粍瀵硅薄杞崲
+ * @param vo
+ * @return
+ */
+ public DockingSysIntParam voentity(DockingSysIntParamVO vo) {
+ DockingSysIntParam entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingSysIntParam.class));
+ return entity;
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntParamMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntParamMapper.xml
new file mode 100644
index 0000000..2695019
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntParamMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.DockingSysIntParamMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="plDockingSysIntParamResultMap" type="com.vci.ubcs.code.entity.DockingSysIntParam">
+ <result column="OID" property="oid"/>
+ <result column="REVISIONOID" property="revisionOid"/>
+ <result column="NAMEOID" property="nameOid"/>
+ <result column="BTMNAME" property="btmname"/>
+ <result column="LASTR" property="lastR"/>
+ <result column="FIRSTR" property="firstR"/>
+ <result column="LASTV" property="lastV"/>
+ <result column="FIRSTV" property="firstV"/>
+ <result column="CREATOR" property="creator"/>
+ <result column="CREATETIME" property="createTime"/>
+ <result column="LASTMODIFIER" property="lastModifier"/>
+ <result column="LASTMODIFYTIME" property="lastModifyTime"/>
+ <result column="REVISIONRULE" property="revisionRule"/>
+ <result column="VERSIONRULE" property="versionRule"/>
+ <result column="REVISIONSEQ" property="revisionSeq"/>
+ <result column="REVISIONVALUE" property="revisionValue"/>
+ <result column="VERSIONSEQ" property="versionSeq"/>
+ <result column="VERSIONVALUE" property="versionValue"/>
+ <result column="LCTID" property="lctid"/>
+ <result column="LCSTATUS" property="lcStatus"/>
+ <result column="TS" property="ts"/>
+ <result column="ID" property="id"/>
+ <result column="NAME" property="name"/>
+ <result column="DESCRIPTION" property="description"/>
+ <result column="OWNER" property="owner"/>
+ <result column="COPYFROMVERSION" property="copyFromVersion"/>
+
+ <result column="INFOOID" property="infoOid"/>
+ <result column="PARAMKEY" property="paramKey"/>
+ <result column="PARAMVALUE" property="paramValue"/>
+ <result column="USEDFLAG" property="usedFlag"/>
+ <result column="tenant_id" property="tenantId"/>
+
+ <result column="tenant_id" property="tenantId"/>
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.3