From 375041c3d6d2ecb2228dcaa3cbefa079da40a8dd Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 24 八月 2023 15:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java | 166 ++++++++++++++++++++++++++-----------------------------
1 files changed, 79 insertions(+), 87 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
index 066dbe1..bdf2f81 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
@@ -1,18 +1,18 @@
package com.vci.ubcs.omd.service;
import com.vci.ubcs.omd.dto.BtmTypeDTO;
-import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
import com.vci.ubcs.omd.entity.BtmType;
-import com.vci.ubcs.omd.entity.BtmTypeAttribute;
-import com.vci.ubcs.omd.entity.ModifyAttributeInfoDO;
+import com.vci.ubcs.omd.entity.ModifyAttributeInfo;
+import com.vci.ubcs.omd.vo.BtmTreeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.omd.vo.LinkTypeVO;
+import io.swagger.models.auth.In;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
import java.util.Collection;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -170,24 +170,6 @@
boolean checkBtmTypeUseds(Collection<String> oidCollection) throws ServiceException;
/**
- * 娣诲姞涓氬姟绫诲瀷
- * @param btmTypeDTO 涓氬姟绫诲瀷鏁版嵁浼犺緭瀵硅薄
- * @param autoCreateTable 鏄惁鑷姩鍒涘缓琛ㄦ牸
- * @return 娣诲姞鍚庣殑涓氬姟绫诲瀷
- * @throws ServiceException 娣诲姞鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- BtmTypeDTO addSave(BtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException;
-
- /**
- * 淇敼涓氬姟绫诲瀷
- * @param btmTypeDTO 涓氬姟绫诲瀷鏁版嵁浼犺緭瀵硅薄
- * @param autoEditTable 鏄惁鑷姩鏇存柊琛ㄦ牸
- * @return 淇敼鍚庣殑涓氬姟绫诲瀷
- * @throws ServiceException 淇敼鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- BtmTypeDTO editSave(BtmTypeDTO btmTypeDTO, boolean autoEditTable) throws ServiceException;
-
- /**
* 鍒犻櫎涓氬姟绫诲瀷
* @param btmTypeVO 涓氬姟绫诲瀷鏄剧ず瀵硅薄
* @param autoDeleteTable 鑷姩鍒犻櫎琛ㄦ牸
@@ -209,82 +191,92 @@
* @return 涓嶅悓鐨勫睘鎬т俊鎭�
* @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
*/
- List<ModifyAttributeInfoDO> checkDbTableSame(String pkBtmType) throws ServiceException;
+ List<ModifyAttributeInfo> checkDbTableSame(String pkBtmType) throws ServiceException;
/**
* 鑾峰彇鏁版嵁搴撹〃锛屾敮鎸佷笟鍔＄被鍨嬪拰瑙嗗浘
* @param id 涓氬姟绫诲瀷鐨勫悕绉�
+ * @param domain 棰嗗煙鍚嶇О
* @return 鏁版嵁搴撹〃鐨勫悕绉�
* @throws ServiceException 鍙傛暟涓虹┖鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- String getTableName(String id) throws ServiceException;
-
- /**
- * 灏嗕笟鍔＄被鍨嬩娇鐢ㄧ殑灞炴�х殑浼犺緭瀵硅薄杞崲涓烘暟鎹璞�
- * @param attributesDTO 灞炴�х殑鏁版嵁浼犺緭瀵硅薄
- * @param pkBtmType 涓氬姟绫诲瀷鐨勪富閿�
- * @param creator 鍒涘缓浜�
- * @param now 褰撳墠鏃堕棿
- * @return 灞炴�х殑鏁版嵁瀵硅薄
- */
- BtmTypeAttribute btmTypeAttributeDTO2DO(BtmTypeLinkAttributesDTO attributesDTO, String pkBtmType, String creator, Date now);
-
- /**
- * 涓氬姟绫诲瀷鐨勫睘鎬ф樉绀哄璞¤浆鎹负鏁版嵁瀵硅薄
- * @param thisBtmTypeHasAttributeVOList 涓氬姟绫诲瀷灞炴�ф樉绀哄璞�
- * @return 鏁版嵁瀵硅薄
- */
- List<BtmTypeAttribute> btmTypeAttributeVO2DO(List<BtmTypeAttributeVO> thisBtmTypeHasAttributeVOList);
-
- /**
- * 鎵归噺灏嗕笟鍔＄被鍨嬬殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param attributeDOList 灞炴�х殑鏁版嵁瀵硅薄鍒楄〃
- * @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
- */
- List<BtmTypeAttributeVO> batchBtmTypeAttributeDO2VO(List<BtmTypeAttribute> attributeDOList);
-
- /**
- * 鎵归噺灏嗕笟鍔＄被鍨嬬殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param attributesDO 灞炴�х殑鏁版嵁瀵硅薄
- * @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
- */
- BtmTypeAttributeVO btmTypeAttributeDO2VO(BtmTypeAttribute attributesDO);
-
- /**
- * 鑾峰彇涓氬姟绫诲瀷鐨勬寚瀹氬睘鎬�
- * @param id 閾炬帴绫诲瀷鐨勮嫳鏂囧悕绉�
- * @param attributeIdCollection 灞炴�х殑闆嗗悎锛屽鏋滀负绌哄垯鑾峰彇鍏ㄩ儴
- * @return 灞炴�х殑鏄剧ず瀵硅薄
- */
- List<BtmTypeAttribute> listAttributeDOByIdsForBtm(String id, Collection<String> attributeIdCollection);
-
- /**
- * 鏍规嵁涓氬姟绫诲瀷鐨勭紪鍙疯幏鍙栧睘鎬�
- * @param id 涓氬姟绫诲瀷鐨勭紪鍙�
- * @return 灞炴�х殑鏄剧ず瀵硅薄
- */
- List<BtmTypeAttributeVO> listAttributeByBtmTypeId(String id);
-
- /**
- * 鏍规嵁涓氬姟绫诲瀷鐨勪富閿幏鍙栧睘鎬�
- * @param oid 涓氬姟绫诲瀷鐨勪富閿�
- * @return 灞炴�х殑鏄剧ず瀵硅薄
- */
- List<BtmTypeAttributeVO> listAttributeByBtmTypeOid(String oid);
-
- /**
- * 鎵归噺鏍规嵁涓氬姟绫诲瀷缂栧彿鎴栬�呬富閿幏鍙栧寘鍚殑灞炴��
- * @param oidsOrIds 涓婚敭鎴栬�呯紪鍙烽泦鍚�
- * @param queryById 鏄惁浣跨敤缂栧彿鏌ヨ
- * @return key鏄笟鍔＄被鍨嬬殑涓婚敭鎴栬�呯紪鍙凤紝鍊兼槸鍖呭惈鐨勫睘鎬х殑淇℃伅
- * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欎細鎶涘嚭寮傚父
- */
- List<BtmTypeAttributeVO> batchListAttributeByBtmType(Collection<String> oidsOrIds, boolean queryById) throws ServiceException;
+ String getTableName(String id,String domain) throws ServiceException;
/**
* 鏂板鎴栦慨鏀逛笟鍔＄被鍨�
* @param btmTypeDTO 涓氬姟绫诲瀷椤甸潰浼犺緭瀵硅薄
+ * @param autoCreateTable 鑷姩鍒涘缓琛�
* @return 鎵ц缁撴灉
*/
- boolean submit(BtmTypeDTO btmTypeDTO);
+ R submit(BtmTypeDTO btmTypeDTO,boolean autoCreateTable);
+
+ /**
+ * 鎸塪omain鍒嗙粍锛屾煡璇笟鍔＄被鍨嬪睘鎬х粨鏋�
+ * @return 鏌ヨ缁撴灉
+ */
+ List<BtmTreeVO> treeDomain();
+
+ /**
+ * 浠庢暟鎹簱琛ㄤ腑鑾峰彇
+ * @param domain 棰嗗煙鍊�
+ * @return 璇诲彇缁撴灉
+ */
+ List<BtmTypeVO> getFromTable(String domain);
+
+ /**
+ * 閫夋嫨鏁版嵁搴撹〃淇濆瓨涓轰笟鍔＄被鍨�
+ * @param btmTypeDTOList 椤甸潰浼犺緭瀵硅薄
+ * @param domain 棰嗗煙
+ * @return 鎵ц缁撴灉
+ */
+ List<BtmTypeVO> saveFromTable(List<BtmTypeDTO> btmTypeDTOList,String domain);
+
+ /**
+ * 鎸夌収涓氬姟绫诲瀷id鑾峰彇榛樿灞炴��
+ * @param btmTypeId 涓氬姟绫诲瀷id
+ * @return 涓氬姟绫诲瀷
+ */
+ BtmTypeVO getDefaultAttrByBtmId(String btmTypeId);
+
+ /**
+ * 鎸夌収涓氬姟绫诲瀷id鑾峰彇鎵�鏈夌殑灞炴��
+ * @param btmTypeId 涓氬姟绫诲瀷id
+ * @return 涓氬姟绫诲瀷
+ */
+ BtmTypeVO getAllAttributeByBtmId(String btmTypeId);
+
+ /**
+ * 鎸夌収涓氬姟绫诲瀷涓婚敭鑾峰彇鎵�鏈夌殑灞炴��
+ * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
+ * @return 涓氬姟绫诲瀷
+ */
+ BtmTypeVO getAllAttributeByBtmOid(String btmTypeOid);
+
+ /**
+ * 鑾峰彇寮曠敤鏌愪釜鐢熷懡鍛ㄦ湡鐨勪笟鍔＄被鍨�
+ * @param lifeId 鐢熷懡鍛ㄦ湡鐨勭紪鍙�
+ * @return 涓氬姟绫诲瀷鏄剧ず瀵硅薄
+ */
+ List<BtmTypeVO> selectByLifeId(String lifeId);
+
+ /**
+ * 鑾峰彇寮曠敤鏌愪簺鐢熷懡鍛ㄦ湡鐨勪笟鍔＄被鍨�
+ * @param lifeIds 鐢熷懡鍛ㄦ湡鐨勭紪鍙烽泦鍚�
+ * @return 涓氬姟绫诲瀷鏄剧ず瀵硅薄
+ */
+ List<BtmTypeVO> selectByLifeIds(Collection<String> lifeIds);
+
+ /**
+ * 缁熻寮曠敤鏌愪釜鐢熷懡鍛ㄦ湡鐨勪笟鍔＄被鍨�
+ * @param lifeId 鐢熷懡鍛ㄦ湡鐨勭紪鍙�
+ * @return 涓暟
+ */
+ Integer countByLifeId(String lifeId);
+
+ /**
+ * 缁熻寮曠敤鏌愪簺鐢熷懡鍛ㄦ湡鐨勪笟鍔＄被鍨�
+ * @param lifeIds 鐢熷懡鍛ㄦ湡鐨勭紪鍙烽泦鍚�
+ * @return 涓暟
+ */
+ Integer countByLifeIds(Collection<String> lifeIds);
}
--
Gitblit v1.9.3