diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index 171c793..1771aaf 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -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; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 06f6478..e58561c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -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 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 i } @Override - public List queryAll(DeviceQueryParam query){ + public List queryAll(DeviceQueryParam query) { return ConvertUtil.convertList(deviceMapper.selectList(QueryHelpMybatisPlus.getPredicate(query)), DeviceDto.class); } @@ -152,7 +152,7 @@ public class DeviceServiceImpl extends CommonServiceImpl 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 i @Override @Transactional(rollbackFor = Exception.class) - public int removeByIds(Set ids){ + public int removeByIds(Set ids) { // delCaches(ids); return deviceMapper.deleteBatchIds(ids); } @Override @Transactional(rollbackFor = Exception.class) - public int removeById(String id){ + public int removeById(String id) { Set set = new HashSet<>(1); set.add(id); return this.removeByIds(set); @@ -220,10 +220,10 @@ public class DeviceServiceImpl extends CommonServiceImpl i public Map queryAll(Map whereJson, Pageable page) { IPage queryPage = PageUtil.toMybatisPage(page); LambdaQueryWrapper 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 devicePage = deviceMapper.queryPage(queryPage,wrapper); + IPage 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 i public Map queryDeviceProtocol(Map whereJson, Pageable page) { IPage queryPage = PageUtil.toMybatisPage(page); QueryWrapper 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 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 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 i @Override public JSONArray queryDeviceProtocol(Map whereJson) { QueryWrapper 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 deviceProtocolList = deviceExtraMapper.selectDeviceProtocolList(wrapper); JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(deviceProtocolList)); return jsonArray; @@ -258,9 +258,8 @@ public class DeviceServiceImpl extends CommonServiceImpl i @Override public List queryAll(Map whereJson) { - List deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .list(); - return ConvertUtil.convertList(deviceList,DeviceDto.class); + List deviceList = new LambdaQueryChainWrapper<>(deviceMapper).list(); + return ConvertUtil.convertList(deviceList, DeviceDto.class); } // @Override @@ -273,9 +272,7 @@ public class DeviceServiceImpl extends CommonServiceImpl 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 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 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 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 map = new HashMap<>(); - map.put("storage_code",device_code); + Map map = new HashMap<>(); + map.put("storage_code", device_code); storageCellMapper.deleteByMap(map); } } } // wo.delete("device_id = '" + device_id + "'"); - Map map = new HashMap<>(); - map.put("device_id",device_id); + Map map = new HashMap<>(); + map.put("device_id", device_id); deviceMapper.deleteByMap(map); } } @@ -470,10 +459,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i @Override public JSONArray selectList() { - List deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .apply("is_delete= '0' AND is_active= '1' AND is_config = 'true'") - .orderByAsc(Device::getDevice_code) - .list(); + List 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 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 deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .apply("is_delete= '0' AND is_active= '1' AND device_type = 'conveyor'") - .list(); + List 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 i @Override public JSONArray selectDeviceListByRegion(String region) { //设备基础信息表【acs_device】 - List deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .apply("is_delete= '0' AND is_active= '1' and region = '" + region + "'") - .orderByAsc(Device::getDevice_code) - .list(); + List 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 i json.put("device_code", obj.getString("device_code")); json.put("device_name", obj.getString("device_name")); - List deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper) - .eq(DeviceExtra::getDevice_id,obj.getString("device_id")) - .list(); + List 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 i @Override public JSONArray selectDeviceListOne() { //设备基础信息表【acs_device】 - List deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .apply("is_delete= '0' AND is_active= '1' AND region = '1'") - .orderByAsc(Device::getSeq_num) - .list(); + List 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 i json.put("material_type", standardOrdinarySiteDeviceDriver.getMaterial()); json.put("remark", standardOrdinarySiteDeviceDriver.getRemark()); } - List deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper) - .eq(DeviceExtra::getDevice_id,obj.getString("device_id")) - .list(); + List 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 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 deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .apply("is_delete= '0' AND is_active= '1' AND region = '2'") - .orderByAsc(Device::getSeq_num) - .list(); + List 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 i json.put("remark", standardOrdinarySiteDeviceDriver.getRemark()); } // JSONArray extraArr = extraTab.query("device_id = '" + obj.getString("device_id") + "'").getResultJSONArray(0); - List deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper) - .eq(DeviceExtra::getDevice_id,obj.getString("device_id")) - .list(); + List 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 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 deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .apply("is_delete= '0' AND is_active= '1' AND region = '3'") - .orderByAsc(Device::getSeq_num) - .list(); + List 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 i json.put("remark", standardOrdinarySiteDeviceDriver.getRemark()); } // JSONArray extraArr = extraTab.query("device_id = '" + obj.getString("device_id") + "'").getResultJSONArray(0); - List deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper) - .eq(DeviceExtra::getDevice_id,obj.getString("device_id")) - .list(); + List 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 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 deviceList= new LambdaQueryChainWrapper<>(deviceMapper) - .apply("is_delete= '0' AND is_active= '1' and region != '' and is_config= 'true' ") - .list(); + List 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 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 i // wo.delete("device_id = '" + device_id + "' and filed_type = '02'"); LambdaQueryWrapper 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 i if (data2 != null) { LambdaQueryWrapper 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 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 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 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 i } - @Override public void changeDeviceStatus(JSONObject form) { String device_code = form.getString("device_code"); @@ -1131,9 +1084,7 @@ public class DeviceServiceImpl extends CommonServiceImpl 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 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 i // JSONArray arr = WQLObject.getWQLObject("acs_device_extra").query("filed_type ='01' and device_id = '" + device_id + "'").getResultJSONArray(0); - List deviceExtraList= new LambdaQueryChainWrapper<>(deviceExtraMapper) - .eq(DeviceExtra::getDevice_id,device_id) - .eq(DeviceExtra::getFiled_type,"01") - .list(); + List 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 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 dList= new LambdaQueryChainWrapper<>(deviceExtraMapper) - .eq(DeviceExtra::getDevice_id,device_id) - .eq(DeviceExtra::getFiled_type,"02") - .orderByAsc(DeviceExtra::getOrder_seq) - .list(); + List 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 i } } // JSONArray ws = WQLObject.getWQLObject("acs_device_extra").query("filed_type='03' and device_id = '" + device_id + "'", "order_seq").getResultJSONArray(0); - List wsList= new LambdaQueryChainWrapper<>(deviceExtraMapper) - .eq(DeviceExtra::getDevice_id,device_id) - .eq(DeviceExtra::getFiled_type,"03") - .orderByAsc(DeviceExtra::getOrder_seq) - .list(); + List 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 i public JSONArray testRead(Map map) { List dbItems = (List) map.get("dbItems"); String opc_id = (String) map.get("opc_id"); - List itemString = new ArrayList(); - 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 i } Server server = ReadUtil.getServer(opc_id); final Map 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 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 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 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 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 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 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 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 i @Override public List queryAllStorageCell() { - List list= new LambdaQueryChainWrapper<>(storageCellMapper) - .list(); + List list = new LambdaQueryChainWrapper<>(storageCellMapper).list(); return ConvertUtil.convertList(list, StorageCellDto.class); } @@ -2082,8 +2006,7 @@ public class DeviceServiceImpl extends CommonServiceImpl 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 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); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java index f0cf696..150b72c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -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() { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java index 64f0491..ef96a94 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/guhuashi/GuhuashiSiteDeviceDriver.java @@ -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 itemMap = new HashMap(); + //Server server = ReadUtil.getServer(opcservcerid); + Map 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 itemMap = new HashMap<>(); itemMap.put(to_command, command); this.control(itemMap); - } - @Override public JSONObject getDeviceStatusName() { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDefination.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDefination.java index 32f73e2..9ae74c4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDefination.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDefination.java @@ -18,7 +18,7 @@ import java.util.List; public class SiteDefination implements OpcDeviceDriverDefination { @Override public String getDriverCode() { - return "site"; + return "tianneng_site"; } @Override diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java index 294f56e..260baa5 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java @@ -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; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/tubanxian/TubanxianSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/tubanxian/TubanxianSiteDeviceDriver.java index 346dc4c..7e2a31d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/tubanxian/TubanxianSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/tubanxian/TubanxianSiteDeviceDriver.java @@ -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 itemMap = new HashMap(); itemMap.put(to_command, command); this.control(itemMap); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index e3af8f8..afa76bb 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -113,6 +113,9 @@ public interface AcsToWmsService { */ HttpResponse feedAgvTaskStatus(JSONArray from); + + + /** * ACS向WMS申请任务 */ diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index b59ab8e..2d88b8d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -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; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java index aba2196..b30f3e3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java @@ -17,7 +17,7 @@ import java.util.Map; import java.util.concurrent.Executors; @Slf4j -public class OpcUtl { +public class OpcUtl { private static int timeout = 1*60*1000; private static String key = "rpc.socketTimeout"; public static int successNum=0; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java index 2236192..08b8f42 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java @@ -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(); diff --git a/acs/nladmin-ui/src/views/acs/device/config.vue b/acs/nladmin-ui/src/views/acs/device/config.vue index 91a8fc8..4325451 100644 --- a/acs/nladmin-ui/src/views/acs/device/config.vue +++ b/acs/nladmin-ui/src/views/acs/device/config.vue @@ -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, diff --git a/acs/nladmin-ui/src/views/acs/device/driver/guhuashi_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/guhuashi_site.vue new file mode 100644 index 0000000..3bc7fe9 --- /dev/null +++ b/acs/nladmin-ui/src/views/acs/device/driver/guhuashi_site.vue @@ -0,0 +1,488 @@ + + + + + diff --git a/acs/nladmin-ui/src/views/acs/device/driver/tianneng_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/tianneng_site.vue new file mode 100644 index 0000000..1b36e01 --- /dev/null +++ b/acs/nladmin-ui/src/views/acs/device/driver/tianneng_site.vue @@ -0,0 +1,488 @@ + + + + + diff --git a/acs/nladmin-ui/src/views/acs/device/driver/tubanxian_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/tubanxian_site.vue new file mode 100644 index 0000000..da28c20 --- /dev/null +++ b/acs/nladmin-ui/src/views/acs/device/driver/tubanxian_site.vue @@ -0,0 +1,488 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 596385f..7284956 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -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;