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

init：结构重组3

Browse Source
This commit is contained in:
zhangzq
2026-04-09 15:03:40 +08:00
parent 6fbf42574d
commit 0965a0f907
56 changed files with 289 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/agvKit/service/impl/KitToAcsServiceImpl.java
View File

@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.api.agvKit.service.enums.MsgTypeEnum;
import org.nl.acs.api.agvKit.service.enums.TaskPhaseEnum;
import org.nl.acs.api.agvKit.service.enums.TaskStateEnum;
@@ -16,7 +16,7 @@ import org.nl.acs.device.storageMgt.service.entity.StorageCell;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.task.instruction.enums.InstructionStatusEnum;
import org.nl.acs.task.instruction.service.InstructionService;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.device.storageMgt.service.StorageCellService;
import org.nl.config.MapOf;
import org.springframework.beans.factory.annotation.Autowired;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/apiAdd/service/impl/AddressServiceImpl.java
View File

@@ -21,7 +21,7 @@ import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.acs.api.apiAdd.service.entity.Address;
import org.nl.acs.api.apiAdd.service.AddressService;
import org.nl.acs.api.apiAdd.service.dto.AddressDto;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java
View File

@@ -3,9 +3,9 @@ package org.nl.acs.autoThread.autoRun.impl.deviceAuto;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.autoThread.autoRun.AbstractAutoRunnable;
import org.nl.acs.autoThread.service.AutoRunService;
import org.nl.acs.device.deviceDriver.service.impl.BaseDeviceDriver;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.iot.opc.config.OpcConfig;
import org.nl.acs.device.deviceDriver.service.driver.base.BaseDeviceDriver;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.iot.opc.opcOperator.config.OpcConfig;
import org.nl.acs.iot.udw.UnifiedDataAccessor;
import org.nl.acs.iot.udw.UnifiedDataAccessorFactory;
import org.nl.common.utils.BlockedRunable;

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncAutoRunnable.java
View File

@@ -3,10 +3,10 @@ package org.nl.acs.autoThread.autoRun.impl.opcSignalAuto;
import cn.hutool.core.util.ObjectUtil;
import org.dromara.dynamictp.core.support.ThreadPoolBuilder;
import org.nl.acs.autoThread.autoRun.AbstractAutoRunnable;
import org.nl.acs.iot.opc.service.DeviceAppService;
ximport org.nl.acs.iot.opc.OpcServerService;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto;
import org.nl.acs.iot.opc.service.dto.OpcServerManageDto;
import org.nl.acs.iot.opc.opcOperator.service.OpcServerService;
import org.nl.acs.iot.opc.opcOperator.service.dto.OpcServerManageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,6 +37,8 @@ public class OpcSignalSyncAutoRunnable extends AbstractAutoRunnable {
.workQueue(MEMORY_SAFE_LINKED_BLOCKING_QUEUE.getName(), 2000)
.buildDynamic();
@Autowired
private OpcServerService opcServerService;
@Autowired
private DeviceAppService deviceAppService;
@@ -56,7 +58,7 @@ public class OpcSignalSyncAutoRunnable extends AbstractAutoRunnable {
{
//Thread.sleep(10000L);
isRun = true;
Map<String, OpcServerManageDto> servers = deviceAppService.queryAllServerMap();
Map<String, OpcServerManageDto> servers = opcServerService.queryAllServerMap();
Map<String, List<List<OpcItemDto>>> pros;
do {
Thread.sleep(1000L);

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncExecutor.java
View File

@@ -5,12 +5,11 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.AcsConfig;
import org.nl.acs.iot.opc.service.OpcServerService;
import org.nl.acs.iot.opc.OpcOperator;
import org.nl.acs.iot.opc.config.OpcConfig;
import org.nl.acs.iot.opc.opcOperator.OpcOperator;
import org.nl.acs.iot.opc.opcOperator.config.OpcConfig;
import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto;
import org.nl.acs.iot.opc.service.dto.QualityTypeValue;
import org.nl.acs.iot.opc.service.dto.OpcServerManageDto;
import org.nl.acs.iot.opc.opcOperator.config.QualityTypeValue;
import org.nl.acs.iot.opc.opcOperator.service.dto.OpcServerManageDto;
import org.nl.acs.iot.udw.UnifiedDataAccessor;
import org.nl.acs.iot.udw.UnifiedDataAccessorFactory;
import org.nl.acs.iot.udw.UnifiedDataAppService;
@@ -93,7 +92,6 @@ public class OpcSignalSyncExecutor implements Runnable, DataCallback, ServerConn
private void runOld() {
OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService .class);
while (true) {
start:
try {

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.ApplicationAutoInitial;
import org.nl.init.ApplicationAutoInitial;
import org.nl.acs.autoThread.autoRun.AbstractAutoRunnable;
import org.nl.acs.autoThread.StartConfig;
import org.nl.acs.autoThread.autoRunThread.service.enums.ThreadUsedStatusEnum;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/DeviceAppService.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAppService.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.iot.opc.service;
package org.nl.acs.device.device.service;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.iot.opc.service.dto.DeviceManageDto;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.device.device.service.dto.DeviceManageDto;
import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto;
import java.util.List;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.device.device.service;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import java.util.List;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceExtraManageDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraManageDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.iot.opc.service.dto;
package org.nl.acs.device.device.service.dto;
import lombok.Data;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceManageDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceManageDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.iot.opc.service.dto;
package org.nl.acs.device.device.service.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import eu.bitwalker.useragentutils.DeviceType;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/entity/Device.java
View File

@@ -1,8 +1,8 @@
package org.nl.acs.device.device.service.entity;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.iot.opc.service.dto.DeviceExtraManageDto;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import org.nl.acs.device.device.service.dto.DeviceExtraManageDto;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;

18
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceAppServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAppServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.iot.opc.service.impl;
package org.nl.acs.device.device.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
@@ -9,19 +9,19 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.ApplicationAutoInitial;
import org.nl.init.ApplicationAutoInitial;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.device.service.DeviceDriverDefinationAppService;
import org.nl.acs.device.device.service.mapper.DeviceMapper;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.impl.AbstractOpcDeviceDriver;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.defination.opcDefination.AbstractOpcDeviceDriver;
import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra;
import org.nl.acs.device.deviceExtInfo.service.mapper.DeviceExtraMapper;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.iot.opc.service.dto.DeviceExtraManageDto;
import org.nl.acs.iot.opc.service.dto.DeviceManageDto;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.device.device.service.dto.DeviceExtraManageDto;
import org.nl.acs.device.device.service.dto.DeviceManageDto;
import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto;
import org.nl.acs.iot.opc.opc.service.entity.Opc;
import org.nl.acs.iot.opc.opcPlc.service.entity.OpcPlc;
@@ -238,7 +238,7 @@ public class DeviceAppServiceImpl implements DeviceAppService, ApplicationAutoIn
@Override
public synchronized void reload() {
List<DeviceManageDto> deviceManageDtos = deviceManageService.queryAllWithExtra();
List<DeviceManageDto> deviceManageDtos = this.queryAllWithExtra();
this.devices = new ArrayList();
Collections.synchronizedList(this.devices);
this.code_indexs = new ArrayList();

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceDriverDefinationAppServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDriverDefinationAppServiceImpl.java
View File

@@ -1,10 +1,10 @@
package org.nl.acs.iot.opc.service.impl;
package org.nl.acs.device.device.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.device.service.DeviceDriverDefinationAppService;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import org.nl.common.exception.BadRequestException;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;

150
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java
View File

@@ -18,7 +18,9 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.map.ListOrderedMap;
import org.nl.ApplicationAutoInitial;
import org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite.StandardInspectSiteDeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.standardOrdinarySite.StandardOrdinarySiteDeviceDriver;
import org.nl.init.ApplicationAutoInitial;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra;
import org.nl.acs.device.deviceDriver.service.dto.ItemDto;
@@ -30,14 +32,13 @@ import org.nl.acs.task.route.service.mapper.RouteLineMapper;
import org.nl.acs.device.storageMgt.service.entity.StorageCell;
import org.nl.acs.device.storageMgt.service.mapper.StorageCellMapper;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.common.utils.ReadUtil;
import org.nl.acs.device.device.service.DeviceDriverDefinationAppService;
import org.nl.acs.device.deviceExtInfo.DeviceExtraService;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.impl.opcDefination.OpcDeviceDriverDefination;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.defination.opcDefination.OpcDeviceDriverDefination;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.iot.opc.opc.service.OpcService;
import org.nl.acs.iot.opc.opc.service.dto.OpcDto;
import org.nl.acs.iot.plc.service.OpcPlcService;
@@ -91,7 +92,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
// private final StageActorMapper stageActorMapper;
private final StorageCellMapper storageCellMapper;
private final DeviceExtraMapper deviceExtraMapper;
private final DeviceRunpointMapper deviceRunpointMapper;
private final StageMapper stageMapper;
private final DeviceExtraService deviceExtraService;
@@ -594,27 +594,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
}
}
// for(int i=0; i<result.size(); i++) {
// JSONObject jo = (JSONObject) result.get(i);
// JSONObject devicejo = new JSONObject();
// String device_id = jo.getString("device_id");
// String device_code = jo.getString("device_code");
// String device_name = jo.getString("device_name");
// Device device = appService.findDeviceByCode(device_code);
// if (device.getDeviceDriver() instanceof XgAgvCarDeviceDriver) {
// standardOrdinarySiteDeviceDriver = (XgAgvCarDeviceDriver) device.getDeviceDriver();
// int branchProtocol = standardOrdinarySiteDeviceDriver.getBranchProtocol();
// devicejo.put("device_code",device_code);
// devicejo.put("branchProtocol",branchProtocol);
// devicejo.put("qty",standardOrdinarySiteDeviceDriver.getQty());
// devicejo.put("material",standardOrdinarySiteDeviceDriver.getMaterial());
// devicejo.put("status",standardOrdinarySiteDeviceDriver.isRequireSucess());
//
// deviceInfo.add(devicejo);
// }
// }
return deviceInfo;
}
@@ -644,7 +623,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
log.info("更新设备主表信息");
DeviceDto dto = this.findById(device_id);
DeviceRunpointDto devrundto = new DeviceRunpointDto();
if (dto != null) {
dto.setIs_config("true");
dto.setIs_route(parentForm.getString("is_route"));
@@ -670,41 +648,41 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
form.put("device_code", device_code);
deviceExtraService.createByDeviceConfig(form, "01");
//判断是否存在并开启站点管理
if (form.containsKey("station_manager")) {
// WQLObject wo = WQLObject.getWQLObject("acs_device_runpoint");
if ("true".equals(form.get("station_manager").toString())) {
//判断数据库记录是否存在 不存在则新增 存在则修改
// JSONObject json = wo.query("device_id ='" + device_id + "'").uniqueResult(0);
DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper)
.eq(DeviceRunpoint::getDevice_id, device_id)
.one();
// if (MapUtil.isEmpty(json)) {
if (ObjectUtil.isEmpty(deviceRunpoint)) {
devrundto.setDevice_code(dto.getDevice_code());
devrundto.setDevice_id(dto.getDevice_id());
devrundto.setCreate_by(SecurityUtils.getCurrentNickName());
devrundto.setCreate_time(DateUtil.now());
DeviceRunpoint entity = ConvertUtil.convert(devrundto, DeviceRunpoint.class);
deviceRunpointMapper.insert(entity);
} else {
deviceRunpoint.setContainer(null);
deviceRunpoint.setTaskno("0");
deviceRunpoint.setHasgoods("0");
deviceRunpoint.setRemark(null);
deviceRunpointMapper.updateById(deviceRunpoint);
}
} else {
LambdaQueryWrapper<DeviceRunpoint> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DeviceRunpoint::getDevice_id, device_id);
deviceRunpointMapper.delete(wrapper);
}
}
// //判断是否存在并开启站点管理
// if (form.containsKey("station_manager")) {
//
//// WQLObject wo = WQLObject.getWQLObject("acs_device_runpoint");
// if ("true".equals(form.get("station_manager").toString())) {
// //判断数据库记录是否存在 不存在则新增 存在则修改
//// JSONObject json = wo.query("device_id ='" + device_id + "'").uniqueResult(0);
// DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper)
// .eq(DeviceRunpoint::getDevice_id, device_id)
// .one();
//
//// if (MapUtil.isEmpty(json)) {
// if (ObjectUtil.isEmpty(deviceRunpoint)) {
// devrundto.setDevice_code(dto.getDevice_code());
// devrundto.setDevice_id(dto.getDevice_id());
// devrundto.setCreate_by(SecurityUtils.getCurrentNickName());
// devrundto.setCreate_time(DateUtil.now());
//
// DeviceRunpoint entity = ConvertUtil.convert(devrundto, DeviceRunpoint.class);
// deviceRunpointMapper.insert(entity);
//
// } else {
// deviceRunpoint.setContainer(null);
// deviceRunpoint.setTaskno("0");
// deviceRunpoint.setHasgoods("0");
// deviceRunpoint.setRemark(null);
// deviceRunpointMapper.updateById(deviceRunpoint);
// }
// } else {
// LambdaQueryWrapper<DeviceRunpoint> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(DeviceRunpoint::getDevice_id, device_id);
// deviceRunpointMapper.delete(wrapper);
// }
//
// }
//有db
JSONArray data1 = jsonObject.getJSONArray("data1");
if (data1 != null) {
@@ -919,28 +897,28 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
standardOrdinarySiteDeviceDriver.setBatch("");
device.setBatch("");
}
// WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint");
// JSONObject json = runpointwo.query("device_code ='" + device_code + "'").uniqueResult(0);
DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper)
.eq(DeviceRunpoint::getDevice_code, device_code)
.one();
if (!ObjectUtil.isEmpty(deviceRunpoint)) {
// DeviceRunpointDto obj = json.toJavaObject(DeviceRunpointDto.class);
deviceRunpoint.setHasgoods(hasGoodStatus);
deviceRunpoint.setMaterial_type(material_type);
deviceRunpoint.setBatch(batch);
device.setHas_goods(Integer.parseInt(hasGoodStatus));
device.setMaterial_type(material_type);
device.setRemark(remark);
device.setQuantity(quantity);
device.setBatch(batch);
device.setIslock(islock);
// JSONObject updatejson = (JSONObject) JSONObject.toJSON(obj);
// runpointwo.update(updatejson, "device_code = '" + device_code + "'");
LambdaQueryWrapper<DeviceRunpoint> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DeviceRunpoint::getDevice_code, device_code);
deviceRunpointMapper.delete(wrapper);
}
//// WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint");
//// JSONObject json = runpointwo.query("device_code ='" + device_code + "'").uniqueResult(0);
//// DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper)
//// .eq(DeviceRunpoint::getDevice_code, device_code)
//// .one();
// if (!ObjectUtil.isEmpty(deviceRunpoint)) {
//// DeviceRunpointDto obj = json.toJavaObject(DeviceRunpointDto.class);
//// deviceRunpoint.setHasgoods(hasGoodStatus);
//// deviceRunpoint.setMaterial_type(material_type);
//// deviceRunpoint.setBatch(batch);
// device.setHas_goods(Integer.parseInt(hasGoodStatus));
// device.setMaterial_type(material_type);
// device.setRemark(remark);
// device.setQuantity(quantity);
// device.setBatch(batch);
// device.setIslock(islock);
//// JSONObject updatejson = (JSONObject) JSONObject.toJSON(obj);
//// runpointwo.update(updatejson, "device_code = '" + device_code + "'");
// LambdaQueryWrapper<DeviceRunpoint> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(DeviceRunpoint::getDevice_code, device_code);
// deviceRunpointMapper.delete(wrapper);
// }
} else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
standardInspectSiteDeviceDriver.setMaterial(material_type);

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriverDefination.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/DeviceDriverDefination.java
View File

@@ -1,7 +1,8 @@
package org.nl.acs.device.deviceDriver.service;
package org.nl.acs.device.deviceDriver.service.defination;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import java.util.List;

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractOpcDeviceDriver.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/AbstractOpcDeviceDriver.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.deviceDriver.service.impl;
package org.nl.acs.device.deviceDriver.service.defination.opcDefination;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
@@ -6,13 +6,13 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device.deviceDriver.service.driver.base.BaseDeviceDriver;
import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra;
import org.nl.acs.device.deviceExtInfo.service.mapper.DeviceExtraMapper;
import org.nl.acs.device.deviceDriver.service.dto.ItemValue;
import org.nl.acs.iot.opc.config.OpcConfig;
import org.nl.acs.iot.opc.service.OpcServerService;
import org.nl.acs.iot.opc.opcOperator.config.OpcConfig;
import org.nl.acs.iot.opc.opcOperator.service.OpcServerService;
import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto;
import org.nl.acs.iot.opc.service.impl.OpcServerServiceImpl;
import org.nl.acs.iot.udw.UnifiedDataAccessor;
import org.nl.acs.iot.udw.UnifiedDataAccessorFactory;
import org.nl.acs.iot.udw.UnifiedDataAppService;
@@ -248,7 +248,7 @@ public abstract class AbstractOpcDeviceDriver extends BaseDeviceDriver {
this.last_items = this_items;
this.sendTime = date;
OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerServiceImpl.class);
OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService.class);
opcServerService.writeIntegerByNewConn(this.getOpcServer(), itemValues);

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/ItemProtocolP.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/ItemProtocolP.java
View File

@@ -1,6 +1,4 @@
package org.nl.acs.device.deviceDriver.service.impl.opcDefination;
import org.nl.acs.device.deviceDriver.service.impl.AbstractOpcDeviceDriver;
package org.nl.acs.device.deviceDriver.service.defination.opcDefination;
import java.util.HashMap;
import java.util.Map;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/OpcDeviceDriverDefination.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/OpcDeviceDriverDefination.java
View File

@@ -1,7 +1,7 @@
package org.nl.acs.device.deviceDriver.service.impl.opcDefination;
package org.nl.acs.device.deviceDriver.service.defination.opcDefination;
import org.nl.acs.device.deviceDriver.service.dto.ItemDto;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import java.util.List;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/ItemProtocol.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/ItemProtocol.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.device.deviceDriver.service.impl.opcDefination.standardInspectSite;
package org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device.deviceDriver.service.defination.opcDefination.ItemProtocolP;
import org.nl.acs.device.deviceDriver.service.dto.ItemDto;
import org.nl.acs.device.deviceDriver.service.impl.opcDefination.ItemProtocolP;
import java.util.ArrayList;
import java.util.List;

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDefination.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDefination.java
View File

@@ -1,10 +1,10 @@
package org.nl.acs.device.deviceDriver.service.impl.opcDefination.standardInspectSite;
package org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.deviceDriver.service.defination.opcDefination.OpcDeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.dto.ItemDto;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.impl.opcDefination.OpcDeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.springframework.stereotype.Service;
import java.util.LinkedList;
@@ -33,7 +33,7 @@ public class StandardInspectSiteDefination extends OpcDeviceDriverDefination {
@Override
public DeviceDriver getDriverInstance(Device device) {
return (new StandardInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this);
return new StandardInspectSiteDeviceDriver().init(device,this);
}

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.deviceDriver.service.impl.opcDefination.standardInspectSite;
package org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -9,10 +9,10 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.nl.acs.api.agvKit.service.AcsToKitService;
import org.nl.acs.device.deviceDriver.service.impl.AbstractOpcDeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.opcDefination.AbstractOpcDeviceDriver;
import org.nl.acs.device.storageMgt.service.dto.StorageCellDto;
import org.nl.acs.device.storageMgt.service.impl.StorageCellServiceImpl;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.task.history.ErrorUtil;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.task.instruction.service.InstructionService;

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/AbstractStandardDeviceDriver.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination;
import lombok.Data;
import org.nl.acs.device.deviceDriver.service.driver.base.BaseDeviceDriver;
@Data
public abstract class AbstractStandardDeviceDriver extends BaseDeviceDriver {
}

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java
View File

@@ -1,9 +1,9 @@
package org.nl.acs.device.deviceDriver.service.impl.ordinaryDefination.standardOrdinarySite;
package org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.standardOrdinarySite;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import org.springframework.stereotype.Service;
import java.util.LinkedList;

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.deviceDriver.service.impl.ordinaryDefination.standardOrdinarySite;
package org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.standardOrdinarySite;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -9,10 +9,10 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.nl.acs.api.agvKit.service.AcsToKitService;
import org.nl.acs.device.deviceDriver.service.impl.AbstractStandardDeviceDriver;
import org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.AbstractStandardDeviceDriver;
import org.nl.acs.device.storageMgt.service.dto.StorageCellDto;
import org.nl.acs.device.storageMgt.service.impl.StorageCellServiceImpl;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.task.instruction.service.InstructionService;
import org.nl.acs.task.task.service.TaskService;

3
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriver.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/DeviceDriver.java
View File

@@ -1,6 +1,7 @@
package org.nl.acs.device.deviceDriver.service;
package org.nl.acs.device.deviceDriver.service.driver;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import java.util.Map;

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/base/BaseDeviceDriver.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.acs.device.deviceDriver.service.driver.base;
import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件.DeviceStageMonitorPlugin;
import org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件.DriverExecutePlugin;
public abstract class
BaseDeviceDriver extends DeviceDriver implements DeviceStageMonitorPlugin, DriverExecutePlugin {
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DeviceStageMonitorPlugin.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DeviceStageMonitorPlugin.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.deviceDriver.service.设备驱动执行插件;
package org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件;
import com.alibaba.fastjson.JSONObject;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DriverExecutePlugin.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DriverExecutePlugin.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.device.deviceDriver.service.设备驱动执行插件;
package org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件;
public interface DriverExecutePlugin {

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractStandardDeviceDriver.java
View File

@@ -1,8 +0,0 @@
package org.nl.acs.device.deviceDriver.service.impl;
import lombok.Data;
@Data
public abstract class AbstractStandardDeviceDriver extends BaseDeviceDriver {
}

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/BaseDeviceDriver.java
View File

@@ -1,8 +0,0 @@
package org.nl.acs.device.deviceDriver.service.impl;
import org.nl.acs.device.deviceDriver.service.DeviceDriver;
import org.nl.acs.device.deviceDriver.service.设备驱动执行插件.DeviceStageMonitorPlugin;
import org.nl.acs.device.deviceDriver.service.设备驱动执行插件.DriverExecutePlugin;
public abstract class BaseDeviceDriver extends DeviceDriver implements DeviceStageMonitorPlugin, DriverExecutePlugin {
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceExtInfo/service/impl/DeviceExtraServiceImpl.java
View File

@@ -18,7 +18,7 @@ import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.acs.device.deviceExtInfo.service.dto.DeviceExtraDto;
import org.nl.acs.device.deviceExtInfo.service.dto.DeviceExtraQueryParam;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceProtocol/service/impl/DeviceProtocolServiceImpl.java
View File

@@ -12,7 +12,6 @@ import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra;
import org.nl.acs.device.deviceProtocol.service.DeviceProtocolService;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.*;
import org.nl.common.utils.utils.PageUtil;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storageMgt/service/impl/StorageCellServiceImpl.java
View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import org.nl.ApplicationAutoInitial;
import org.nl.init.ApplicationAutoInitial;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
import org.nl.common.db.impl.CommonServiceImpl;
@@ -18,7 +18,7 @@ import org.nl.acs.device.storageMgt.service.mapper.StorageCellMapper;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.acs.device.storageMgt.service.StorageCellService;
import org.nl.acs.device.storageMgt.service.dto.StorageCellDto;
import org.nl.acs.device.storageMgt.service.dto.StorageCellQueryParam;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcOperator.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/OpcOperator.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.iot.opc;
package org.nl.acs.iot.opc.opcOperator;
import cn.hutool.core.util.NumberUtil;
import lombok.extern.slf4j.Slf4j;
@@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils;
import org.jinterop.dcom.common.JIException;
import org.jinterop.dcom.core.*;
import org.nl.acs.device.deviceDriver.service.dto.ItemValue;
import org.nl.acs.iot.opc.service.dto.QualityTypeValue;
import org.nl.acs.iot.opc.opcOperator.config.QualityTypeValue;
import org.nl.common.exception.BadRequestException;
import org.nl.config.MapOf;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/config/OpcConfig.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/OpcConfig.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.iot.opc.config;
package org.nl.acs.iot.opc.opcOperator.config;
/**
* @author 20220102CG\noblelift

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/QualityTypeValue.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/QualityTypeValue.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.iot.opc.service.dto;
package org.nl.acs.iot.opc.opcOperator.config;
/**
* @author 20220102CG\noblelift

39
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/OpcServerServiceImpl.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/OpcServerService.java
View File

@@ -1,15 +1,14 @@
package org.nl.acs.iot.opc.service.impl;
package org.nl.acs.iot.opc.opcOperator.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.jinterop.dcom.common.JIException;
import org.nl.ApplicationAutoInitial;
import org.nl.acs.iot.opc.opcOperator.OpcOperator;
import org.nl.init.ApplicationAutoInitial;
import org.nl.acs.device.deviceDriver.service.dto.ItemValue;
import org.nl.acs.iot.opc.service.OpcServerService;
import org.nl.acs.iot.opc.OpcOperator;
import org.nl.acs.iot.opc.config.OpcConfig;
import org.nl.acs.iot.opc.service.dto.OpcServerManageDto;
import org.nl.acs.iot.opc.opcOperator.config.OpcConfig;
import org.nl.acs.iot.opc.opcOperator.service.dto.OpcServerManageDto;
import org.nl.acs.iot.opc.opc.service.mapper.OpcMapper;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.ThreadUtl;
@@ -33,7 +32,7 @@ import java.util.*;
*/
@Service
@Slf4j
public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoInitial {
public class OpcServerService implements ApplicationAutoInitial {
@Autowired
private OpcMapper opcMapper;
@@ -42,7 +41,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
Map<String, Server> servers = Collections.synchronizedMap(new HashMap());
Map<String, Group> groups = Collections.synchronizedMap(new HashMap());
public OpcServerServiceImpl() {
public OpcServerService() {
}
/**
@@ -50,22 +49,22 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
*
* @throws Exception
*/
@Override
public void autoInitial() throws Exception {
this.reload(); // 加载opc服务
if (OpcConfig.auto_start_opc) {
Thread t =
new Thread(() -> {
Iterator var1 = OpcServerServiceImpl.this.opcServerManageDtos.values().iterator();
Iterator var1 = OpcServerService.this.opcServerManageDtos.values().iterator();
while (var1.hasNext()) {
OpcServerManageDto dto = (OpcServerManageDto) var1.next();
try {
OpcServerServiceImpl.this.getServer(dto.getOpc_code());
OpcServerServiceImpl.log.info("加载opc server {}", dto.getOpc_code());
OpcServerService.this.getServer(dto.getOpc_code());
OpcServerService.log.info("加载opc server {}", dto.getOpc_code());
} catch (Exception var4) {
OpcServerServiceImpl.log.warn("启动无法载入servers", var4);
OpcServerService.log.warn("启动无法载入servers", var4);
}
}
});
@@ -73,13 +72,13 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
}
}
@Override
public synchronized void reload() {
this.opcServerManageDtos = this.queryAllServerMap();
this.opcServerManageDtos = Collections.synchronizedMap(this.opcServerManageDtos);
}
@Override
public synchronized Group getServer(String code) {
synchronized (this.buildLock(code)) {
Group group = null;
@@ -160,7 +159,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
/*
/既锁住对象又参数 保持一致
*/
@Override
public synchronized Group getServerByNewConn(String code) {
synchronized (this.buildLock(code)) {
@@ -201,7 +200,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
}
}
@Override
public synchronized void clearServer(String code) {
try {
Server server = (Server) this.servers.get(code);
@@ -234,7 +233,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
}
@Override
public void writeInteger(String code, ItemValue... values) {
try {
Group group = this.getServer(code);
@@ -254,7 +253,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
}
}
@Override
public void writeIntegerByNewConn(String code, ItemValue... values) {
try {
Group group = this.getServerByNewConn(code);
@@ -285,7 +284,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
return lock;
}
@Override
public Map<String, OpcServerManageDto> queryAllServerMap() {
List<OpcServerManageDto> opcServers = ConvertUtil.convertList(opcMapper.selectList(new LambdaQueryWrapper<>()), OpcServerManageDto.class);
Map<String, OpcServerManageDto> result = new HashMap();

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcServerManageDto.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/dto/OpcServerManageDto.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.iot.opc.service.dto;
package org.nl.acs.iot.opc.opcOperator.service.dto;
/**
* @author 20220102CG\noblelift

60
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcServerService.java
View File

@@ -1,60 +0,0 @@
package org.nl.acs.iot.opc.service;
import org.nl.acs.device.deviceDriver.service.dto.ItemValue;
import org.nl.acs.iot.opc.service.dto.OpcServerManageDto;
import org.openscada.opc.lib.da.Group;
import java.util.Map;
/**
* @author ldjun
* @version 1.0
* @date 2023年02月01日 11:26
* @desc desc
*/
public interface OpcServerService {
/**
* 重新加载
*/
void reload();
/**
* 获取服务器
* @param var1
* @return
*/
Group getServer(String var1);
/**
* 获取服务器
* @param var1
* @return
*/
Group getServerByNewConn(String var1);
/**
* 写入整数
* @param var1
* @param var2
*/
void writeInteger(String var1, ItemValue... var2);
/**
* 写入整数
* @param var1
* @param var2
*/
void writeIntegerByNewConn(String var1, ItemValue... var2);
/**
* 清除服务器
* @param var1
*/
void clearServer(String var1);
void cleanGroups(String var1);
Map<String, OpcServerManageDto> queryAllServerMap();
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java
View File

@@ -13,7 +13,7 @@ import org.nl.acs.iot.opc.opcPlc.service.dto.OpcPlcQueryParam;
import org.nl.acs.iot.opc.opcPlc.service.mapper.OpcPlcMapper;
import org.nl.acs.iot.plc.service.OpcPlcService;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java
View File

@@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.deviceDriver.service.设备驱动执行插件.DeviceStageMonitorPlugin;
import org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件.DeviceStageMonitorPlugin;
import org.nl.acs.layout.device.service.DeviceStageMonitorService;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.device.device.service.DeviceAppService;
import org.springframework.stereotype.Service;
/**

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java
View File

@@ -18,7 +18,7 @@ import org.nl.acs.task.history.domain.AcsDeviceErrorLog;
import org.nl.acs.task.history.service.DeviceErrorLogService;
import org.nl.acs.task.history.service.dto.DeviceErrorLogDto;
import org.nl.acs.task.history.service.mapper.AcsDeviceErrorLogMapper;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.SecurityUtils;

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.nl.ApplicationAutoInitial;
import org.nl.init.ApplicationAutoInitial;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.task.instruction.domain.InstructionMybatis;
import org.nl.acs.task.instruction.enums.InstructionStatusEnum;
@@ -27,11 +27,11 @@ import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.device.service.DeviceService;
import org.nl.acs.device.device.service.impl.DeviceServiceImpl;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import org.nl.acs.task.instruction.service.dto.InstructionDto;
import org.nl.acs.task.instruction.service.dto.InstructionQueryParam;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl;
import org.nl.acs.task.route.service.RouteLineService;
import org.nl.acs.task.route.service.dto.RouteLineDto;
import org.nl.acs.task.route.service.impl.RouteLineServiceImpl;
@@ -49,7 +49,7 @@ import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.acs.task.instruction.service.InstructionService;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;

11
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java
View File

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import org.nl.ApplicationAutoInitial;
import org.nl.init.ApplicationAutoInitial;
import org.nl.acs.task.route.domain.RouteLine;
import org.nl.acs.task.route.service.RouteLineService;
import org.nl.acs.task.route.service.RoutePlanService;
@@ -24,8 +24,7 @@ import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.device.service.DeviceService;
import org.nl.acs.device.device.service.dto.DeviceDto;
import org.nl.acs.device.device.service.mapper.DeviceMapper;
import org.nl.acs.device.deviceDriver.RouteableDeviceDriver;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.task.route.service.dto.RoutePlanDto;
import org.nl.common.db.PageInfo;
import org.nl.common.db.QueryHelpMybatisPlus;
@@ -33,7 +32,7 @@ import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.acs.task.route.service.dto.RouteLineDto;
import org.nl.acs.task.route.service.dto.RouteLineQueryParam;
import org.nl.common.utils.SecurityUtils;
@@ -689,10 +688,6 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
}
public Integer getSize() {
return this.deviceAppService.findDeviceDriver(RouteableDeviceDriver.class).size();
}
public Integer getIndex(String device_code) {
Iterator<Integer> var2 = this.routeIndex.keySet().iterator();

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java
View File

@@ -19,7 +19,7 @@ import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;
import org.springframework.data.domain.Pageable;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java
View File

@@ -21,7 +21,7 @@ import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;
import org.springframework.data.domain.Pageable;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java
View File

@@ -22,7 +22,7 @@ import org.nl.common.db.impl.CommonServiceImpl;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;
import org.springframework.beans.factory.annotation.Autowired;

153
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java
View File

@@ -17,25 +17,23 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.nl.acs.AcsConfig;
import org.nl.ApplicationAutoInitial;
import org.nl.init.ApplicationAutoInitial;
import org.nl.acs.task.task.enums.TaskStatusEnum;
import org.nl.acs.task.task.service.mapper.TaskMapper;
import org.nl.common.db.CommonFinalParam;
import org.nl.acs.device.device.service.entity.Device;
import org.nl.acs.device.device.service.enums.DeviceType;
import org.nl.acs.device.device.service.DeviceAssignedService;
import org.nl.acs.device.device.service.DeviceService;
import org.nl.acs.device.device.service.dto.DeviceAssignedDto;
import org.nl.acs.device.device.service.impl.DeviceServiceImpl;
import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination;
import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination;
import org.nl.acs.api.wms.service.AcsToWmsService;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.task.instruction.domain.InstructionMybatis;
import org.nl.acs.task.instruction.enums.InstructionStatusEnum;
import org.nl.acs.task.instruction.service.InstructionService;
import org.nl.acs.task.instruction.service.dto.InstructionDto;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl;
import org.nl.acs.task.route.domain.RoutePlan;
import org.nl.acs.task.route.service.RouteLineService;
import org.nl.acs.task.route.service.dto.RouteLineDto;
@@ -49,7 +47,7 @@ import org.nl.acs.task.task.service.dto.TaskIdAndStatusDTO;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.ConvertUtil;
import org.nl.common.utils.FileUtil;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.utils.PageUtil;
import org.nl.acs.task.task.domain.Task;
import org.nl.acs.task.task.service.TaskService;
import org.nl.acs.task.task.service.dto.TaskDto;
@@ -97,8 +95,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
private ISysParamService paramService;
@Autowired
private RouteLineService routeLineService;
@Autowired
private DeviceAssignedService deviceAssignedService;
@Autowired
private InstructionService instructionService;
@@ -1435,42 +1432,42 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
@Override
public String queryAssignedByDevice(String device_code, String task_nextdeice_code) {
List<DeviceAssignedDto> list =
deviceAssignedService.queryAssignedByDevice(device_code, task_nextdeice_code);
int flag1 = 0;
String flag2 = null;
for (int i = 0; i < list.size(); i++) {
DeviceAssignedDto dto = list.get(i);
String inst_nextDevice_code = dto.getInst_nextDevice_code();
String task_nextDevice_code = dto.getTask_nextDevice_code();
String param = dto.getParam();
JSONObject jo = JSON.parseObject(param);
String regEx = "[`~!@#$%^&*()+=|{}':;'\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'：”“’。、？]";
Pattern p = Pattern.compile(regEx);
Matcher m = p.matcher(inst_nextDevice_code);
String toSpeechText = m.replaceAll("").trim();
String[] str = toSpeechText.split(",");
List pathlist = Arrays.asList(str);
for (int j = 0; j < pathlist.size(); j++) {
String this_device_code = pathlist.get(j).toString();
JSONObject data = JSON.parseObject(jo.getString(this_device_code));
String limit = data.getString("limit");
int num = instructionService.querySameDestinationInst(this_device_code);
if (num >= Integer.parseInt(limit)) {
continue;
}
if (j == 0) {
flag1 = num;
}
if (num <= flag1) {
flag2 = this_device_code;
}
}
}
if (!StrUtil.isEmpty(flag2)) {
return flag2;
}
// List<DeviceAssignedDto> list =
// deviceAssignedService.queryAssignedByDevice(device_code, task_nextdeice_code);
// int flag1 = 0;
// String flag2 = null;
// for (int i = 0; i < list.size(); i++) {
// DeviceAssignedDto dto = list.get(i);
// String inst_nextDevice_code = dto.getInst_nextDevice_code();
// String task_nextDevice_code = dto.getTask_nextDevice_code();
// String param = dto.getParam();
// JSONObject jo = JSON.parseObject(param);
// String regEx = "[`~!@#$%^&*()+=|{}':;'\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'：”“’。、？]";
// Pattern p = Pattern.compile(regEx);
// Matcher m = p.matcher(inst_nextDevice_code);
// String toSpeechText = m.replaceAll("").trim();
//
// String[] str = toSpeechText.split(",");
// List pathlist = Arrays.asList(str);
// for (int j = 0; j < pathlist.size(); j++) {
// String this_device_code = pathlist.get(j).toString();
// JSONObject data = JSON.parseObject(jo.getString(this_device_code));
// String limit = data.getString("limit");
// int num = instructionService.querySameDestinationInst(this_device_code);
// if (num >= Integer.parseInt(limit)) {
// continue;
// }
// if (j == 0) {
// flag1 = num;
// }
// if (num <= flag1) {
// flag2 = this_device_code;
// }
// }
// }
// if (!StrUtil.isEmpty(flag2)) {
// return flag2;
// }
return null;
}
@@ -1675,39 +1672,39 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
@Override
public String queryAssignedByDeviceCode(String device_code, String task_nextDeice_code) {
List<DeviceAssignedDto> list =
deviceAssignedService.queryAssignedByDevice(device_code, task_nextDeice_code);
for (int i = 0; i < list.size(); i++) {
DeviceAssignedDto dto = list.get(i);
String deviceCode = dto.getDevice_code();
String inst_nextDevice_code = dto.getInst_nextDevice_code();
JSONObject param = JSON.parseObject(dto.getParam());
List<String> pathList = this.getPathList(inst_nextDevice_code);
for (int j = 0; j < pathList.size(); j++) {
String inst_next_device_code = pathList.get(j);
String limit = param.getString("limit");
Boolean inOut = param.getBoolean("inOut");
if (inOut) {
Device device = deviceAppService.findDeviceByCode(deviceCode);
if (device != null) {
if (StrUtil.equals(device.getDevice_type(), DeviceType.storage.toString())) {
if (instructionService.querySameNextDeviceCodeInstByIn(inst_next_device_code)) {
return inst_next_device_code;
}
} else {
if (instructionService.querySameNextDeviceCodeInstByOut(inst_next_device_code)) {
return inst_next_device_code;
}
}
}
} else {
Integer sameInstNum = instructionService.querySameDestinationInst(inst_next_device_code);
if (sameInstNum < Integer.parseInt(limit)) {
return inst_next_device_code;
}
}
}
}
// List<DeviceAssignedDto> list =
// deviceAssignedService.queryAssignedByDevice(device_code, task_nextDeice_code);
// for (int i = 0; i < list.size(); i++) {
// DeviceAssignedDto dto = list.get(i);
// String deviceCode = dto.getDevice_code();
// String inst_nextDevice_code = dto.getInst_nextDevice_code();
// JSONObject param = JSON.parseObject(dto.getParam());
// List<String> pathList = this.getPathList(inst_nextDevice_code);
// for (int j = 0; j < pathList.size(); j++) {
// String inst_next_device_code = pathList.get(j);
// String limit = param.getString("limit");
// Boolean inOut = param.getBoolean("inOut");
// if (inOut) {
// Device device = deviceAppService.findDeviceByCode(deviceCode);
// if (device != null) {
// if (StrUtil.equals(device.getDevice_type(), DeviceType.storage.toString())) {
// if (instructionService.querySameNextDeviceCodeInstByIn(inst_next_device_code)) {
// return inst_next_device_code;
// }
// } else {
// if (instructionService.querySameNextDeviceCodeInstByOut(inst_next_device_code)) {
// return inst_next_device_code;
// }
// }
// }
// } else {
// Integer sameInstNum = instructionService.querySameDestinationInst(inst_next_device_code);
// if (sameInstNum < Integer.parseInt(limit)) {
// return inst_next_device_code;
// }
// }
// }
// }
return null;
}

16
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java
View File

@@ -15,7 +15,11 @@
*/
package org.nl.common.utils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -65,6 +69,14 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
return map;
}
public static <T> IPage<T> toMybatisPage(Pageable pageable) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<T> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageable.getPageNumber() + 1, pageable.getPageSize());
for (Sort.Order order : pageable.getSort()) {
OrderItem orderItem = new OrderItem();
orderItem.setAsc(order.isAscending());
orderItem.setColumn(com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline(order.getProperty()));
page.addOrder(orderItem);
}
return page;
}
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java
View File

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
import lombok.extern.slf4j.Slf4j;
import org.jinterop.dcom.common.JIException;
import org.jinterop.dcom.core.JIVariant;
import org.nl.acs.iot.opc.OpcOperator;
import org.nl.acs.iot.opc.opcOperator.OpcOperator;
import org.nl.acs.iot.opc.opc.service.entity.Opc;
import org.nl.acs.iot.opc.opc.service.mapper.OpcMapper;
import org.nl.common.exception.BadRequestException;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRunInit.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/AppRunInit.java
View File

@@ -1,4 +1,4 @@
package org.nl;
package org.nl.init;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/ApplicationAutoInitial.java → acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/ApplicationAutoInitial.java
View File

@@ -1,4 +1,4 @@
package org.nl;
package org.nl.init;
/**
* Demo class

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
View File

@@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.AcsConfig;
import org.nl.common.utils.utils.PageUtil;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.PageUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.MapOf;
import org.nl.config.language.LangProcess;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java
View File

@@ -9,8 +9,8 @@ import org.nl.common.db.CommonFinalParam;
import org.nl.acs.task.instruction.enums.InstructionStatusEnum;
import org.nl.acs.task.instruction.service.InstructionService;
import org.nl.acs.task.instruction.domain.Instruction;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl;
import org.nl.acs.task.route.service.RouteLineService;
import org.nl.acs.task.route.service.dto.RouteLineDto;
import org.nl.acs.task.task.enums.AgvSystemTypeEnum;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java
View File

@@ -2,7 +2,7 @@ package org.nl.system.service.trajectory.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.acs.iot.opc.service.DeviceAppService;
import org.nl.acs.device.device.service.DeviceAppService;
import org.nl.system.service.trajectory.TrajectoryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;

2
acs2/nladmin-system/nlsso-server/src/main/resources/log/OpcLog.xml
View File

@@ -23,7 +23,7 @@
</appender>
<!-- 打印sql -->
<logger name="org.nl.acs.iot.opc.OpcOperator" level="error" additivity="true">
<logger name="org.nl.acs.iot.opc.opcOperator.OpcOperator" level="error" additivity="true">
<appender-ref ref="OpcUtl"/>
</logger>
</included>