From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java |   44 ++++++++++++++++----------------------------
 1 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
similarity index 96%
rename from lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java
rename to lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
index ae4f369..df6ebb3 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/service/impl/AssignFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.flow.service.impl;
+package org.jeecg.modules.dncFlow.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,17 +16,6 @@
 import org.flowable.task.api.Task;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.flow.entity.ToEquipmentTask;
-import org.jeecg.modules.flow.service.IActivitiDefinitionService;
-import org.jeecg.modules.flow.service.IAssignFileStreamService;
-import org.jeecg.modules.flow.service.IToEquipmentTaskService;
-import org.jeecg.modules.flow.entity.AssignFileStream;
-import org.jeecg.modules.flow.ext.AssignFileStreamExt;
-import org.jeecg.modules.flow.mapper.AssignFileStreamMapper;
-import org.jeecg.modules.flow.request.ApproveBatchRequest;
-import org.jeecg.modules.flow.request.AssignFileRequest;
-import org.jeecg.modules.flow.request.AssignFileStreamQueryRequest;
-import org.jeecg.modules.flow.request.TaskRequest;
 import org.jeecg.modules.dnc.entity.*;
 import org.jeecg.modules.dnc.exception.ExceptionCast;
 import org.jeecg.modules.dnc.ext.NcTxtFilePathInfo;
@@ -35,7 +24,17 @@
 import org.jeecg.modules.dnc.utils.ValidateUtil;
 import org.jeecg.modules.dnc.utils.date.DateUtil;
 import org.jeecg.modules.dnc.utils.file.FileUtilS;
-import org.jeecg.modules.flow.vo.AssignFlowTaskVo;
+import org.jeecg.modules.dncFlow.entity.AssignFileStream;
+import org.jeecg.modules.dncFlow.entity.ToEquipmentTask;
+import org.jeecg.modules.dncFlow.ext.AssignFileStreamExt;
+import org.jeecg.modules.dncFlow.mapper.AssignFileStreamMapper;
+import org.jeecg.modules.dncFlow.request.ApproveBatchRequest;
+import org.jeecg.modules.dncFlow.request.AssignFileRequest;
+import org.jeecg.modules.dncFlow.request.AssignFileStreamQueryRequest;
+import org.jeecg.modules.dncFlow.request.TaskRequest;
+import org.jeecg.modules.dncFlow.service.IAssignFileStreamService;
+import org.jeecg.modules.dncFlow.service.IToEquipmentTaskService;
+import org.jeecg.modules.dncFlow.vo.AssignFlowTaskVo;
 import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
 import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
 import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
@@ -55,7 +54,10 @@
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service("IAssignFileStreamService")
@@ -85,8 +87,6 @@
     @Autowired
     private IDocFileService docFileService;
     @Autowired
-    private IActivitiDefinitionService definitionService;
-    @Autowired
     private IDocRelativeService docRelativeService;
     @Autowired
     private ISynchronizedFlagService synchronizedFlagService;
@@ -109,10 +109,6 @@
     @Autowired
     private IFlowTaskService flowTaskService;
 
-    @Value("${securedoc.serverIp}")
-    private String serverIp;
-    @Value("${securedoc.serverPort}")
-    private int serverPort;
     @Value("${securedoc.whether}")
     private String whether;
     @Value("${securedoc.localFilePath}")
@@ -620,14 +616,6 @@
         return departIds;
     }
 
-    //鑾峰彇澶氫釜閮ㄩ棬鐨勫鎵逛汉 鍘婚噸
-    private List<String> getUserIdList(List<String> departIds) {
-        List<String> userIdList = definitionService.getByDepartIds(departIds);
-        if (userIdList == null || userIdList.isEmpty()) {
-            ExceptionCast.cast(ActivitiCode.ACT_APPROVE_USERS_NONE);
-        }
-        return userIdList;
-    }
 
     //灏佽鏁版嵁
     private void saveBusinessObject(AssignFileStream stream, String userId) {

--
Gitblit v1.9.3