09-24-更新用户类型，完善删除文件

ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionTestTaskVo.java

@@ -10,6 +10,7 @@ import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.personnel.domain.vo.OpsUserVo;
+import org.dromara.system.api.domain.vo.RemoteUserVo;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -79,7 +80,7 @@ public class OpsInspectionTestTaskVo implements Serializable {
     @ExcelProperty(value = "执行人员")
     private Long person;
 
-    private OpsUserVo personInfo;
+    private RemoteUserVo personInfo;
 
     /**
      * 状态,1待执行2暂停3失败4执行中5已完成

ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionOrderServiceImpl.java

@@ -173,6 +173,24 @@ public class OpsInspectionOrderServiceImpl implements IOpsInspectionOrderService
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+
+        List<String> urls = new ArrayList<>();
+        for (Long id : ids) {
+            OpsInspectionOrderVo vo = queryById(id);
+            if (vo != null){
+                if (vo.getFileUrl()!=null) {
+                    urls.add(vo.getFileUrl());
+                }
+            }
+        }
+
+        if (!urls.isEmpty()) {
+            for (String url : urls) {
+                List<String> list = Arrays.asList(url.split(","));
+                remoteFileService.deleteFile(list);
+            }
+        }
+
         return baseMapper.deleteByIds(ids) > 0;
     }
 

ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionTestTaskServiceImpl.java

@@ -1,6 +1,7 @@
 package org.dromara.inspection.service.impl;
 
 import lombok.Data;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -15,6 +16,8 @@ import org.dromara.inspection.domain.vo.OpsInspectionTestPlanVo;
 import org.dromara.inspection.domain.vo.OpsInspectionTestTaskRecord;
 import org.dromara.personnel.domain.vo.OpsUserVo;
 import org.dromara.personnel.service.impl.OpsUserServiceImpl;
+import org.dromara.system.api.RemoteUserService;
+import org.dromara.system.api.domain.vo.RemoteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.dromara.inspection.domain.bo.OpsInspectionTestTaskBo;
@@ -45,9 +48,9 @@ public class OpsInspectionTestTaskServiceImpl implements IOpsInspectionTestTaskS
 
     private final OpsInspectionTestTaskMapper baseMapper;
     @Autowired
-    private OpsUserServiceImpl opsUserService;
-    @Autowired
     private OpsInspectionTestPlanServiceImpl opsInspectionTestPlanService;
+    @DubboReference
+    private RemoteUserService userService;
 
     /**
      * 查询运维-巡检-试验任务
@@ -177,9 +180,9 @@ public class OpsInspectionTestTaskServiceImpl implements IOpsInspectionTestTaskS
     private void setValue(List<OpsInspectionTestTaskVo> list){
         for (OpsInspectionTestTaskVo opsInspectionTestTaskVo : list) {
             if(opsInspectionTestTaskVo.getPerson()!= null){
-                OpsUserVo opsUserVo = opsUserService.queryById(opsInspectionTestTaskVo.getPerson());
+                List<RemoteUserVo> remoteUserVos = userService.selectListByIds(List.of(opsInspectionTestTaskVo.getPerson()));
-                if (opsUserVo != null){
+                if (remoteUserVos != null && !remoteUserVos.isEmpty()){
-                    opsInspectionTestTaskVo.setPersonInfo(opsUserVo);
+                    opsInspectionTestTaskVo.setPersonInfo(remoteUserVos.getFirst());
                 }
             }