From 3cb0cef6f7189dcbb537df52cef5921d1d2c3cd9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 26 四月 2023 00:12:23 +0800
Subject: [PATCH] 代码整合

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java |   72 ++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
similarity index 75%
rename from Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeService.java
rename to Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
index 275d3de..066dbe1 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IOmdBtmTypeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeService.java
@@ -1,13 +1,13 @@
 package com.vci.ubcs.omd.service;
 
-import com.vci.ubcs.omd.dto.OmdBtmTypeDTO;
-import com.vci.ubcs.omd.dto.OmdBtmTypeLinkAttributesDTO;
-import com.vci.ubcs.omd.entity.OmdBtmType;
-import com.vci.ubcs.omd.entity.OmdBtmTypeAttribute;
-import com.vci.ubcs.omd.entity.OsModifyAttributeInfoDO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeVO;
-import com.vci.ubcs.omd.vo.OmdBtmTypeAttributeVO;
-import com.vci.ubcs.omd.vo.OsLinkTypeVO;
+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.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.LinkTypeVO;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseService;
 
@@ -21,7 +21,7 @@
  * @author weidy
  * @date 2019/10/13 2:33 PM
  */
-public interface IOmdBtmTypeService extends BaseService<OmdBtmType> {
+public interface IBtmTypeService extends BaseService<BtmType> {
 
     /**
      * 璁剧疆骞冲彴鏈韩鐨勪笟鍔$被鍨�
@@ -35,7 +35,7 @@
      * @return 涓氬姟绫诲瀷锛屽鏋滀笉瀛樺湪浼氳繑鍥瀗ull
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    OmdBtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException;
+    BtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException;
 
     /**
      * 鏍规嵁涓婚敭鎵归噺鑾峰彇涓氬姟绫诲瀷
@@ -43,7 +43,7 @@
      * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    List<OmdBtmTypeVO> listBtmTypeByOids(String pkBtmTypes) throws ServiceException;
+    List<BtmTypeVO> listBtmTypeByOids(String pkBtmTypes) throws ServiceException;
 
     /**
      * 鎵归噺鏍规嵁涓婚敭鑾峰彇涓氬姟绫诲瀷
@@ -51,7 +51,7 @@
      * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    List<OmdBtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) throws ServiceException;
+    List<BtmTypeVO> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) throws ServiceException;
 
     /**
      * 鏍规嵁鑻辨枃鍚嶇О鑾峰彇涓氬姟绫诲瀷
@@ -59,7 +59,7 @@
      * @return 涓氬姟绫诲瀷锛屽鏋滀笉瀛樺湪浼氳繑鍥瀗ull
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    OmdBtmTypeVO getBtmTypeById(String id) throws ServiceException;
+    BtmTypeVO getBtmTypeById(String id) throws ServiceException;
 
     /**
      * 鏍规嵁鑻辨枃鍚嶇О鎵归噺鑾峰彇涓氬姟绫诲瀷
@@ -67,7 +67,7 @@
      * @return  涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    List<OmdBtmTypeVO> listBtmTypeByIds(String ids) throws ServiceException;
+    List<BtmTypeVO> listBtmTypeByIds(String ids) throws ServiceException;
 
     /**
      * 鏍规嵁鑻辨枃鍚嶇О闆嗗悎鎵归噺鑾峰彇涓氬姟绫诲瀷
@@ -75,7 +75,7 @@
      * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    List<OmdBtmTypeVO> listBtmTypeByIdCollection(Collection<String> idCollection) throws ServiceException;
+    List<BtmTypeVO> listBtmTypeByIdCollection(Collection<String> idCollection) throws ServiceException;
 
     /**
      * 鏍规嵁鑻辨枃鍚嶇О闆嗗悎鎵归噺鑾峰彇涓氬姟绫诲瀷鐨勬暟鎹璞�
@@ -83,7 +83,7 @@
      * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
      * @throws ServiceException  鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    List<OmdBtmType> listBtmTypeDOByIdCollection(Collection<String> idCollection) throws ServiceException;
+    List<BtmType> listBtmTypeDOByIdCollection(Collection<String> idCollection) throws ServiceException;
 
     /**
      * 鏍规嵁涓婚敭闆嗗悎鎵归噺鑾峰彇涓氬姟绫诲瀷鐨勬暟鎹璞�
@@ -91,7 +91,7 @@
      * @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
      * @throws ServiceException  鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    List<OmdBtmType> listBtmTypeDOByOidCollection(Collection<String> oidCollection) throws ServiceException;
+    List<BtmType> listBtmTypeDOByOidCollection(Collection<String> oidCollection) throws ServiceException;
 
     /**
      * 鏍规嵁涓氬姟绫诲瀷涓婚敭鑾峰彇涓枃鍚嶇О
@@ -115,7 +115,7 @@
      * @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺灞炴��
      * @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栨煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇�
      */
-    List<OmdBtmTypeAttributeVO> listHasAttributesByOid(String oid) throws ServiceException;
+    List<BtmTypeAttributeVO> listHasAttributesByOid(String oid) throws ServiceException;
 
     /**
      * 鏍规嵁涓氬姟绫诲瀷鑻辨枃鍚嶇О鑾峰彇鍏宠仈鐨勬墍鏈夊睘鎬у璞�
@@ -123,7 +123,7 @@
      * @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺鍐呯疆灞炴��
      * @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
      */
-    List<OmdBtmTypeAttributeVO> listHasAttributeById(String id) throws ServiceException;
+    List<BtmTypeAttributeVO> listHasAttributeById(String id) throws ServiceException;
 
     /**
      * 鏍规嵁涓氬姟绫诲瀷涓婚敭鑾峰彇鍏宠仈鐨勬墍鏈夊睘鎬у璞�
@@ -132,7 +132,7 @@
      * @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺鍐呯疆灞炴�э紝key鏄笟鍔$被鍨嬩富閿紝value鏄寘鍚殑灞炴��
      * @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
      */
-    Map<String,List<OmdBtmTypeAttributeVO>> batchListHasAttributesByOidCollection(Collection<String> oidCollection) throws ServiceException;
+    Map<String,List<BtmTypeAttributeVO>> batchListHasAttributesByOidCollection(Collection<String> oidCollection) throws ServiceException;
 
     /**
      * 鏍规嵁涓氬姟绫诲瀷鑻辨枃鍚嶇О鑾峰彇鍏宠仈鐨勬墍鏈夊睘鎬у璞�
@@ -141,7 +141,7 @@
      * @return 鎵�鏈夌殑灞炴�у璞★紝鍖呮嫭绯荤粺鍐呯疆灞炴�э紝key鏄笟鍔$被鍨嬩富閿紝value鏄寘鍚殑灞炴��
      * @throws ServiceException 涓氬姟绫诲瀷涓嶅瓨鍦紝鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
      */
-    Map<String,List<OmdBtmTypeAttributeVO>> batchListHasAttributesByIdCollection(Collection<String> idCollection) throws ServiceException;
+    Map<String,List<BtmTypeAttributeVO>> batchListHasAttributesByIdCollection(Collection<String> idCollection) throws ServiceException;
 
 
     /**
@@ -150,7 +150,7 @@
      * @return 寮曠敤鐨勯摼鎺ョ被鍨�
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
      */
-    List<OsLinkTypeVO> listLinkTypeForUsedBtmType(String pkBtmType) throws ServiceException;
+    List<LinkTypeVO> listLinkTypeForUsedBtmType(String pkBtmType) throws ServiceException;
 
     /**
      * 鏍¢獙涓氬姟绫诲瀷鏄惁琚紩鐢�
@@ -176,7 +176,7 @@
      * @return 娣诲姞鍚庣殑涓氬姟绫诲瀷
      * @throws ServiceException 娣诲姞鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    OmdBtmTypeDTO addSave(OmdBtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException;
+    BtmTypeDTO addSave(BtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException;
 
     /**
      * 淇敼涓氬姟绫诲瀷
@@ -185,7 +185,7 @@
      * @return 淇敼鍚庣殑涓氬姟绫诲瀷
      * @throws ServiceException 淇敼鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    OmdBtmTypeDTO editSave(OmdBtmTypeDTO btmTypeDTO, boolean autoEditTable) throws ServiceException;
+    BtmTypeDTO editSave(BtmTypeDTO btmTypeDTO, boolean autoEditTable) throws ServiceException;
 
     /**
      * 鍒犻櫎涓氬姟绫诲瀷
@@ -193,7 +193,7 @@
      * @param autoDeleteTable 鑷姩鍒犻櫎琛ㄦ牸
      * @throws ServiceException 濡傛灉涓氬姟绫诲瀷琚紩鐢紝鎴栬�呭垹闄ゅ嚭閿欐椂浼氭姏鍑哄紓甯�
      */
-    void delete(OmdBtmTypeVO btmTypeVO,boolean autoDeleteTable) throws ServiceException;
+    void delete(BtmTypeVO btmTypeVO, boolean autoDeleteTable) throws ServiceException;
 
     /**
      * 鎵归噺鍒犻櫎涓氬姟绫诲瀷
@@ -201,7 +201,7 @@
      * @param autoDeleteTable 鑷姩鍒犻櫎琛ㄦ牸
      * @throws ServiceException 濡傛灉涓氬姟绫诲瀷琚紩鐢紝鎴栬�呭垹闄ゅ嚭閿欐椂浼氭姏鍑哄紓甯�
      */
-    void batchDelete(List<OmdBtmTypeVO> btmTypeVOList,boolean autoDeleteTable) throws ServiceException;
+    void batchDelete(List<BtmTypeVO> btmTypeVOList, boolean autoDeleteTable) throws ServiceException;
 
     /**
      * 妫�鏌ヤ笟鍔$被鍨嬩笌鏁版嵁搴撹〃鏄惁涓�鑷�
@@ -209,7 +209,7 @@
      * @return 涓嶅悓鐨勫睘鎬т俊鎭�
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑哄紓甯�
      */
-    List<OsModifyAttributeInfoDO> checkDbTableSame(String pkBtmType) throws ServiceException;
+    List<ModifyAttributeInfoDO> checkDbTableSame(String pkBtmType) throws ServiceException;
 
     /**
      * 鑾峰彇鏁版嵁搴撹〃锛屾敮鎸佷笟鍔$被鍨嬪拰瑙嗗浘
@@ -227,28 +227,28 @@
      * @param now 褰撳墠鏃堕棿
      * @return 灞炴�х殑鏁版嵁瀵硅薄
      */
-    OmdBtmTypeAttribute btmTypeAttributeDTO2DO(OmdBtmTypeLinkAttributesDTO attributesDTO, String pkBtmType, String creator, Date now);
+    BtmTypeAttribute btmTypeAttributeDTO2DO(BtmTypeLinkAttributesDTO attributesDTO, String pkBtmType, String creator, Date now);
 
     /**
      * 涓氬姟绫诲瀷鐨勫睘鎬ф樉绀哄璞¤浆鎹负鏁版嵁瀵硅薄
      * @param thisBtmTypeHasAttributeVOList 涓氬姟绫诲瀷灞炴�ф樉绀哄璞�
      * @return 鏁版嵁瀵硅薄
      */
-    List<OmdBtmTypeAttribute> btmTypeAttributeVO2DO(List<OmdBtmTypeAttributeVO> thisBtmTypeHasAttributeVOList);
+    List<BtmTypeAttribute> btmTypeAttributeVO2DO(List<BtmTypeAttributeVO> thisBtmTypeHasAttributeVOList);
 
     /**
      * 鎵归噺灏嗕笟鍔$被鍨嬬殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
      * @param attributeDOList 灞炴�х殑鏁版嵁瀵硅薄鍒楄〃
      * @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
      */
-    List<OmdBtmTypeAttributeVO> batchBtmTypeAttributeDO2VO(List<OmdBtmTypeAttribute> attributeDOList);
+    List<BtmTypeAttributeVO> batchBtmTypeAttributeDO2VO(List<BtmTypeAttribute> attributeDOList);
 
     /**
      * 鎵归噺灏嗕笟鍔$被鍨嬬殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
      * @param attributesDO 灞炴�х殑鏁版嵁瀵硅薄
      * @return 灞炴�х殑鏄剧ず瀵硅薄鍒楄〃
      */
-    OmdBtmTypeAttributeVO btmTypeAttributeDO2VO(OmdBtmTypeAttribute attributesDO);
+    BtmTypeAttributeVO btmTypeAttributeDO2VO(BtmTypeAttribute attributesDO);
 
     /**
      * 鑾峰彇涓氬姟绫诲瀷鐨勬寚瀹氬睘鎬�
@@ -256,21 +256,21 @@
      * @param attributeIdCollection 灞炴�х殑闆嗗悎锛屽鏋滀负绌哄垯鑾峰彇鍏ㄩ儴
      * @return 灞炴�х殑鏄剧ず瀵硅薄
      */
-    List<OmdBtmTypeAttribute> listAttributeDOByIdsForBtm(String id, Collection<String> attributeIdCollection);
+    List<BtmTypeAttribute> listAttributeDOByIdsForBtm(String id, Collection<String> attributeIdCollection);
 
     /**
      * 鏍规嵁涓氬姟绫诲瀷鐨勭紪鍙疯幏鍙栧睘鎬�
      * @param id 涓氬姟绫诲瀷鐨勭紪鍙�
      * @return 灞炴�х殑鏄剧ず瀵硅薄
      */
-    List<OmdBtmTypeAttributeVO> listAttributeByBtmTypeId(String id);
+    List<BtmTypeAttributeVO> listAttributeByBtmTypeId(String id);
 
     /**
      * 鏍规嵁涓氬姟绫诲瀷鐨勪富閿幏鍙栧睘鎬�
      * @param oid 涓氬姟绫诲瀷鐨勪富閿�
      * @return 灞炴�х殑鏄剧ず瀵硅薄
      */
-    List<OmdBtmTypeAttributeVO> listAttributeByBtmTypeOid(String oid);
+    List<BtmTypeAttributeVO> listAttributeByBtmTypeOid(String oid);
 
     /**
      * 鎵归噺鏍规嵁涓氬姟绫诲瀷缂栧彿鎴栬�呬富閿幏鍙栧寘鍚殑灞炴��
@@ -279,12 +279,12 @@
      * @return key鏄笟鍔$被鍨嬬殑涓婚敭鎴栬�呯紪鍙凤紝鍊兼槸鍖呭惈鐨勫睘鎬х殑淇℃伅
      * @throws ServiceException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欎細鎶涘嚭寮傚父
      */
-     List<OmdBtmTypeAttributeVO> batchListAttributeByBtmType(Collection<String> oidsOrIds, boolean queryById) throws ServiceException;
+     List<BtmTypeAttributeVO> batchListAttributeByBtmType(Collection<String> oidsOrIds, boolean queryById) throws ServiceException;
 
 	/**
 	 * 鏂板鎴栦慨鏀逛笟鍔$被鍨�
 	 * @param btmTypeDTO 涓氬姟绫诲瀷椤甸潰浼犺緭瀵硅薄
 	 * @return 鎵ц缁撴灉
 	 */
-	boolean submit(OmdBtmTypeDTO btmTypeDTO);
+	boolean submit(BtmTypeDTO btmTypeDTO);
 }

--
Gitblit v1.9.3