Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/dm/service/ServiceHGDM099.java

@@ -62,8 +62,6 @@ public class ServiceHGDM099 extends ServiceEPBase {
 	public EiInfo upload(EiInfo inInfo) {
 		try {
 			HGDM099 fDm099 = MapUtils.toDaoEPBase(inInfo, HGDM099.class);
-			AssertUtils.isEmpty(fDm099.getBizId(), "业务ID不能为空");
-			AssertUtils.isEmpty(fDm099.getBizType(), "业务类型不能为空");
 			AssertUtils.isEmpty(fDm099.getDocId(), "文件ID不能为空");
 			fDm099.setDeleteFlag(CommonConstant.YesNo.NO_0);
 			DaoUtils.insert(HGDM099.INSERT, fDm099);

src/main/java/com/baosight/hggp/hg/dm/tools/HpDmTools.java → src/main/java/com/baosight/hggp/hg/dm/tools/HgDmTools.java

 package com.baosight.hggp.hg.dm.tools;
 
-import com.baosight.hggp.core.constant.CommonConstant;
-import com.baosight.hggp.core.constant.S3Constant;
 import com.baosight.hggp.core.dao.DaoBase;
 import com.baosight.hggp.hg.dm.domain.HGDM099;
 import com.baosight.hggp.util.AssertUtils;
@@ -14,7 +12,7 @@ import java.util.Map;
  * @author:songx
  * @date:2024/8/13,16:40
  */
-public class HpDmTools {
+public class HgDmTools {
 	
 	/**
 	 * @author:songx
@@ -23,24 +21,11 @@ public class HpDmTools {
 	public static class HpDm099 {
 		
 		/**
-		 * 查询
 		 *
 		 * @param bizType
-		 * @param bizId
+		 * @param docId
 		 * @return
 		 */
-		public static List<HGDM099> list(String bizType, String bizId) {
-			AssertUtils.isEmpty(bizId, "业务ID不能为空");
-			Map<String, Object> paramMap = new HashMap();
-			paramMap.put(HGDM099.FIELD_BIZ_TYPE, bizType);
-			paramMap.put(HGDM099.FIELD_BIZ_ID, bizId);
-			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
-				return DaoBase.getInstance().query("HGDM099.queryS3", paramMap);
-			} else {
-				return DaoBase.getInstance().query("HGDM099.queryLocal", paramMap);
-			}
-		}
-
 		public static List<HGDM099> getByDocId(String bizType, String docId) {
 			AssertUtils.isEmpty(docId, "文件ID不能为空");
 			Map<String, Object> paramMap = new HashMap();