root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码重构

Browse Source
This commit is contained in:
ldj_willow
2022-08-18 16:54:49 +08:00
parent 451e51877e
commit 861cdfea72
5 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
View File

@@ -12,7 +12,6 @@ import org.nl.acs.config.AcsConfig;
import org.nl.acs.config.server.AcsConfigService;
import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver;
import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
import org.nl.acs.ext.erp.service.AcsToErpService;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.log.service.DeviceExecuteLogService;
@@ -42,8 +41,6 @@ public class AgvServiceImpl implements AgvService {
@Autowired
AcsConfigService acsConfigService;
@Autowired
AcsToErpService acsToErpService;
@Autowired
AcsToWmsService acsToWmsService;
private final DeviceExecuteLogService logServer;

7
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java
View File

@@ -18,16 +18,13 @@ import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver;
import org.nl.acs.ext.erp.service.AcsToErpService;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction;
import org.nl.acs.log.service.DeviceExecuteLogService;
import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.acs.opc.DeviceType;
import org.nl.acs.task.service.TaskService;
import org.nl.exception.BadRequestException;
import org.nl.utils.SpringContextHolder;
import org.slf4j.MDC;
@@ -42,13 +39,9 @@ import java.util.*;
@RequiredArgsConstructor
public class MagicAgvServiceImpl implements MagicAgvService {
private final DeviceAppService deviceAppService;
private final TaskService taskService;
private final InstructionService instructionService;
private final AcsConfigService acsConfigService;
private final AcsToErpService acsToErpService;
private final AcsToWmsService acsToWmsService;
private final DeviceExecuteLogService logServer;
Map<String, AgvDto> AGVDeviceStatus = new HashMap();

5
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
View File

@@ -13,7 +13,6 @@ import org.nl.acs.config.server.AcsConfigService;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.impl.DeviceServiceImpl;
import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
import org.nl.acs.ext.erp.service.AcsToErpService;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction;
@@ -22,7 +21,6 @@ import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.opc.DeviceAppServiceImpl;
import org.nl.acs.opc.DeviceType;
import org.nl.acs.task.service.TaskService;
import org.nl.exception.BadRequestException;
import org.nl.utils.SpringContextHolder;
import org.slf4j.MDC;
@@ -38,10 +36,7 @@ import java.util.Map;
public class NDCAgvServiceImpl implements NDCAgvService {
private final DeviceAppService deviceAppService;
private final TaskService taskService;
private final InstructionService instructionService;
private final AcsConfigService acsConfigService;
private final AcsToErpService acsToErpService;
private final AcsToWmsService acsToWmsService;
private final DeviceExecuteLogService logServer;

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -15,7 +15,6 @@ import org.nl.acs.config.server.AcsConfigService;
import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.ext.erp.service.AcsToErpService;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction;
@@ -37,10 +36,7 @@ import java.util.*;
@RequiredArgsConstructor
public class XianGongAgvServiceImpl implements XianGongAgvService {
private final DeviceAppService deviceAppService;
private final TaskService taskService;
private final InstructionService instructionService;
private final AcsConfigService acsConfigService;
private final AcsToErpService acsToErpService;
private final AcsToWmsService acsToWmsService;
private final DeviceExecuteLogService logServer;

9
acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -47,6 +47,7 @@ import org.nl.utils.SpringContextHolder;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -75,8 +76,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
private final RouteLineService routelineserver;
private final AcsToWmsService acstowmsService;
private final TaskFeedbackService taskFeedbackService;
@Autowired
private TaskFeedbackService taskFeedbackService;
private final AcsConfigService acsConfigService;
@@ -84,8 +85,8 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
private final RouteLineService routeLineService;
private final DeviceAssignedService deviceAssignedService;
private final InstructionService instructionService;
@Autowired
private InstructionService instructionService;
private final StorageCellService storageCellService;