2024-08-21 调整设备管理附件删除和企业管理附件删除

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ009A.java

@@ -2,7 +2,9 @@ package com.baosight.hpjx.hp.pz.service;
 
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.core.constant.S3Constant;
 import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.utils.Iplat4jUtils;
 import com.baosight.hpjx.hp.ds.domain.HPDS002;
 import com.baosight.hpjx.hp.pz.domain.HPPZ009A;
 import com.baosight.hpjx.util.DateUtils;
@@ -54,7 +56,7 @@ public class ServiceHPPZ009A extends ServiceEPBase {
 		try {
 			// 项目环境
 			String projectEnv = ProjectInfo.getProjectEnv();
-			if (CommonConstant.ProjectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+			if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
 				inInfo = super.query(inInfo, "HPPZ009A.queryRun", new HPPZ009A());
 			} else {
 				inInfo = super.query(inInfo, "HPPZ009A.queryDev", new HPPZ009A());
@@ -107,7 +109,8 @@ public class ServiceHPPZ009A extends ServiceEPBase {
 				hppz009A.fromMap(resultRows.get(i));
 				DaoUtils.update(HPPZ009A.DELETE, hppz009A);
 				if (!hppz009A.getDocId().isEmpty()) {
-					this.delectDoc(hppz009A.getDocId());
+					Iplat4jUtils.deleteFileByDocId(hppz009A.getDocId());
+					//this.delectDoc(hppz009A.getDocId());
 				}
 			}
 			inInfo = this.query(inInfo);

src/main/java/com/baosight/hpjx/hp/sb/service/ServiceHPSB099.java

@@ -2,7 +2,9 @@ package com.baosight.hpjx.hp.sb.service;
 
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.core.constant.CommonConstant;
+import com.baosight.hpjx.core.constant.S3Constant;
 import com.baosight.hpjx.core.dao.DaoUtils;
+import com.baosight.hpjx.core.utils.Iplat4jUtils;
 import com.baosight.hpjx.hp.ds.domain.HPDS002;
 import com.baosight.hpjx.hp.sb.domain.HPSB099;
 import com.baosight.hpjx.util.FileUtils;
@@ -40,7 +42,7 @@ public class ServiceHPSB099 extends ServiceEPBase {
         try {
             // 项目环境
             String projectEnv = ProjectInfo.getProjectEnv();
-            if (CommonConstant.ProjectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+            if (CommonConstant.FileLocation.S3.equalsIgnoreCase(S3Constant.FILE_LOCATION)) {
                 inInfo = super.query(inInfo, "HPSB099.queryRun", new HPSB099());
             } else {
                 inInfo = super.query(inInfo, "HPSB099.queryDev", new HPSB099());
@@ -61,7 +63,7 @@ public class ServiceHPSB099 extends ServiceEPBase {
                 hgsb099.fromMap(resultRow);
                 DaoUtils.update(HPSB099.DELETE, hgsb099);
                 if (!hgsb099.getDocId().isEmpty()) {
-                    this.delectDoc(hgsb099.getDocId());
+                    Iplat4jUtils.deleteFileByDocId(hgsb099.getDocId());
                 }
             }
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);