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

add:增加固化室，输送线，涂板线驱动

Browse Source
This commit is contained in:
baoge
2023-12-26 16:54:16 +08:00
parent 94ba562819
commit d3a6222845
16 changed files with 1601 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
View File

@@ -9,6 +9,8 @@ import com.alibaba.fastjson.JSONObject;
* https://blog.csdn.net/moneyshi/article/details/82978073
*/
public enum DriverTypeEnum {
// 设备驱动
ORDINARY_SITE(1, "standard_ordinary_site", "普通站点", "conveyor"),
INSPECT_SITE(2, "standard_inspect_site", "检测站点", "conveyor"),
@@ -27,7 +29,13 @@ public enum DriverTypeEnum {
XGAGV(9, "xg_agv", "xg_agv", "agv"),
AUTODOOR(10, "standard_autodoor", "标准版-自动门", "autodoor");
AUTODOOR(10, "standard_autodoor", "标准版-自动门", "autodoor"),
TUBANXIAN_SITE(11, "tubanxian_site", "涂板线", "conveyor"),
GUHUASHI_SITE(12, "guhuashi_site", "固化室", "conveyor"),
TIANNENG_SITE(13, "tianneng_site", "天能-检测站点", "conveyor");
//驱动索引
private int index;

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

@@ -92,9 +92,9 @@ import java.io.InputStream;
import java.util.*;
/**
* @author jiaolm
* @date 2023-05-09
*/
* @author jiaolm
* @date 2023-05-09
*/
@Service
@AllArgsConstructor
@Slf4j
@@ -105,7 +105,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
// private final RedisUtils redisUtils;
private final DeviceMapper deviceMapper;
private final RouteLineMapper routeLineMapper;
// private final StageActorMapper stageActorMapper;
// private final StageActorMapper stageActorMapper;
private final StorageCellMapper storageCellMapper;
private final DeviceExtraMapper deviceExtraMapper;
private final DeviceRunpointMapper deviceRunpointMapper;
@@ -128,7 +128,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
}
@Override
public List<DeviceDto> queryAll(DeviceQueryParam query){
public List<DeviceDto> queryAll(DeviceQueryParam query) {
return ConvertUtil.convertList(deviceMapper.selectList(QueryHelpMybatisPlus.getPredicate(query)), DeviceDto.class);
}
@@ -152,7 +152,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
@Transactional(rollbackFor = Exception.class)
public int updateById(DeviceDto resources){
public int updateById(DeviceDto resources) {
Device entity = ConvertUtil.convert(resources, Device.class);
int ret = deviceMapper.updateById(entity);
// delCaches(resources.id);
@@ -161,14 +161,14 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
@Transactional(rollbackFor = Exception.class)
public int removeByIds(Set<String> ids){
public int removeByIds(Set<String> ids) {
// delCaches(ids);
return deviceMapper.deleteBatchIds(ids);
}
@Override
@Transactional(rollbackFor = Exception.class)
public int removeById(String id){
public int removeById(String id) {
Set<String> set = new HashSet<>(1);
set.add(id);
return this.removeByIds(set);
@@ -220,10 +220,10 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
IPage<Device> queryPage = PageUtil.toMybatisPage(page);
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")),Device::getDevice_type,whereJson.get("device_type"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")),i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry"))) ;
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")), Device::getDevice_type, whereJson.get("device_type"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry")));
wrapper.orderByAsc(Device::getIs_config).orderByDesc(Device::getSeq_num).orderByDesc(Device::getUpdate_time);
IPage<Device> devicePage = deviceMapper.queryPage(queryPage,wrapper);
IPage<Device> devicePage = deviceMapper.queryPage(queryPage, wrapper);
final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(devicePage, Device.class));
return json;
}
@@ -232,12 +232,12 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
public Map<String, Object> queryDeviceProtocol(Map whereJson, Pageable page) {
IPage<DeviceExtra> queryPage = PageUtil.toMybatisPage(page);
QueryWrapper<DeviceExtra> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_types")),"d.device_type",whereJson.get("device_types"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")),i ->i.like("d.device_code", whereJson.get("blurry")).or().like("d.device_name", whereJson.get("blurry")));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("opc_id")),"d.opc_server_id",whereJson.get("opc_id"));
wrapper.eq("d.is_delete","0");
wrapper.ne("e.filed_type","01");
IPage<DeviceExtra> devicePage = deviceExtraMapper.queryDeviceProtocolPage(queryPage,wrapper);
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_types")), "d.device_type", whereJson.get("device_types"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like("d.device_code", whereJson.get("blurry")).or().like("d.device_name", whereJson.get("blurry")));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("opc_id")), "d.opc_server_id", whereJson.get("opc_id"));
wrapper.eq("d.is_delete", "0");
wrapper.ne("e.filed_type", "01");
IPage<DeviceExtra> devicePage = deviceExtraMapper.queryDeviceProtocolPage(queryPage, wrapper);
final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(devicePage, DeviceExtra.class));
return json;
}
@@ -245,11 +245,11 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public JSONArray queryDeviceProtocol(Map whereJson) {
QueryWrapper<DeviceExtra> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_types")),"d.device_type",whereJson.get("device_types"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")),i ->i.like("d.device_code", whereJson.get("blurry")).or().like("d.device_name", whereJson.get("blurry")));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("opc_id")),"d.opc_server_id",whereJson.get("opc_id"));
wrapper.eq("d.is_delete","0");
wrapper.ne("e.filed_type","01");
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_types")), "d.device_type", whereJson.get("device_types"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like("d.device_code", whereJson.get("blurry")).or().like("d.device_name", whereJson.get("blurry")));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("opc_id")), "d.opc_server_id", whereJson.get("opc_id"));
wrapper.eq("d.is_delete", "0");
wrapper.ne("e.filed_type", "01");
List<DeviceExtra> deviceProtocolList = deviceExtraMapper.selectDeviceProtocolList(wrapper);
JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(deviceProtocolList));
return jsonArray;
@@ -258,9 +258,8 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public List<DeviceDto> queryAll(Map whereJson) {
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.list();
return ConvertUtil.convertList(deviceList,DeviceDto.class);
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).list();
return ConvertUtil.convertList(deviceList, DeviceDto.class);
}
// @Override
@@ -273,9 +272,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public DeviceDto findByCode(String code) {
Device device = new LambdaQueryChainWrapper<>(deviceMapper)
.eq(Device::getDevice_code, code)
.one();
Device device = new LambdaQueryChainWrapper<>(deviceMapper).eq(Device::getDevice_code, code).one();
return ConvertUtil.convert(device, DeviceDto.class);
}
@@ -311,8 +308,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
String device_code = dto.getDevice_code();
DeviceDto deviceDto = this.findByCode(device_code);
if (deviceDto != null && deviceDto.getIs_delete().equals("0")
&& !deviceDto.getDevice_id().equals(dto.getDevice_id())) {
if (deviceDto != null && deviceDto.getIs_delete().equals("0") && !deviceDto.getDevice_id().equals(dto.getDevice_id())) {
throw new BadRequestException("存在相同的设备编码");
}
@@ -337,19 +333,14 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
// WQLObject stageActorTab = WQLObject.getWQLObject("stage_actor");
for (String device_id : ids) {
// JSONObject deviceJson = wo.query("device_id = '" + device_id + "'").uniqueResult(0);
Device deviceJson = new LambdaQueryChainWrapper<>(deviceMapper)
.eq(Device::getDevice_id, device_id)
.one();
Device deviceJson = new LambdaQueryChainWrapper<>(deviceMapper).eq(Device::getDevice_id, device_id).one();
if (deviceJson == null) {
continue;
}
String device_code = deviceJson.getDevice_code();
log.debug("删除设备时候判断路由是否存在，如果存在，则不允许删除设备!");
// JSONObject json = routeLineTab.query("device_code = '" + device_code + "' or next_device_code = '" + device_code + "'").uniqueResult(0);
RouteLine json = new LambdaQueryChainWrapper<>(routeLineMapper)
.eq(RouteLine::getDevice_code, device_code)
.or().eq(RouteLine::getNext_device_code,device_code)
.one();
RouteLine json = new LambdaQueryChainWrapper<>(routeLineMapper).eq(RouteLine::getDevice_code, device_code).or().eq(RouteLine::getNext_device_code, device_code).one();
if (json != null) {
throw new BadRequestException("设备：【" + device_code + "】在路由已存在，无法删除!");
}
@@ -393,20 +384,18 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
storageCellMapper.deleteByStorageCode(device_code);
} else {
// JSONObject data = storageTab.query("storage_code ='" + device_code + "'").uniqueResult(0);
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper)
.eq(StorageCell::getStorage_code, device_code)
.one();
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper).eq(StorageCell::getStorage_code, device_code).one();
if (storageCell != null) {
// storageTab.delete("storage_code = '" + device_code + "'");
Map<String,Object> map = new HashMap<>();
map.put("storage_code",device_code);
Map<String, Object> map = new HashMap<>();
map.put("storage_code", device_code);
storageCellMapper.deleteByMap(map);
}
}
}
// wo.delete("device_id = '" + device_id + "'");
Map<String,Object> map = new HashMap<>();
map.put("device_id",device_id);
Map<String, Object> map = new HashMap<>();
map.put("device_id", device_id);
deviceMapper.deleteByMap(map);
}
}
@@ -470,10 +459,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public JSONArray selectList() {
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.apply("is_delete= '0' AND is_active= '1' AND is_config = 'true'")
.orderByAsc(Device::getDevice_code)
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).apply("is_delete= '0' AND is_active= '1' AND is_config = 'true'").orderByAsc(Device::getDevice_code).list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
JSONArray result = new JSONArray();
for (int i = 0; i < arr.size(); i++) {
@@ -492,9 +478,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
public JSONArray selectConveyorList() {
//设备基础信息表【acs_device】
// JSONArray arr = WQLObject.getWQLObject("acs_device").query("is_delete= '0' AND is_active= '1' AND device_type = 'conveyor'").getResultJSONArray(0);
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.apply("is_delete= '0' AND is_active= '1' AND device_type = 'conveyor'")
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).apply("is_delete= '0' AND is_active= '1' AND device_type = 'conveyor'").list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
JSONArray result = new JSONArray();
for (int i = 0; i < arr.size(); i++) {
@@ -512,10 +496,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public JSONArray selectDeviceListByRegion(String region) {
//设备基础信息表【acs_device】
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.apply("is_delete= '0' AND is_active= '1' and region = '" + region + "'")
.orderByAsc(Device::getDevice_code)
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).apply("is_delete= '0' AND is_active= '1' and region = '" + region + "'").orderByAsc(Device::getDevice_code).list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
//acs_device_extra
JSONArray result = new JSONArray();
@@ -526,9 +507,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
json.put("device_code", obj.getString("device_code"));
json.put("device_name", obj.getString("device_name"));
List<DeviceExtra> deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper)
.eq(DeviceExtra::getDevice_id,obj.getString("device_id"))
.list();
List<DeviceExtra> deviceExtraList = new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, obj.getString("device_id")).list();
JSONArray extraArr = JSONArray.parseArray(JSON.toJSONString(deviceExtraList));
for (int m = 0; m < extraArr.size(); m++) {
@@ -560,10 +539,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public JSONArray selectDeviceListOne() {
//设备基础信息表【acs_device】
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.apply("is_delete= '0' AND is_active= '1' AND region = '1'")
.orderByAsc(Device::getSeq_num)
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).apply("is_delete= '0' AND is_active= '1' AND region = '1'").orderByAsc(Device::getSeq_num).list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
//acs_device_extra
@@ -583,9 +559,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
json.put("material_type", standardOrdinarySiteDeviceDriver.getMaterial());
json.put("remark", standardOrdinarySiteDeviceDriver.getRemark());
}
List<DeviceExtra> deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper)
.eq(DeviceExtra::getDevice_id,obj.getString("device_id"))
.list();
List<DeviceExtra> deviceExtraList = new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, obj.getString("device_id")).list();
JSONArray extraArr = JSONArray.parseArray(JSON.toJSONString(deviceExtraList));
for (int m = 0; m < extraArr.size(); m++) {
@@ -618,10 +592,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
public JSONArray selectDeviceListTwo() {
//设备基础信息表【acs_device】
// JSONArray arr = WQLObject.getWQLObject("acs_device").query("is_delete= '0' AND is_active= '1' AND region = '2'", "seq_num").getResultJSONArray(0);
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.apply("is_delete= '0' AND is_active= '1' AND region = '2'")
.orderByAsc(Device::getSeq_num)
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).apply("is_delete= '0' AND is_active= '1' AND region = '2'").orderByAsc(Device::getSeq_num).list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
//acs_device_extra
// WQLObject extraTab = WQLObject.getWQLObject("acs_device_extra");
@@ -642,9 +613,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
json.put("remark", standardOrdinarySiteDeviceDriver.getRemark());
}
// JSONArray extraArr = extraTab.query("device_id = '" + obj.getString("device_id") + "'").getResultJSONArray(0);
List<DeviceExtra> deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper)
.eq(DeviceExtra::getDevice_id,obj.getString("device_id"))
.list();
List<DeviceExtra> deviceExtraList = new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, obj.getString("device_id")).list();
JSONArray extraArr = JSONArray.parseArray(JSON.toJSONString(deviceExtraList));
for (int m = 0; m < extraArr.size(); m++) {
JSONObject jsonObject = extraArr.getJSONObject(m);
@@ -676,10 +645,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
public JSONArray selectDeviceListThree() {
//设备基础信息表【acs_device】
// JSONArray arr = WQLObject.getWQLObject("acs_device").query("is_delete= '0' AND is_active= '1' AND region = '3'", "seq_num").getResultJSONArray(0);
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.apply("is_delete= '0' AND is_active= '1' AND region = '3'")
.orderByAsc(Device::getSeq_num)
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).apply("is_delete= '0' AND is_active= '1' AND region = '3'").orderByAsc(Device::getSeq_num).list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
//acs_device_extra
// WQLObject extraTab = WQLObject.getWQLObject("acs_device_extra");
@@ -700,9 +666,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
json.put("remark", standardOrdinarySiteDeviceDriver.getRemark());
}
// JSONArray extraArr = extraTab.query("device_id = '" + obj.getString("device_id") + "'").getResultJSONArray(0);
List<DeviceExtra> deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper)
.eq(DeviceExtra::getDevice_id,obj.getString("device_id"))
.list();
List<DeviceExtra> deviceExtraList = new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, obj.getString("device_id")).list();
JSONArray extraArr = JSONArray.parseArray(JSON.toJSONString(deviceExtraList));
for (int m = 0; m < extraArr.size(); m++) {
JSONObject jsonObject = extraArr.getJSONObject(m);
@@ -737,9 +701,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
// JSONArray arr = WQLObject.getWQLObject("acs_device").query("is_delete= '0' AND is_active= '1' and region != '' and is_config= 'true' ").getResultJSONArray(0);
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.apply("is_delete= '0' AND is_active= '1' and region != '' and is_config= 'true' ")
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).apply("is_delete= '0' AND is_active= '1' and region != '' and is_config= 'true' ").list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
JSONArray result = new JSONArray();
@@ -890,9 +852,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
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();
DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper).eq(DeviceRunpoint::getDevice_id, device_id).one();
// if (MapUtil.isEmpty(json)) {
if (ObjectUtil.isEmpty(deviceRunpoint)) {
@@ -927,7 +887,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
// wo.delete("device_id = '" + device_id + "' and filed_type = '02'");
LambdaQueryWrapper<DeviceExtra> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DeviceExtra::getDevice_id, device_id);
wrapper.eq(DeviceExtra::getFiled_type,"02");
wrapper.eq(DeviceExtra::getFiled_type, "02");
deviceExtraMapper.delete(wrapper);
for (int i = 0; i < data1.size(); i++) {
JSONObject param = new JSONObject();
@@ -955,7 +915,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
if (data2 != null) {
LambdaQueryWrapper<DeviceExtra> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DeviceExtra::getDevice_id, device_id);
wrapper.eq(DeviceExtra::getFiled_type,"03");
wrapper.eq(DeviceExtra::getFiled_type, "03");
deviceExtraMapper.delete(wrapper);
for (int i = 0; i < data2.size(); i++) {
JSONObject param = new JSONObject();
@@ -988,9 +948,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
for (int i = minY; i <= maxY; i++) {
for (int j = minZ; j <= maxZ; j++) {
// JSONObject json = wo.query("storage_code='" + device_code + "-" + formatNum(i) + "-" + formatNum(j) + "'").uniqueResult(0);
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper)
.eq(StorageCell::getStorage_code, device_code + "-" + formatNum(i) + "-" + formatNum(j))
.one();
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper).eq(StorageCell::getStorage_code, device_code + "-" + formatNum(i) + "-" + formatNum(j)).one();
if (ObjectUtil.isEmpty(storageCell)) {
StorageCellDto celldto = new StorageCellDto();
celldto.setStorage_id(IdUtil.simpleUUID());
@@ -1014,9 +972,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
int num = form.getInteger("max_emptypalletnum");
for (int i = 1; i < num + 1; i++) {
// JSONObject json = wo.query("storage_code ='" + device_code + "." + i + "'").uniqueResult(0);
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper)
.eq(StorageCell::getStorage_code, device_code + "." + i )
.one();
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper).eq(StorageCell::getStorage_code, device_code + "." + i).one();
if (ObjectUtil.isEmpty(storageCell)) {
StorageCellDto celldto = new StorageCellDto();
celldto.setStorage_id(IdUtil.simpleUUID());
@@ -1035,9 +991,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
}
} else {
// JSONObject json = wo.query("storage_code ='" + device_code + "'").uniqueResult(0);
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper)
.eq(StorageCell::getStorage_code, device_code )
.one();
StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper).eq(StorageCell::getStorage_code, device_code).one();
if (ObjectUtil.isEmpty(storageCell)) {
StorageCellDto celldto = new StorageCellDto();
celldto.setStorage_id(IdUtil.simpleUUID());
@@ -1063,7 +1017,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
}
@Override
public void changeDeviceStatus(JSONObject form) {
String device_code = form.getString("device_code");
@@ -1131,9 +1084,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
}
// 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();
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);
@@ -1172,9 +1123,8 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
} else if (device.getDeviceDriver() instanceof SiemensConveyorCkkDeviceDriver) {
SiemensConveyorCkkDeviceDriver siemensConveyorCkkDeviceDriver = (SiemensConveyorCkkDeviceDriver) device.getDeviceDriver();
siemensConveyorCkkDeviceDriver.setDeviceStatus(form);
} else if (device.getDeviceDriver() instanceof StandardCoveyorControlWithScannerDeviceDriver){
StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver
= (StandardCoveyorControlWithScannerDeviceDriver) device.getDeviceDriver();
} else if (device.getDeviceDriver() instanceof StandardCoveyorControlWithScannerDeviceDriver) {
StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver = (StandardCoveyorControlWithScannerDeviceDriver) device.getDeviceDriver();
standardCoveyorControlWithScannerDeviceDriver.setDeviceStatus(form);
}
}
@@ -1370,15 +1320,11 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
// JSONArray arr = WQLObject.getWQLObject("acs_device_extra").query("filed_type ='01' and device_id = '" + device_id + "'").getResultJSONArray(0);
List<DeviceExtra> deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper)
.eq(DeviceExtra::getDevice_id,device_id)
.eq(DeviceExtra::getFiled_type,"01")
.list();
List<DeviceExtra> deviceExtraList = new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getFiled_type, "01").list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceExtraList));
for (int i = 0; i < arr.size(); i++) {
final JSONObject json = arr.getJSONObject(i);
if ("true".equalsIgnoreCase(json.getString("extra_value")) ||
"false".equalsIgnoreCase(json.getString("extra_value"))) {
if ("true".equalsIgnoreCase(json.getString("extra_value")) || "false".equalsIgnoreCase(json.getString("extra_value"))) {
extraObj.put(json.getString("extra_code"), json.getBoolean("extra_value"));
} else {
boolean endsWith = json.getString("extra_value").endsWith("]");
@@ -1425,11 +1371,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
if (json.getBoolean("is_config")) {
//设备扩展表【acs_device_extra】
// JSONArray rs = WQLObject.getWQLObject("acs_device_extra").query("filed_type='02' and device_id = '" + device_id + "'", "order_seq").getResultJSONArray(0);
List<DeviceExtra> dList= new LambdaQueryChainWrapper<>(deviceExtraMapper)
.eq(DeviceExtra::getDevice_id,device_id)
.eq(DeviceExtra::getFiled_type,"02")
.orderByAsc(DeviceExtra::getOrder_seq)
.list();
List<DeviceExtra> dList = new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getFiled_type, "02").orderByAsc(DeviceExtra::getOrder_seq).list();
JSONArray rs = JSONArray.parseArray(JSON.toJSONString(dList));
JSONArray r_arry = new JSONArray();
//先获取模板
@@ -1479,11 +1421,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
}
}
// JSONArray ws = WQLObject.getWQLObject("acs_device_extra").query("filed_type='03' and device_id = '" + device_id + "'", "order_seq").getResultJSONArray(0);
List<DeviceExtra> wsList= new LambdaQueryChainWrapper<>(deviceExtraMapper)
.eq(DeviceExtra::getDevice_id,device_id)
.eq(DeviceExtra::getFiled_type,"03")
.orderByAsc(DeviceExtra::getOrder_seq)
.list();
List<DeviceExtra> wsList = new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getFiled_type, "03").orderByAsc(DeviceExtra::getOrder_seq).list();
JSONArray ws = JSONArray.parseArray(JSON.toJSONString(wsList));
JSONArray w_arry = new JSONArray();
@@ -1554,9 +1492,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
public JSONArray testRead(Map map) {
List dbItems = (List) map.get("dbItems");
String opc_id = (String) map.get("opc_id");
List<String> itemString = new ArrayList<String>();
for (int i = 0; i < dbItems.size(); i++) {
Object ob = dbItems.get(i);
JSONObject json = (JSONObject) JSONObject.toJSON(ob);
@@ -1565,7 +1501,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
}
Server server = ReadUtil.getServer(opc_id);
final Map<String, Object> readList = ReadUtil.read(itemString, server);
JSONArray result = new JSONArray();
for (int i = 0; i < dbItems.size(); i++) {
Object ob = dbItems.get(i);
@@ -1678,8 +1613,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
cellList.add(item.toArray());
}
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type",
"Client Access", "Scan Rate"};
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type", "Client Access", "Scan Rate"};
String fileName = "导出文件.csv";
byte[] bytes = ExportCSVUtil.writeCsvAfterToBytes(tableHeaderArr, cellList);
ExportCSVUtil.responseSetProperties(fileName, bytes, response);
@@ -1718,8 +1652,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
cellList.add(item.toArray());
}
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type",
"Client Access", "Scan Rate"};
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type", "Client Access", "Scan Rate"};
String fileName = "导出文件.csv";
byte[] bytes = ExportCSVUtil.writeCsvAfterToBytes(tableHeaderArr, cellList);
ExportCSVUtil.responseSetProperties(fileName, bytes, response);
@@ -1729,13 +1662,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
public JSONArray selectDeviceListByType(String type) {
// JSONArray arr = WQLObject.getWQLObject("acs_device").query("is_delete= '0' AND is_active= '1' and device_type = '" + type + "' AND is_config = 'true'", "device_code").getResultJSONArray(0);
// return arr;
List<Device> deviceList= new LambdaQueryChainWrapper<>(deviceMapper)
.eq(Device::getIs_delete,"0")
.eq(Device::getIs_active,"1")
.eq(Device::getDevice_type,type)
.eq(Device::getIs_config,"true")
.orderByAsc(Device::getDevice_code)
.list();
List<Device> deviceList = new LambdaQueryChainWrapper<>(deviceMapper).eq(Device::getIs_delete, "0").eq(Device::getIs_active, "1").eq(Device::getDevice_type, type).eq(Device::getIs_config, "true").orderByAsc(Device::getDevice_code).list();
JSONArray arr = JSONArray.parseArray(JSON.toJSONString(deviceList));
return arr;
}
@@ -1743,9 +1670,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public JSONObject queryStorageExtra(String device_code) {
// JSONObject device = WQLObject.getWQLObject("acs_device").query("device_code = '" + device_code + "'").uniqueResult(0);
Device device= new LambdaQueryChainWrapper<>(deviceMapper)
.eq(Device::getDevice_code,device_code)
.one();
Device device = new LambdaQueryChainWrapper<>(deviceMapper).eq(Device::getDevice_code, device_code).one();
String device_id = device.getDevice_id();
// WQLObject wo = WQLObject.getWQLObject("acs_device_extra");
JSONObject jo = new JSONObject();
@@ -1754,11 +1679,11 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
// jo.put("maxZ", wo.query("device_id = '" + device_id + "' AND extra_code = 'maxZ'").uniqueResult(0).getString("extra_value"));
// jo.put("minZ", wo.query("device_id = '" + device_id + "' AND extra_code = 'minZ'").uniqueResult(0).getString("extra_value"));
// jo.put("tunnel", wo.query("device_id = '" + device_id + "' AND extra_code = 'tunnel'").uniqueResult(0).getString("extra_value"));
jo.put("maxY", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id,device_id).eq(DeviceExtra::getExtra_code,"maxY").one().getExtra_value());
jo.put("minY", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id,device_id).eq(DeviceExtra::getExtra_code,"minY").one().getExtra_value());
jo.put("maxZ", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id,device_id).eq(DeviceExtra::getExtra_code,"maxZ").one().getExtra_value());
jo.put("minZ", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id,device_id).eq(DeviceExtra::getExtra_code,"minZ").one().getExtra_value());
jo.put("tunnel", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id,device_id).eq(DeviceExtra::getExtra_code,"tunnel").one().getExtra_value());
jo.put("maxY", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getExtra_code, "maxY").one().getExtra_value());
jo.put("minY", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getExtra_code, "minY").one().getExtra_value());
jo.put("maxZ", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getExtra_code, "maxZ").one().getExtra_value());
jo.put("minZ", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getExtra_code, "minZ").one().getExtra_value());
jo.put("tunnel", new LambdaQueryChainWrapper<>(deviceExtraMapper).eq(DeviceExtra::getDevice_id, device_id).eq(DeviceExtra::getExtra_code, "tunnel").one().getExtra_value());
return jo;
}
@@ -1789,8 +1714,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public List<StorageCellDto> queryAllStorageCell() {
List<StorageCell> list= new LambdaQueryChainWrapper<>(storageCellMapper)
.list();
List<StorageCell> list = new LambdaQueryChainWrapper<>(storageCellMapper).list();
return ConvertUtil.convertList(list, StorageCellDto.class);
}
@@ -2082,8 +2006,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
cellList.add(item.toArray());
}
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type",
"Client Access", "Scan Rate"};
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type", "Client Access", "Scan Rate"};
String fileName = "导出文件.csv";
byte[] bytes = ExportCSVUtil.writeCsvAfterToBytes(tableHeaderArr, cellList);
ExportCSVUtil.responseSetProperties(fileName, bytes, response);
@@ -2125,8 +2048,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
cellList.add(item.toArray());
}
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type",
"Client Access", "Scan Rate"};
String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type", "Client Access", "Scan Rate"};
String fileName = "导出文件.csv";
byte[] bytes = ExportCSVUtil.writeCsvAfterToBytes(tableHeaderArr, cellList);
ExportCSVUtil.responseSetProperties(fileName, bytes, response);

4
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
View File

@@ -126,9 +126,7 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
last_error = error;
last_state = state;
//message = StringFormatUtl.format("设备报警:{}", new Object[]{});
// String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString();
// String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString();
}
public synchronized String getStatus() {

29
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java
View File

@@ -14,6 +14,7 @@ import org.nl.acs.device_driver.RequestMethodEnum;
import org.nl.acs.device_driver.RouteableDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
import org.nl.acs.ext.wms.data.BaseRequest;
import org.nl.acs.ext.wms.data.feedBackTaskStatus.FeedBackTaskStatusRequest;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.domain.Instruction;
@@ -27,6 +28,7 @@ import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.acs.task.service.mapper.TaskMapper;
import org.nl.acs.utils.ConvertUtil;
import org.nl.acs.utils.ReadUtil;
import org.nl.common.utils.CodeUtil;
import org.nl.config.SpringContextHolder;
import org.openscada.opc.lib.da.Server;
@@ -183,12 +185,19 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements
}
if (error != last_error) {
}
if (status != last_status) {
if (devicecode.startsWith("GHS")) {
//ACS反馈LMS固化室状态
BaseRequest request = new BaseRequest();
request.setState(String.valueOf(status));
request.setDevice_code(this.devicecode);
request.setType("1");
acsToWmsService.notify(request);
}
}
} catch (Exception var17) {
return;
}
if (!this.itemProtocol.getIsonline()) {
this.setIsonline(false);
this.setIserror(true);
@@ -265,15 +274,19 @@ public class GuhuashiSiteDeviceDriver extends AbstractOpcDeviceDriver implements
public void writing(int command) {
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + ItemProtocol.item_to_command;
//String opcservcerid = this.getDevice().getOpc_server_id();
//Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
//Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_command, command);
this.control(itemMap);
}
public void writing(String param,int command) {
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + param;
Map<String, Object> itemMap = new HashMap<>();
itemMap.put(to_command, command);
this.control(itemMap);
}
@Override
public JSONObject getDeviceStatusName() {

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDefination.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
public class SiteDefination implements OpcDeviceDriverDefination {
@Override
public String getDriverCode() {
return "site";
return "tianneng_site";
}
@Override

24
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
View File

@@ -3,6 +3,7 @@ package org.nl.acs.device_driver.tianneng.site;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import lombok.RequiredArgsConstructor;
@@ -14,6 +15,7 @@ import org.nl.acs.device_driver.RequestMethodEnum;
import org.nl.acs.device_driver.RouteableDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
import org.nl.acs.ext.wms.data.BaseRequest;
import org.nl.acs.ext.wms.data.feedBackTaskStatus.FeedBackTaskStatusRequest;
import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.domain.Instruction;
@@ -29,6 +31,7 @@ import org.nl.acs.task.service.mapper.TaskMapper;
import org.nl.acs.utils.ConvertUtil;
import org.nl.common.utils.CodeUtil;
import org.nl.config.SpringContextHolder;
import org.nl.system.service.lucene.dto.LuceneLogDto;
import org.openscada.opc.lib.da.Server;
import java.util.Date;
@@ -42,7 +45,7 @@ import java.util.Map;
@Slf4j
@Data
@RequiredArgsConstructor
public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver , DeviceStageMonitor {
public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
protected ItemProtocol itemProtocol = new ItemProtocol(this);
InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
@@ -55,7 +58,7 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
TaskMapper taskMapper;
AcsToWmsService acsToWmsService=SpringContextHolder.getBean("acsToWmsServiceImpl");
AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl");
String container;
String container_type_desc;
@@ -87,7 +90,7 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
int material_type = 0;
int last_material_type = 0;
int barcode = 0;
int last_barcode =0;
int last_barcode = 0;
boolean hasVehicle = false;
@@ -152,20 +155,25 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
material_type = this.itemProtocol.getMaterialType();
if (mode != last_mode) {
this.setRequireSucess(false);
if(mode==2){
if (mode == 2) {
this.writing(0);
}
}
if (move != last_move) {
//反馈输送线点位状态
if (devicecode.startsWith("ZCSSX")) {
BaseRequest request = new BaseRequest();
request.setType("2");
request.setDevice_code(devicecode);
request.setState(String.valueOf(move));
acsToWmsService.notify(request);
}
}
if (error != last_error) {
}
} catch (Exception var17) {
return;
}
if (!this.itemProtocol.getIsonline()) {
this.setIsonline(false);
this.setIserror(true);
@@ -237,7 +245,7 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
last_move = move;
last_task = task;
last_material_type = material_type;
last_barcode=barcode;
last_barcode = barcode;
}

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/tubanxian/TubanxianSiteDeviceDriver.java
View File

@@ -241,9 +241,8 @@ public class TubanxianSiteDeviceDriver extends AbstractOpcDeviceDriver implement
public void writing(int command) {
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + ItemProtocol.item_to_command;
//String opcservcerid = this.getDevice().getOpc_server_id();
//Server server = ReadUtil.getServer(opcservcerid);
//Server server = ReadUtil.getServer(opcservcerid);
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_command, command);
this.control(itemMap);

3
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
View File

@@ -113,6 +113,9 @@ public interface AcsToWmsService {
*/
HttpResponse feedAgvTaskStatus(JSONArray from);
/**
* ACS向WMS申请任务
*/

15
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -18,6 +18,7 @@ import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDev
import org.nl.acs.device_driver.basedriver.plug_pull_device_site.PlugPullDeviceSiteDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_autodoor.StandardAutodoorDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
import org.nl.acs.device_driver.tianneng.guhuashi.GuhuashiSiteDeviceDriver;
import org.nl.acs.ext.wms.data.*;
import org.nl.acs.ext.wms.service.AcsToLiKuService;
import org.nl.acs.ext.wms.service.WmsToAcsService;
@@ -634,20 +635,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
Device device;
switch(type){
case 1:
//wms通知固化室满料，开始固化
//LMS通知固化室极板已进满信号，开始固化
device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) {
StandardAutodoorDeviceDriver standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
standardAutodoorDeviceDriver.writing("to_state",1);
if (device.getDeviceDriver() instanceof GuhuashiSiteDeviceDriver) {
GuhuashiSiteDeviceDriver guhuashiSiteDeviceDriver = (GuhuashiSiteDeviceDriver) device.getDeviceDriver();
guhuashiSiteDeviceDriver.writing("plates_is_full",1);
}
break;
case 2:
//wms通知固化室取料完毕，重新开放可使用
device = deviceAppService.findDeviceByCode(device_code);
if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) {
StandardAutodoorDeviceDriver standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver();
standardAutodoorDeviceDriver.writing("to_state",2);
}
break;
default:
break;

1
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java
View File

@@ -34,7 +34,6 @@ public class ReadUtil {
public static Server getServer(String opc_id) {
//OPC表【acs_opc】
// JSONObject opcObj = WQLObject.getWQLObject("acs_opc").query("opc_id = '" + opc_id + "'").uniqueResult(0);
Opc opc = new LambdaQueryChainWrapper<>(opcMapper)
.eq(Opc::getOpc_id,opc_id)
.one();

8
acs/nladmin-ui/src/views/acs/device/config.vue
View File

@@ -88,12 +88,16 @@ import empty_vehicle_stacking_position from '@/views/acs/device/driver/empty_veh
import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one'
import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
import xg_agv from '@/views/acs/device/driver/agv/xg_agv'
import tubanxian_site from './driver/tubanxian_site.vue'
import tianneng_site from './driver/tianneng_site.vue'
import guhuashi_site from './driver/guhuashi_site.vue'
export default {
name: 'DeviceConfig',
components: {
tianneng_site,
guhuashi_site,
standard_autodoor,
tubanxian_site,
standard_ordinary_site,
standard_inspect_site,
standard_storage,

488
acs/nladmin-ui/src/views/acs/device/driver/guhuashi_site.vue Normal file
View File

@@ -0,0 +1,488 @@
<template>
<!--固化室-->
<div>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">设备协议：</span>
</div>
<el-row>
<el-col :span="12">
OpcServer:
<el-select
v-model="opc_id"
placeholder="无"
clearable
filterable
@change="changeOpc"
>
<el-option
v-for="item in dataOpcservers"
:key="item.opc_id"
:label="item.opc_name"
:value="item.opc_id"
/>
</el-select>
</el-col>
<el-col :span="12">
PLC:
<el-select
v-model="plc_id"
placeholder="无"
clearable
@change="changePlc"
>
<el-option
v-for="item in dataOpcPlcs"
:key="item.plc_id"
:label="item.plc_name"
:value="item.plc_id"
/>
</el-select>
</el-col>
</el-row>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">输送系统：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="电气调度号" label-width="150px">
<el-input v-model="form.address" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">指令相关：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="检验有货">
<el-switch v-model="form.inspect_in_stocck" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视取货校验" label-width="150px">
<el-switch v-model="form.ignore_pickup_check" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视放货校验" label-width="150px">
<el-switch v-model="form.ignore_release_check" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="呼叫">
<el-switch v-model="form.apply_task" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="响应" label-width="150px">
<el-switch v-model="form.manual_create_task" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="关联设备" prop="device_code">
<el-select
v-model="form.link_device_code"
filterable
multiple
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联三色灯" prop="device_code" label-width="100px">
<el-select
v-model="form.link_three_lamp"
filterable
clearable
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否输入物料" label-width="150px">
<el-switch v-model="form.input_material" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">AGV相关：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="取货">
<el-switch v-model="form.is_pickup" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="放货">
<el-switch v-model="form.is_release" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC读取字段：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-table
v-loading="false"
:data="data1"
:max-height="550"
size="small"
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data1[scope.$index].db"
size="mini"
class="edit-input"
@input="finishReadEdit(data1[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column prop="dbr_value">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC写入字段：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-table
v-loading="false"
:data="data2"
:max-height="550"
size="small"
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data2[scope.$index].db"
size="mini"
class="edit-input"
@input="finishWriteEdit(data2[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column prop="dbw_value">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span" />
<el-button
:loading="false"
icon="el-icon-check"
size="mini"
style="float: right; padding: 6px 9px"
type="primary"
@click="doSubmit"
>保存
</el-button>
</div>
</el-card>
</div>
</template>
<script>
import {
queryDriverConfig,
updateConfig,
testRead,
testwrite
} from '@/api/acs/device/driverConfig'
import { selectOpcList } from '@/api/acs/device/opc'
import { selectPlcList } from '@/api/acs/device/opcPlc'
import { selectListByOpcID } from '@/api/acs/device/opcPlc'
import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardInspectSite',
mixins: [crud],
props: {
parentForm: {
type: Object,
require: true
}
},
data() {
return {
device_code: '',
device_id: '',
plc_id: '',
plc_code: '',
opc_id: '',
opc_code: '',
configLoading: false,
dataOpcservers: [],
dataOpcPlcs: [],
deviceList: [],
data1: [],
data2: [],
form: {
inspect_in_stocck: true,
ignore_pickup_check: true,
ignore_release_check: true,
apply_task: true,
link_three_lamp: '',
manual_create_task: true,
is_pickup: true,
is_release: true,
link_device_code: [],
address: ''
},
rules: {}
}
},
created() {
this.$nextTick(() => {
// 从父表单获取设备编码
this.device_id = this.$props.parentForm.device_id
this.device_code = this.$props.parentForm.device_code
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
// 给表单赋值，并且属性不能为空
if (data.form) {
const arr = Object.keys(data.form)
// 不为空
if (arr.length > 0) {
this.form = data.form
}
}
// 给表单赋值，并且属性不能为空
if (data.parentForm) {
const arr = Object.keys(data.parentForm)
// 不为空
if (arr.length > 0) {
this.opc_code = data.parentForm.opc_code
this.plc_code = data.parentForm.plc_code
}
}
this.data1 = data.rs
this.data2 = data.ws
this.sliceItem()
})
selectPlcList().then(data => {
this.dataOpcPlcs = data
this.plc_id = this.$props.parentForm.opc_plc_id
})
selectOpcList().then(data => {
this.dataOpcservers = data
this.opc_id = this.$props.parentForm.opc_server_id
})
deviceCrud.selectDeviceList().then(data => {
this.deviceList = data
})
})
},
methods: {
finishReadEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('mode') !== -1) {
debugger
const dbValue = data.db
// .之前的字符串
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
const endNumber = afterStr.substring(1)
// 最后为非数字
if (isNaN(parseInt(endNumber))) {
return
}
for (const val in this.data1) {
if (this.data1[val].code.indexOf('move') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
}
if (this.data1[val].code.indexOf('error') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
}
if (this.data1[val].code.indexOf('task') !== -1) {
this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7)
}
}
}
},
finishWriteEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('to_command') !== -1) {
const dbValue = data.db
// .之前的字符串
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
const endNumber = afterStr.substring(1)
// 最后为非数字
if (isNaN(parseInt(endNumber))) {
return
}
for (const val in this.data2) {
if (this.data2[val].code.indexOf('to_target') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
}
if (this.data2[val].code.indexOf('to_task') !== -1) {
this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
}
}
}
},
changeOpc(val) {
this.dataOpcservers.forEach(item => {
if (item.opc_id === val) {
this.opc_code = item.opc_code
}
})
selectListByOpcID(val).then(data => {
this.dataOpcPlcs = data
this.plc_id = ''
this.plc_code = ''
if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
this.plc_id = this.dataOpcPlcs[0].plc_id
this.plc_code = this.dataOpcPlcs[0].plc_code
}
this.sliceItem()
})
},
changePlc(val) {
this.dataOpcPlcs.forEach(item => {
if (item.plc_id === val) {
this.plc_code = item.plc_code
this.sliceItem()
return
}
})
},
test_read1() {
testRead(this.data1, this.opc_id).then(data => {
this.data1 = data
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
test_write1() {
testwrite(this.data2, this.opc_id).then(data => {
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
doSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.configLoading = true
// 根据驱动类型判断是否为路由设备
const parentForm = this.parentForm
parentForm.is_route = true
parentForm.plc_id = this.plc_id
parentForm.opc_id = this.opc_id
updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
this.notify('保存成功', 'success')
this.configLoading = false
}).catch(err => {
this.configLoading = false
console.log(err.response.data.message)
})
}
})
},
sliceItem() { // 拼接DB的Item值
this.data1.forEach(item => {
const str = item.code
// 是否包含.
if (str.search('.') !== -1) {
// 截取最后一位
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
} else {
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
}
})
this.data2.forEach(item => {
const str = item.code
// 是否包含.
if (str.search('.') !== -1) {
// 截取最后一位
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
} else {
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
}
})
}
}
}
</script>
<style scoped>
</style>

488
acs/nladmin-ui/src/views/acs/device/driver/tianneng_site.vue Normal file
View File

@@ -0,0 +1,488 @@
<template>
<!--天能-检测站点-->
<div>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">设备协议：</span>
</div>
<el-row>
<el-col :span="12">
OpcServer:
<el-select
v-model="opc_id"
placeholder="无"
clearable
filterable
@change="changeOpc"
>
<el-option
v-for="item in dataOpcservers"
:key="item.opc_id"
:label="item.opc_name"
:value="item.opc_id"
/>
</el-select>
</el-col>
<el-col :span="12">
PLC:
<el-select
v-model="plc_id"
placeholder="无"
clearable
@change="changePlc"
>
<el-option
v-for="item in dataOpcPlcs"
:key="item.plc_id"
:label="item.plc_name"
:value="item.plc_id"
/>
</el-select>
</el-col>
</el-row>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">输送系统：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="电气调度号" label-width="150px">
<el-input v-model="form.address" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">指令相关：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="检验有货">
<el-switch v-model="form.inspect_in_stocck" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视取货校验" label-width="150px">
<el-switch v-model="form.ignore_pickup_check" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视放货校验" label-width="150px">
<el-switch v-model="form.ignore_release_check" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="呼叫">
<el-switch v-model="form.apply_task" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="响应" label-width="150px">
<el-switch v-model="form.manual_create_task" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="关联设备" prop="device_code">
<el-select
v-model="form.link_device_code"
filterable
multiple
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联三色灯" prop="device_code" label-width="100px">
<el-select
v-model="form.link_three_lamp"
filterable
clearable
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否输入物料" label-width="150px">
<el-switch v-model="form.input_material" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">AGV相关：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="取货">
<el-switch v-model="form.is_pickup" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="放货">
<el-switch v-model="form.is_release" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC读取字段：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-table
v-loading="false"
:data="data1"
:max-height="550"
size="small"
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data1[scope.$index].db"
size="mini"
class="edit-input"
@input="finishReadEdit(data1[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column prop="dbr_value">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC写入字段：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-table
v-loading="false"
:data="data2"
:max-height="550"
size="small"
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data2[scope.$index].db"
size="mini"
class="edit-input"
@input="finishWriteEdit(data2[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column prop="dbw_value">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span" />
<el-button
:loading="false"
icon="el-icon-check"
size="mini"
style="float: right; padding: 6px 9px"
type="primary"
@click="doSubmit"
>保存
</el-button>
</div>
</el-card>
</div>
</template>
<script>
import {
queryDriverConfig,
updateConfig,
testRead,
testwrite
} from '@/api/acs/device/driverConfig'
import { selectOpcList } from '@/api/acs/device/opc'
import { selectPlcList } from '@/api/acs/device/opcPlc'
import { selectListByOpcID } from '@/api/acs/device/opcPlc'
import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardInspectSite',
mixins: [crud],
props: {
parentForm: {
type: Object,
require: true
}
},
data() {
return {
device_code: '',
device_id: '',
plc_id: '',
plc_code: '',
opc_id: '',
opc_code: '',
configLoading: false,
dataOpcservers: [],
dataOpcPlcs: [],
deviceList: [],
data1: [],
data2: [],
form: {
inspect_in_stocck: true,
ignore_pickup_check: true,
ignore_release_check: true,
apply_task: true,
link_three_lamp: '',
manual_create_task: true,
is_pickup: true,
is_release: true,
link_device_code: [],
address: ''
},
rules: {}
}
},
created() {
this.$nextTick(() => {
// 从父表单获取设备编码
this.device_id = this.$props.parentForm.device_id
this.device_code = this.$props.parentForm.device_code
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
// 给表单赋值，并且属性不能为空
if (data.form) {
const arr = Object.keys(data.form)
// 不为空
if (arr.length > 0) {
this.form = data.form
}
}
// 给表单赋值，并且属性不能为空
if (data.parentForm) {
const arr = Object.keys(data.parentForm)
// 不为空
if (arr.length > 0) {
this.opc_code = data.parentForm.opc_code
this.plc_code = data.parentForm.plc_code
}
}
this.data1 = data.rs
this.data2 = data.ws
this.sliceItem()
})
selectPlcList().then(data => {
this.dataOpcPlcs = data
this.plc_id = this.$props.parentForm.opc_plc_id
})
selectOpcList().then(data => {
this.dataOpcservers = data
this.opc_id = this.$props.parentForm.opc_server_id
})
deviceCrud.selectDeviceList().then(data => {
this.deviceList = data
})
})
},
methods: {
finishReadEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('mode') !== -1) {
debugger
const dbValue = data.db
// .之前的字符串
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
const endNumber = afterStr.substring(1)
// 最后为非数字
if (isNaN(parseInt(endNumber))) {
return
}
for (const val in this.data1) {
if (this.data1[val].code.indexOf('move') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
}
if (this.data1[val].code.indexOf('error') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
}
if (this.data1[val].code.indexOf('task') !== -1) {
this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7)
}
}
}
},
finishWriteEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('to_command') !== -1) {
const dbValue = data.db
// .之前的字符串
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
const endNumber = afterStr.substring(1)
// 最后为非数字
if (isNaN(parseInt(endNumber))) {
return
}
for (const val in this.data2) {
if (this.data2[val].code.indexOf('to_target') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
}
if (this.data2[val].code.indexOf('to_task') !== -1) {
this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
}
}
}
},
changeOpc(val) {
this.dataOpcservers.forEach(item => {
if (item.opc_id === val) {
this.opc_code = item.opc_code
}
})
selectListByOpcID(val).then(data => {
this.dataOpcPlcs = data
this.plc_id = ''
this.plc_code = ''
if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
this.plc_id = this.dataOpcPlcs[0].plc_id
this.plc_code = this.dataOpcPlcs[0].plc_code
}
this.sliceItem()
})
},
changePlc(val) {
this.dataOpcPlcs.forEach(item => {
if (item.plc_id === val) {
this.plc_code = item.plc_code
this.sliceItem()
return
}
})
},
test_read1() {
testRead(this.data1, this.opc_id).then(data => {
this.data1 = data
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
test_write1() {
testwrite(this.data2, this.opc_id).then(data => {
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
doSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.configLoading = true
// 根据驱动类型判断是否为路由设备
const parentForm = this.parentForm
parentForm.is_route = true
parentForm.plc_id = this.plc_id
parentForm.opc_id = this.opc_id
updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
this.notify('保存成功', 'success')
this.configLoading = false
}).catch(err => {
this.configLoading = false
console.log(err.response.data.message)
})
}
})
},
sliceItem() { // 拼接DB的Item值
this.data1.forEach(item => {
const str = item.code
// 是否包含.
if (str.search('.') !== -1) {
// 截取最后一位
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
} else {
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
}
})
this.data2.forEach(item => {
const str = item.code
// 是否包含.
if (str.search('.') !== -1) {
// 截取最后一位
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
} else {
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
}
})
}
}
}
</script>
<style scoped>
</style>

488
acs/nladmin-ui/src/views/acs/device/driver/tubanxian_site.vue Normal file
View File

@@ -0,0 +1,488 @@
<template>
<!--涂板线-->
<div>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">设备协议：</span>
</div>
<el-row>
<el-col :span="12">
OpcServer:
<el-select
v-model="opc_id"
placeholder="无"
clearable
filterable
@change="changeOpc"
>
<el-option
v-for="item in dataOpcservers"
:key="item.opc_id"
:label="item.opc_name"
:value="item.opc_id"
/>
</el-select>
</el-col>
<el-col :span="12">
PLC:
<el-select
v-model="plc_id"
placeholder="无"
clearable
@change="changePlc"
>
<el-option
v-for="item in dataOpcPlcs"
:key="item.plc_id"
:label="item.plc_name"
:value="item.plc_id"
/>
</el-select>
</el-col>
</el-row>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">输送系统：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="电气调度号" label-width="150px">
<el-input v-model="form.address" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">指令相关：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="检验有货">
<el-switch v-model="form.inspect_in_stocck" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视取货校验" label-width="150px">
<el-switch v-model="form.ignore_pickup_check" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视放货校验" label-width="150px">
<el-switch v-model="form.ignore_release_check" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="呼叫">
<el-switch v-model="form.apply_task" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="响应" label-width="150px">
<el-switch v-model="form.manual_create_task" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="关联设备" prop="device_code">
<el-select
v-model="form.link_device_code"
filterable
multiple
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联三色灯" prop="device_code" label-width="100px">
<el-select
v-model="form.link_three_lamp"
filterable
clearable
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否输入物料" label-width="150px">
<el-switch v-model="form.input_material" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">AGV相关：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="取货">
<el-switch v-model="form.is_pickup" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="放货">
<el-switch v-model="form.is_release" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC读取字段：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-table
v-loading="false"
:data="data1"
:max-height="550"
size="small"
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data1[scope.$index].db"
size="mini"
class="edit-input"
@input="finishReadEdit(data1[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column prop="dbr_value">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC写入字段：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-table
v-loading="false"
:data="data2"
:max-height="550"
size="small"
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data2[scope.$index].db"
size="mini"
class="edit-input"
@input="finishWriteEdit(data2[scope.$index])"
/>
</template>
</el-table-column>
<el-table-column prop="dbw_value">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span" />
<el-button
:loading="false"
icon="el-icon-check"
size="mini"
style="float: right; padding: 6px 9px"
type="primary"
@click="doSubmit"
>保存
</el-button>
</div>
</el-card>
</div>
</template>
<script>
import {
queryDriverConfig,
updateConfig,
testRead,
testwrite
} from '@/api/acs/device/driverConfig'
import { selectOpcList } from '@/api/acs/device/opc'
import { selectPlcList } from '@/api/acs/device/opcPlc'
import { selectListByOpcID } from '@/api/acs/device/opcPlc'
import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardInspectSite',
mixins: [crud],
props: {
parentForm: {
type: Object,
require: true
}
},
data() {
return {
device_code: '',
device_id: '',
plc_id: '',
plc_code: '',
opc_id: '',
opc_code: '',
configLoading: false,
dataOpcservers: [],
dataOpcPlcs: [],
deviceList: [],
data1: [],
data2: [],
form: {
inspect_in_stocck: true,
ignore_pickup_check: true,
ignore_release_check: true,
apply_task: true,
link_three_lamp: '',
manual_create_task: true,
is_pickup: true,
is_release: true,
link_device_code: [],
address: ''
},
rules: {}
}
},
created() {
this.$nextTick(() => {
// 从父表单获取设备编码
this.device_id = this.$props.parentForm.device_id
this.device_code = this.$props.parentForm.device_code
queryDriverConfig(this.device_id, this.$props.parentForm.driver_code).then(data => {
// 给表单赋值，并且属性不能为空
if (data.form) {
const arr = Object.keys(data.form)
// 不为空
if (arr.length > 0) {
this.form = data.form
}
}
// 给表单赋值，并且属性不能为空
if (data.parentForm) {
const arr = Object.keys(data.parentForm)
// 不为空
if (arr.length > 0) {
this.opc_code = data.parentForm.opc_code
this.plc_code = data.parentForm.plc_code
}
}
this.data1 = data.rs
this.data2 = data.ws
this.sliceItem()
})
selectPlcList().then(data => {
this.dataOpcPlcs = data
this.plc_id = this.$props.parentForm.opc_plc_id
})
selectOpcList().then(data => {
this.dataOpcservers = data
this.opc_id = this.$props.parentForm.opc_server_id
})
deviceCrud.selectDeviceList().then(data => {
this.deviceList = data
})
})
},
methods: {
finishReadEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('mode') !== -1) {
debugger
const dbValue = data.db
// .之前的字符串
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
const endNumber = afterStr.substring(1)
// 最后为非数字
if (isNaN(parseInt(endNumber))) {
return
}
for (const val in this.data1) {
if (this.data1[val].code.indexOf('move') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 1)
}
if (this.data1[val].code.indexOf('error') !== -1) {
this.data1[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 5)
}
if (this.data1[val].code.indexOf('task') !== -1) {
this.data1[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 7)
}
}
}
},
finishWriteEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('to_command') !== -1) {
const dbValue = data.db
// .之前的字符串
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
const endNumber = afterStr.substring(1)
// 最后为非数字
if (isNaN(parseInt(endNumber))) {
return
}
for (const val in this.data2) {
if (this.data2[val].code.indexOf('to_target') !== -1) {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
}
if (this.data2[val].code.indexOf('to_task') !== -1) {
this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
}
}
}
},
changeOpc(val) {
this.dataOpcservers.forEach(item => {
if (item.opc_id === val) {
this.opc_code = item.opc_code
}
})
selectListByOpcID(val).then(data => {
this.dataOpcPlcs = data
this.plc_id = ''
this.plc_code = ''
if (this.dataOpcPlcs && this.dataOpcPlcs.length > 0) {
this.plc_id = this.dataOpcPlcs[0].plc_id
this.plc_code = this.dataOpcPlcs[0].plc_code
}
this.sliceItem()
})
},
changePlc(val) {
this.dataOpcPlcs.forEach(item => {
if (item.plc_id === val) {
this.plc_code = item.plc_code
this.sliceItem()
return
}
})
},
test_read1() {
testRead(this.data1, this.opc_id).then(data => {
this.data1 = data
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
test_write1() {
testwrite(this.data2, this.opc_id).then(data => {
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
doSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.configLoading = true
// 根据驱动类型判断是否为路由设备
const parentForm = this.parentForm
parentForm.is_route = true
parentForm.plc_id = this.plc_id
parentForm.opc_id = this.opc_id
updateConfig(parentForm, this.form, this.data1, this.data2).then(res => {
this.notify('保存成功', 'success')
this.configLoading = false
}).catch(err => {
this.configLoading = false
console.log(err.response.data.message)
})
}
})
},
sliceItem() { // 拼接DB的Item值
this.data1.forEach(item => {
const str = item.code
// 是否包含.
if (str.search('.') !== -1) {
// 截取最后一位
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
} else {
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
}
})
this.data2.forEach(item => {
const str = item.code
// 是否包含.
if (str.search('.') !== -1) {
// 截取最后一位
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + str.slice(str.lastIndexOf('.') + 1)
} else {
item.code = this.opc_code + '.' + this.plc_code + '.' + this.device_code + '.' + item.code
}
})
}
}
}
</script>
<style scoped>
</style>

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -178,15 +178,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String requestNo = param.getString("requestNo");
log.info("notifyAcs - 请求参数 {}", param);
Integer type=param.getInteger("type");
String device_code = param.getString("device_code");
String state = param.getString("state");
switch(type) {
case 1:
//自动门反馈设备状态，将对应十个固化室工位的状态修改为传入状态
String device_code = param.getString("device_code");
String ghs_device_code="GHS"+device_code.substring(device_code.length()-2);
String state = param.getString("state");
pointMapper.updatePointStatus(ghs_device_code,state);
break;
case 2:
//实时反馈点位状态,空架输送线全部点位
pointMapper.updatePointStatus(device_code,state);
break;
default:
break;