From f56aebe1dc0d462815e5d7a7e1571504fa38ee2b Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 30 五月 2023 11:05:50 +0800
Subject: [PATCH] 属性映射界面同步按钮接口增加
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 63 +++++++++++++++++++++++++++++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java | 10 ++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java | 5 +-
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 18 +++++++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java | 13 ++++--
5 files changed, 101 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index 22951d0..2195b67 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -5,6 +5,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.webservice.service.*;
import com.vci.ubcs.code.webservice.wrapper.DockingPreApplyFormWrapper;
+import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
@@ -12,6 +13,7 @@
import com.vci.ubcs.code.webservice.vo.DockingPreApplyFormVO;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -144,4 +146,20 @@
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
+
+ /***
+ * 鍚屾闆嗗洟妯″瀷瑙嗗浘
+ * @return 杩斿洖鎵ц缁撴灉淇℃伅
+ */
+ @PostMapping( "/applyGroupCode")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鍚屾闆嗗洟妯″瀷瑙嗗浘", notes = "鍚屾闆嗗洟妯″瀷瑙嗗浘->all:鍚屾闆嗗洟涓绘ā鍨�,one:鍚屾闆嗗洟妯″瀷璇︾粏淇℃伅")
+ public R syncClassifyModel(String classifyId,String operationType){
+ try {
+ return groupMdmInterService.syncClassifyModel(classifyId,operationType);
+ }catch (VciBaseException e){
+ return R.fail("鍚屾闆嗗洟妯″瀷瑙嗗浘澶辫触锛�"+e.getMessage());
+ }
+
+ }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
index 83e37e6..00fa4b3 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import org.springblade.core.tool.api.R;
import java.util.List;
@@ -35,7 +37,13 @@
*/
public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingDTOS)throws Exception;
-
+ /***
+ *鏍￠獙灞炴�ф槧灏勬槸鍚﹂厤缃繃
+ * @param targetClassifyId
+ * @return
+ */
boolean checkHasConfigByTragetCodeclassifyId(String targetClassifyId);
+
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
index 9dc936c..257c2c6 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.webservice.service;
+import com.vci.ubcs.starter.exception.VciBaseException;
import org.springblade.core.tool.api.R;
/***
@@ -13,7 +14,7 @@
* @param oids
* @param btmName
* @return 杩斿洖缁撴灉淇℃伅
- * @throws Exception
+ * @throws Throwable
*/
public R applyGroupCode(String oids, String btmName)throws Throwable;
@@ -36,13 +37,17 @@
public R queryClassModel(String jtclsfId)throws Throwable;
-
/***
* 鏌ヨ鍒嗙被璇︾粏妯″瀷瑙嗗浘
- * @param jtclsfId锛氶泦鍥㈠垎绫籵id
* @return 杩斿洖缁撴灉淇℃伅
* @throws Throwable
*/
public R queryMdmModel()throws Throwable;
-
+ /***
+ *鍚屾闆嗗洟妯″瀷瑙嗗浘
+ * @param classifyId
+ * @param operationType
+ * @return
+ */
+ R syncClassifyModel(String classifyId, String operationType)throws VciBaseException;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 8764874..cfaa96a 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -19,7 +19,9 @@
import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
+import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,8 +38,6 @@
*/
@Service
public class DockingPreAttrMappingServiceImpl extends ServiceImpl<DockingPreAttrMappingMapper, DockingPreAttrMapping> implements IDockingPreAttrMappingService {
-
-
/***
* 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
@@ -207,6 +207,7 @@
}
+
/***
* 瀵硅薄杞崲
* @param dockingPreAttrMappings
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
index b5c4500..b0b17d6 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
@@ -326,7 +326,7 @@
* @throws VciBaseException
*/
@Override
- public R queryClassModel(String groupClassifyId) throws VciBaseException {
+ public R queryClassModel(String groupClassifyId) throws Throwable {
log.info("鑾峰彇闆嗗洟妯″瀷璇︾粏淇℃伅鎵ц淇濆瓨start");
String message="鎵ц鎴愬姛锛�";
try {
@@ -480,6 +480,67 @@
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd");
return R.success(message);
}
+
+ /***
+ * 鍚屾闆嗗洟妯″瀷淇℃伅
+ * @param classifyId
+ * @param operationType
+ * @return 杩斿洖鎵ц缁撴灉
+ * @throws VciBaseException
+ */
+ @Override
+ public R syncClassifyModel(String classifyId, String operationType) throws VciBaseException {
+ VciBaseUtil.alertNotNull(operationType,"闆嗘垚鎿嶄綔绫诲瀷");
+ try {
+ if(operationType.equals("all")){
+ return queryMdmModel();
+ }else{
+ VciBaseUtil.alertNotNull(classifyId,"闆嗗洟鍒嗙被涓婚敭");
+ return queryClassModel(classifyId);
+ }
+ } catch (Throwable e) {
+ throw new VciBaseException(e.getMessage());
+ }
+ }
+
+// /**
+// * 鍚屾涓绘ā鍨�
+// * @return
+// */
+// private String queryMdmModel() throws VciBaseException {
+// String message="鎵ц鎴愬姛锛�";
+// try {
+//
+//
+// }catch (VciBaseException e){
+// message=e.getMessage();
+// throw new VciBaseException(message);
+// }finally {
+// return message;
+// }
+//
+//
+// }
+//
+// /***
+// * 鍚屾妯″瀷璇︾粏淇℃伅
+// * @param classifyId
+// * @return
+// */
+// private String queryClassModel(String classifyId)throws VciBaseException{
+// String message="鎵ц鎴愬姛锛�";
+// try {
+//
+// }catch (VciBaseException e){
+// message=e.getMessage();
+// throw new VciBaseException(message);
+// }finally {
+// return message;
+// }
+//
+// }
+
+
/***
* 缁勭粐 淇濆瓨鏁版嵁鏂规硶
*
--
Gitblit v1.9.3