|
|
|
|
@ -17,7 +17,6 @@ import cn.iocoder.yudao.module.iot.framework.gateway.service.ISiemensPointServic
|
|
|
|
|
import cn.iocoder.yudao.module.iot.framework.gateway.service.IVideoService;
|
|
|
|
|
import cn.iocoder.yudao.module.iot.framework.gateway.util.HttpUtils;
|
|
|
|
|
import cn.iocoder.yudao.module.iot.framework.gateway.util.UrlConstans;
|
|
|
|
|
import cn.iocoder.yudao.module.iot.service.device.DeviceService;
|
|
|
|
|
import cn.iocoder.yudao.module.iot.service.gateway.GatewayService;
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
|
|
import lombok.Data;
|
|
|
|
|
@ -26,7 +25,6 @@ import org.apache.http.client.methods.CloseableHttpResponse;
|
|
|
|
|
import org.apache.http.client.methods.HttpPost;
|
|
|
|
|
import org.apache.http.impl.client.CloseableHttpClient;
|
|
|
|
|
import org.apache.http.util.EntityUtils;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
@ -37,22 +35,22 @@ import java.util.List;
|
|
|
|
|
|
|
|
|
|
@Service
|
|
|
|
|
public class TheGatewayServiceImpl {
|
|
|
|
|
@Resource
|
|
|
|
|
private DeviceMapper deviceMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
private DeviceAttributeMapper deviceAttributeMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
private IVideoService videoService;
|
|
|
|
|
@Resource
|
|
|
|
|
private ISiemensPointService siemensPointService;
|
|
|
|
|
@Resource
|
|
|
|
|
private IModbusPointService modbusPointService;
|
|
|
|
|
@Resource
|
|
|
|
|
private GatewayMqttService gatewayMqttService;
|
|
|
|
|
@Resource
|
|
|
|
|
private GatewayService gatewayService;
|
|
|
|
|
|
|
|
|
|
//清除原本的西门子设备和点位数据
|
|
|
|
|
@Resource
|
|
|
|
|
private DeviceMapper deviceMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
private DeviceAttributeMapper deviceAttributeMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
private IVideoService videoService;
|
|
|
|
|
@Resource
|
|
|
|
|
private ISiemensPointService siemensPointService;
|
|
|
|
|
@Resource
|
|
|
|
|
private IModbusPointService modbusPointService;
|
|
|
|
|
@Resource
|
|
|
|
|
private GatewayMqttService gatewayMqttService;
|
|
|
|
|
@Resource
|
|
|
|
|
private GatewayService gatewayService;
|
|
|
|
|
|
|
|
|
|
//清除原本的西门子设备和点位数据
|
|
|
|
|
// public void deleteSiemensEntity(BeEquipments equipments) {
|
|
|
|
|
// siemensPointService.login(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword());
|
|
|
|
|
// List<DeviceSiemensEntity> list = siemensPointService.getSiemensList(equipments.getAdminIp(),
|
|
|
|
|
@ -79,35 +77,35 @@ public class TheGatewayServiceImpl {
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//清除指定原本的西门子设备和点位数据
|
|
|
|
|
public void deleteSiemensEntity(GatewayDO gatewayDO, DeviceDO deviceDO) {
|
|
|
|
|
|
|
|
|
|
siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<DeviceSiemensEntity> list = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
if (null != list && list.size() > 0) {
|
|
|
|
|
//先清除点位数据
|
|
|
|
|
String[] deviceIds = new String[list.size()];
|
|
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
|
|
deviceIds[i] = list.get(i).getDeviceConfigID();
|
|
|
|
|
//删除每个设备下的原有点位
|
|
|
|
|
List<SiemensPointEntity> pointList = siemensPointService.getPointListAll(gatewayDO.getAdminIp(),
|
|
|
|
|
list.get(i).getDeviceConfigID(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
if (pointList != null && pointList.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[pointList.size()];
|
|
|
|
|
for (int j = 0; j < pointList.size(); j++) {
|
|
|
|
|
addressIds[j] = pointList.get(j).getDeviceConfigContentID().toString();
|
|
|
|
|
}
|
|
|
|
|
//删除点位
|
|
|
|
|
siemensPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//再清除设备数据
|
|
|
|
|
siemensPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//查询西门子设备列表 并新增
|
|
|
|
|
//清除指定原本的西门子设备和点位数据
|
|
|
|
|
public void deleteSiemensEntity(GatewayDO gatewayDO, DeviceDO deviceDO) {
|
|
|
|
|
|
|
|
|
|
siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<DeviceSiemensEntity> list = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
if (null != list && list.size() > 0) {
|
|
|
|
|
//先清除点位数据
|
|
|
|
|
String[] deviceIds = new String[list.size()];
|
|
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
|
|
deviceIds[i] = list.get(i).getDeviceConfigID();
|
|
|
|
|
//删除每个设备下的原有点位
|
|
|
|
|
List<SiemensPointEntity> pointList = siemensPointService.getPointListAll(gatewayDO.getAdminIp(),
|
|
|
|
|
list.get(i).getDeviceConfigID(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
if (pointList != null && pointList.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[pointList.size()];
|
|
|
|
|
for (int j = 0; j < pointList.size(); j++) {
|
|
|
|
|
addressIds[j] = pointList.get(j).getDeviceConfigContentID().toString();
|
|
|
|
|
}
|
|
|
|
|
//删除点位
|
|
|
|
|
siemensPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//再清除设备数据
|
|
|
|
|
siemensPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//查询西门子设备列表 并新增
|
|
|
|
|
// public void addSiemensEntity(BeEquipments equipments) {
|
|
|
|
|
// siemensPointService.login(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword());
|
|
|
|
|
// //根据机台编号查询设备
|
|
|
|
|
@ -138,57 +136,57 @@ public class TheGatewayServiceImpl {
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//新增西门子设备
|
|
|
|
|
public void addSiemensEntity(GatewayDO gatewayDO, DeviceDO siemens) {
|
|
|
|
|
siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
DeviceSiemensEntity deviceSiemensEntity = new DeviceSiemensEntity();
|
|
|
|
|
deviceSiemensEntity.setDeviceID(siemens.getDeviceCode());
|
|
|
|
|
deviceSiemensEntity.setDeviceName(siemens.getDeviceName());
|
|
|
|
|
deviceSiemensEntity.setSiemensSeries(siemens.getSiemensSeries());
|
|
|
|
|
deviceSiemensEntity.setSiemensConnectParam(siemens.getSiemensConnectParam());
|
|
|
|
|
deviceSiemensEntity.setReadCronType(siemens.getReadCronType());
|
|
|
|
|
deviceSiemensEntity.setReadRepeatValue(siemens.getReadRepeatValue());
|
|
|
|
|
deviceSiemensEntity.setReadRepeatUnit(siemens.getReadRepeatUnit());
|
|
|
|
|
deviceSiemensEntity.setReadCron(siemens.getReadCron());
|
|
|
|
|
deviceSiemensEntity.setWriteCronType(siemens.getWriteCronType());
|
|
|
|
|
deviceSiemensEntity.setWriteRepeatValue(siemens.getWriteRepeatValue());
|
|
|
|
|
deviceSiemensEntity.setWriteCron(siemens.getWriteCron());
|
|
|
|
|
deviceSiemensEntity.setLocalPersistent(siemens.getLocalPersistent());
|
|
|
|
|
deviceSiemensEntity.setUploadRate(siemens.getUploadRate());
|
|
|
|
|
deviceSiemensEntity.setRateCount(siemens.getRateCount());
|
|
|
|
|
siemensPointService.add(deviceSiemensEntity, gatewayDO.getAdminIp());
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//下发完成西门子设备后 下发对应设备的点位
|
|
|
|
|
public void addDeviceSiemensEntity(GatewayDO gatewayDO,Long machineId, DeviceDO deviceDO) {
|
|
|
|
|
siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
for (DeviceSiemensEntity deviceSiemensEntity : siemensList) {
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId());
|
|
|
|
|
List<SiemensPointEntity> list = new ArrayList<>();
|
|
|
|
|
for (DeviceAttributeDO point : points) {
|
|
|
|
|
Integer dataType = AddressDataType.getGatewayDataTypeMap(point.getDataType());
|
|
|
|
|
//新增点位
|
|
|
|
|
SiemensPointEntity siemensPointEntity = new SiemensPointEntity()
|
|
|
|
|
.setSiemensFieldName(point.getAttributeCode())
|
|
|
|
|
.setSiemensFieldAddress(point.getAddress())
|
|
|
|
|
.setSiemensFieldDataType(dataType)
|
|
|
|
|
.setSiemensFieldPrecision(point.getSiemensFieldPrecision())
|
|
|
|
|
.setSiemensFieldUnit(point.getUnit());
|
|
|
|
|
|
|
|
|
|
list.add(siemensPointEntity);
|
|
|
|
|
}
|
|
|
|
|
if (list.size() > 0)
|
|
|
|
|
siemensPointService.add(list, gatewayDO.getAdminIp(), deviceSiemensEntity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//清除原本的Modbus设备数据
|
|
|
|
|
//新增西门子设备
|
|
|
|
|
public void addSiemensEntity(GatewayDO gatewayDO, DeviceDO siemens) {
|
|
|
|
|
siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
DeviceSiemensEntity deviceSiemensEntity = new DeviceSiemensEntity();
|
|
|
|
|
deviceSiemensEntity.setDeviceID(siemens.getDeviceCode());
|
|
|
|
|
deviceSiemensEntity.setDeviceName(siemens.getDeviceName());
|
|
|
|
|
deviceSiemensEntity.setSiemensSeries(siemens.getSiemensSeries());
|
|
|
|
|
deviceSiemensEntity.setSiemensConnectParam(siemens.getSiemensConnectParam());
|
|
|
|
|
deviceSiemensEntity.setReadCronType(siemens.getReadCronType());
|
|
|
|
|
deviceSiemensEntity.setReadRepeatValue(siemens.getReadRepeatValue());
|
|
|
|
|
deviceSiemensEntity.setReadRepeatUnit(siemens.getReadRepeatUnit());
|
|
|
|
|
deviceSiemensEntity.setReadCron(siemens.getReadCron());
|
|
|
|
|
deviceSiemensEntity.setWriteCronType(siemens.getWriteCronType());
|
|
|
|
|
deviceSiemensEntity.setWriteRepeatValue(siemens.getWriteRepeatValue());
|
|
|
|
|
deviceSiemensEntity.setWriteCron(siemens.getWriteCron());
|
|
|
|
|
deviceSiemensEntity.setLocalPersistent(siemens.getLocalPersistent());
|
|
|
|
|
deviceSiemensEntity.setUploadRate(siemens.getUploadRate());
|
|
|
|
|
deviceSiemensEntity.setRateCount(siemens.getRateCount());
|
|
|
|
|
siemensPointService.add(deviceSiemensEntity, gatewayDO.getAdminIp());
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//下发完成西门子设备后 下发对应设备的点位
|
|
|
|
|
public void addDeviceSiemensEntity(GatewayDO gatewayDO, Long machineId, DeviceDO deviceDO) {
|
|
|
|
|
siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
for (DeviceSiemensEntity deviceSiemensEntity : siemensList) {
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId());
|
|
|
|
|
List<SiemensPointEntity> list = new ArrayList<>();
|
|
|
|
|
for (DeviceAttributeDO point : points) {
|
|
|
|
|
Integer dataType = AddressDataType.getGatewayDataTypeMap(point.getDataType());
|
|
|
|
|
//新增点位
|
|
|
|
|
SiemensPointEntity siemensPointEntity = new SiemensPointEntity()
|
|
|
|
|
.setSiemensFieldName(point.getAttributeCode())
|
|
|
|
|
.setSiemensFieldAddress(point.getAddress())
|
|
|
|
|
.setSiemensFieldDataType(dataType)
|
|
|
|
|
.setSiemensFieldPrecision(point.getSiemensFieldPrecision())
|
|
|
|
|
.setSiemensFieldUnit(point.getUnit());
|
|
|
|
|
|
|
|
|
|
list.add(siemensPointEntity);
|
|
|
|
|
}
|
|
|
|
|
if (list.size() > 0)
|
|
|
|
|
siemensPointService.add(list, gatewayDO.getAdminIp(), deviceSiemensEntity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//清除原本的Modbus设备数据
|
|
|
|
|
// public void deleteModbusEntity(BeEquipments equipments) {
|
|
|
|
|
// modbusPointService.login(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword());
|
|
|
|
|
// List<DeviceModbusEntity> list = modbusPointService.getModbusList(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword());
|
|
|
|
|
@ -214,282 +212,284 @@ public class TheGatewayServiceImpl {
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//清除原本的Modbus设备数据
|
|
|
|
|
public void deleteModbusEntity(GatewayDO gatewayDO, String deviceId) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<DeviceModbusEntity> list = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceId);
|
|
|
|
|
if (null != list && list.size() > 0) {
|
|
|
|
|
//先清除点位数据
|
|
|
|
|
String[] deviceIds = new String[list.size()];
|
|
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
|
|
deviceIds[i] = list.get(i).getDeviceConfigID();
|
|
|
|
|
//删除每个设备下的原有点位
|
|
|
|
|
List<ModbusPointEntity> pointList = modbusPointService.getPointListAll(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), list.get(i).getDeviceConfigID());
|
|
|
|
|
if (pointList != null && pointList.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[pointList.size()];
|
|
|
|
|
for (int j = 0; j < pointList.size(); j++) {
|
|
|
|
|
addressIds[j] = pointList.get(j).getDeviceConfigContentID();
|
|
|
|
|
}
|
|
|
|
|
//删除点位数据
|
|
|
|
|
modbusPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//再清除设备数据
|
|
|
|
|
modbusPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addModbusEntity(GatewayDO gatewayDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<DeviceDO> modbuses = deviceMapper.selectByGatewayId(gatewayDO.getId());
|
|
|
|
|
List<DeviceModbusEntity> list = new ArrayList<>();
|
|
|
|
|
if (modbuses != null && modbuses.size() > 0) {
|
|
|
|
|
for (DeviceDO modbus : modbuses) {
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity = initEntity(modbus);
|
|
|
|
|
list.add(deviceModbusEntity);
|
|
|
|
|
//mob 下发失败 {"code":500,"msg":"该串口已经配置"}
|
|
|
|
|
}
|
|
|
|
|
modbusPointService.add(list, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private DeviceModbusEntity initEntity(DeviceDO modbus) {
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity = new DeviceModbusEntity();
|
|
|
|
|
deviceModbusEntity.setEquipmentsId(modbus.getOrgId().toString());
|
|
|
|
|
deviceModbusEntity.setDeviceId(modbus.getDeviceCode());
|
|
|
|
|
deviceModbusEntity.setDeviceName(modbus.getDeviceName());
|
|
|
|
|
deviceModbusEntity.setModbusProtocol(modbus.getModbusProtocol());
|
|
|
|
|
deviceModbusEntity.setModbusPattern(modbus.getModbusPattern());
|
|
|
|
|
deviceModbusEntity.setPortName(modbus.getPortName());
|
|
|
|
|
deviceModbusEntity.setModbusConnectParam(modbus.getModbusConnectParam());
|
|
|
|
|
deviceModbusEntity.setReadCronType(modbus.getReadCronType());
|
|
|
|
|
deviceModbusEntity.setReadRepeatValue(modbus.getReadRepeatValue());
|
|
|
|
|
deviceModbusEntity.setReadRepeatUnit(modbus.getReadRepeatUnit());
|
|
|
|
|
deviceModbusEntity.setReadCron(modbus.getReadCron());
|
|
|
|
|
deviceModbusEntity.setWriteCronType(modbus.getWriteCronType());
|
|
|
|
|
deviceModbusEntity.setWriteRepeatValue(modbus.getWriteRepeatValue());
|
|
|
|
|
deviceModbusEntity.setWriteRepeatUnit(modbus.getWriteRepeatUnit());
|
|
|
|
|
deviceModbusEntity.setWriteCron(modbus.getWriteCron());
|
|
|
|
|
deviceModbusEntity.setLocalPersistent(modbus.getLocalPersistent());
|
|
|
|
|
deviceModbusEntity.setUploadRate(modbus.getUploadRate());
|
|
|
|
|
deviceModbusEntity.setRateCount(modbus.getRateCount());
|
|
|
|
|
deviceModbusEntity.setModbusReadAddrGap(modbus.getModbusReadAddrGap());
|
|
|
|
|
return deviceModbusEntity;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addModbusEntity(GatewayDO gatewayDO, DeviceDO modbus) {
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity = initEntity(modbus);
|
|
|
|
|
//mob 下发失败 {"code":500,"msg":"该串口已经配置"}
|
|
|
|
|
modbusPointService.add(deviceModbusEntity, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addDeviceModbusEntity(GatewayDO gatewayDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
|
|
|
|
|
for (DeviceModbusEntity deviceModbusEntity : modbusPointList) {
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(1L);
|
|
|
|
|
getModbusPointEntityList(gatewayDO, deviceModbusEntity, points);
|
|
|
|
|
List<ModbusPointEntity> list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points);
|
|
|
|
|
//下发
|
|
|
|
|
if (list.size() > 0)
|
|
|
|
|
modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addDeviceModbusEntity(GatewayDO gatewayDO, DeviceDO deviceDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
for (DeviceModbusEntity deviceModbusEntity : modbusPointList) {
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId());
|
|
|
|
|
List<ModbusPointEntity> list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points);
|
|
|
|
|
if (list.size() > 0)
|
|
|
|
|
modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private List<ModbusPointEntity> getModbusPointEntityList(GatewayDO gatewayDO,
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity,
|
|
|
|
|
List<DeviceAttributeDO> points) {
|
|
|
|
|
List<ModbusPointEntity> list = new ArrayList<>();
|
|
|
|
|
for (DeviceAttributeDO point : points) {
|
|
|
|
|
//新增点位
|
|
|
|
|
ModbusPointEntity modbusPointEntity = new ModbusPointEntity();
|
|
|
|
|
modbusPointEntity.setModbusSlaveID(point.getModbusSlaveId());
|
|
|
|
|
modbusPointEntity.setModbusFieldName(point.getAttributeCode());
|
|
|
|
|
modbusPointEntity.setModbusFieldAddress(point.getModbusFieldAddress());
|
|
|
|
|
modbusPointEntity.setModbusAddressType(point.getModbusAddressType());
|
|
|
|
|
modbusPointEntity.setModbusFieldSize(point.getModbusFieldSize());
|
|
|
|
|
modbusPointEntity.setModbusFieldPrecision(point.getModbusFieldPrecision());
|
|
|
|
|
modbusPointEntity.setModbusFieldDataType(point.getDataType());
|
|
|
|
|
modbusPointEntity.setModbusFieldOrder(point.getModbusFieldOrder());
|
|
|
|
|
modbusPointEntity.setModbusFieldUnit(point.getUnit());
|
|
|
|
|
list.add(modbusPointEntity);
|
|
|
|
|
}
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 下发mqtt主题
|
|
|
|
|
* 1拿到列表
|
|
|
|
|
* 2停用
|
|
|
|
|
* 3删除
|
|
|
|
|
* 4新增
|
|
|
|
|
* 5启用
|
|
|
|
|
*/
|
|
|
|
|
public void deleteMqttEntity(GatewayDO gatewayDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(),gatewayDO.getUsername(),gatewayDO.getPassword());
|
|
|
|
|
List<MqttBrokerEntity> mqttBrokerEntity = gatewayMqttService.getMqttBrokerEntity(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
for (MqttBrokerEntity brokerEntity : mqttBrokerEntity) {
|
|
|
|
|
gatewayMqttService.delete(gatewayDO.getAdminIp(), brokerEntity.getCloudConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/***启用设备 */
|
|
|
|
|
public void changeStatus(GatewayDO gatewayDO, String deviceCode, String type) {
|
|
|
|
|
List<String> deviceIds = new ArrayList<>();
|
|
|
|
|
if (type.equals("modbus")) {
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode);
|
|
|
|
|
for (DeviceModbusEntity entity : modbusPointList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (type.equals("siemens")) {
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode);
|
|
|
|
|
|
|
|
|
|
for (DeviceSiemensEntity entity : siemensList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ChangeStatus changeStatus = new ChangeStatus();
|
|
|
|
|
changeStatus.setNewStatus("2");
|
|
|
|
|
changeStatus.setOldStatus("1");
|
|
|
|
|
siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/***启用设备 */
|
|
|
|
|
public void changeStatus(GatewayDO gatewayDO) {
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<String> deviceIds = new ArrayList<>();
|
|
|
|
|
for (DeviceModbusEntity entity : modbusPointList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
for (DeviceSiemensEntity entity : siemensList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
ChangeStatus changeStatus = new ChangeStatus();
|
|
|
|
|
changeStatus.setNewStatus("2");
|
|
|
|
|
changeStatus.setOldStatus("1");
|
|
|
|
|
siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*检测下发数据和实际下发数量是否匹配*/
|
|
|
|
|
public CommonResult<String> compare(GatewayDO gatewayDO, DeviceDO deviceDO, String type) {
|
|
|
|
|
String deviceConfigID = null;
|
|
|
|
|
Integer pointList = 0;
|
|
|
|
|
if ("modbus".equals(type)) {
|
|
|
|
|
List<DeviceModbusEntity> modbusList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
if (modbusList != null && modbusList.size() > 0) {
|
|
|
|
|
deviceConfigID = modbusList.get(0).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
pointList = modbusPointService.getPointListByCount(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceConfigID);
|
|
|
|
|
} else {
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
if (siemensList != null && siemensList.size() > 0) {
|
|
|
|
|
deviceConfigID = siemensList.get(0).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
pointList = siemensPointService.getPointListByCount(gatewayDO.getAdminIp(), deviceConfigID,
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
}
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId());
|
|
|
|
|
int size = points.size();
|
|
|
|
|
String str = "应下发" + points.size() + "个地址,实下发" + pointList + "个地址";
|
|
|
|
|
return size!=pointList? CommonResult.error(500,"下发失败！"+str)
|
|
|
|
|
: CommonResult.success("下发成功！"+str);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**网关登录测试*/
|
|
|
|
|
public CommonResult login(GatewayDO gateway){
|
|
|
|
|
// 创建 HttpClient 客户端
|
|
|
|
|
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
|
|
|
|
|
CloseableHttpResponse httpResponse = null;
|
|
|
|
|
try {
|
|
|
|
|
HttpPost httpPost = HttpUtils.getHttpPost(
|
|
|
|
|
gateway.getAdminIp() + UrlConstans.loginUrl,
|
|
|
|
|
HttpEntity.getLoginParam(gateway.getUsername(),gateway.getPassword()));
|
|
|
|
|
httpResponse = httpClient.execute(httpPost);
|
|
|
|
|
if (httpResponse.getEntity() != null) {
|
|
|
|
|
String entityStr = EntityUtils.toString(httpResponse.getEntity());
|
|
|
|
|
if(entityStr.contains("服务不可用") || entityStr.contains("<!DOCTYPE html>"))
|
|
|
|
|
return CommonResult.success("网关服务不可用！");
|
|
|
|
|
ResponseInfo info = JSON.parseObject(entityStr, ResponseInfo.class);
|
|
|
|
|
if(info.code==0)return CommonResult.success("网关登录测试成功！");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 无论如何必须关闭连接
|
|
|
|
|
catch (IOException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
} finally {
|
|
|
|
|
HttpUtils.closeHttp(httpClient, httpResponse);
|
|
|
|
|
}
|
|
|
|
|
return CommonResult.error(500,"网关登录测试失败！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public int openOrClose(String adminIp, String username, String password, String monitorCode) {
|
|
|
|
|
List<DeviceVideoEntity> videoId = videoService.getVideoId(adminIp, username, password, monitorCode);
|
|
|
|
|
if (videoId != null && videoId.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[videoId.size()];
|
|
|
|
|
for (int j = 0; j < videoId.size(); j++) {
|
|
|
|
|
addressIds[j] = videoId.get(j).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
return videoService.openOrClose(adminIp,String.join(",",addressIds));
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
|
@NoArgsConstructor
|
|
|
|
|
public static class ResponseInfo {
|
|
|
|
|
int code;
|
|
|
|
|
String msg;
|
|
|
|
|
}
|
|
|
|
|
public void deleteVideo(String adminIp,String username,String password,String monitorCode) {
|
|
|
|
|
videoService.login(adminIp,username,password);
|
|
|
|
|
List<DeviceVideoEntity> videoId = videoService.getVideoId(adminIp, username, password, monitorCode);
|
|
|
|
|
if (videoId != null && videoId.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[videoId.size()];
|
|
|
|
|
for (int j = 0; j < videoId.size(); j++) {
|
|
|
|
|
addressIds[j] = videoId.get(j).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
videoService.deleteByIds(adminIp, String.join(",", addressIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//清除原本的Modbus设备数据
|
|
|
|
|
public void deleteModbusEntity(GatewayDO gatewayDO, String deviceId) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<DeviceModbusEntity> list = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceId);
|
|
|
|
|
if (null != list && list.size() > 0) {
|
|
|
|
|
//先清除点位数据
|
|
|
|
|
String[] deviceIds = new String[list.size()];
|
|
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
|
|
deviceIds[i] = list.get(i).getDeviceConfigID();
|
|
|
|
|
//删除每个设备下的原有点位
|
|
|
|
|
List<ModbusPointEntity> pointList = modbusPointService.getPointListAll(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), list.get(i).getDeviceConfigID());
|
|
|
|
|
if (pointList != null && pointList.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[pointList.size()];
|
|
|
|
|
for (int j = 0; j < pointList.size(); j++) {
|
|
|
|
|
addressIds[j] = pointList.get(j).getDeviceConfigContentID();
|
|
|
|
|
}
|
|
|
|
|
//删除点位数据
|
|
|
|
|
modbusPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//再清除设备数据
|
|
|
|
|
modbusPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addModbusEntity(GatewayDO gatewayDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<DeviceDO> modbuses = deviceMapper.selectByGatewayId(gatewayDO.getId());
|
|
|
|
|
List<DeviceModbusEntity> list = new ArrayList<>();
|
|
|
|
|
if (modbuses != null && modbuses.size() > 0) {
|
|
|
|
|
for (DeviceDO modbus : modbuses) {
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity = initEntity(modbus);
|
|
|
|
|
list.add(deviceModbusEntity);
|
|
|
|
|
//mob 下发失败 {"code":500,"msg":"该串口已经配置"}
|
|
|
|
|
}
|
|
|
|
|
modbusPointService.add(list, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private DeviceModbusEntity initEntity(DeviceDO modbus) {
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity = new DeviceModbusEntity();
|
|
|
|
|
deviceModbusEntity.setEquipmentsId(modbus.getOrgId().toString());
|
|
|
|
|
deviceModbusEntity.setDeviceId(modbus.getDeviceCode());
|
|
|
|
|
deviceModbusEntity.setDeviceName(modbus.getDeviceName());
|
|
|
|
|
deviceModbusEntity.setModbusProtocol(modbus.getModbusProtocol());
|
|
|
|
|
deviceModbusEntity.setModbusPattern(modbus.getModbusPattern());
|
|
|
|
|
deviceModbusEntity.setPortName(modbus.getPortName());
|
|
|
|
|
deviceModbusEntity.setModbusConnectParam(modbus.getModbusConnectParam());
|
|
|
|
|
deviceModbusEntity.setReadCronType(modbus.getReadCronType());
|
|
|
|
|
deviceModbusEntity.setReadRepeatValue(modbus.getReadRepeatValue());
|
|
|
|
|
deviceModbusEntity.setReadRepeatUnit(modbus.getReadRepeatUnit());
|
|
|
|
|
deviceModbusEntity.setReadCron(modbus.getReadCron());
|
|
|
|
|
deviceModbusEntity.setWriteCronType(modbus.getWriteCronType());
|
|
|
|
|
deviceModbusEntity.setWriteRepeatValue(modbus.getWriteRepeatValue());
|
|
|
|
|
deviceModbusEntity.setWriteRepeatUnit(modbus.getWriteRepeatUnit());
|
|
|
|
|
deviceModbusEntity.setWriteCron(modbus.getWriteCron());
|
|
|
|
|
deviceModbusEntity.setLocalPersistent(modbus.getLocalPersistent());
|
|
|
|
|
deviceModbusEntity.setUploadRate(modbus.getUploadRate());
|
|
|
|
|
deviceModbusEntity.setRateCount(modbus.getRateCount());
|
|
|
|
|
deviceModbusEntity.setModbusReadAddrGap(modbus.getModbusReadAddrGap());
|
|
|
|
|
return deviceModbusEntity;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addModbusEntity(GatewayDO gatewayDO, DeviceDO modbus) {
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity = initEntity(modbus);
|
|
|
|
|
//mob 下发失败 {"code":500,"msg":"该串口已经配置"}
|
|
|
|
|
modbusPointService.add(deviceModbusEntity, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addDeviceModbusEntity(GatewayDO gatewayDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
|
|
|
|
|
for (DeviceModbusEntity deviceModbusEntity : modbusPointList) {
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(1L);
|
|
|
|
|
getModbusPointEntityList(gatewayDO, deviceModbusEntity, points);
|
|
|
|
|
List<ModbusPointEntity> list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points);
|
|
|
|
|
//下发
|
|
|
|
|
if (list.size() > 0)
|
|
|
|
|
modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void addDeviceModbusEntity(GatewayDO gatewayDO, DeviceDO deviceDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
for (DeviceModbusEntity deviceModbusEntity : modbusPointList) {
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId());
|
|
|
|
|
List<ModbusPointEntity> list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points);
|
|
|
|
|
if (list.size() > 0)
|
|
|
|
|
modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private List<ModbusPointEntity> getModbusPointEntityList(GatewayDO gatewayDO,
|
|
|
|
|
DeviceModbusEntity deviceModbusEntity,
|
|
|
|
|
List<DeviceAttributeDO> points) {
|
|
|
|
|
List<ModbusPointEntity> list = new ArrayList<>();
|
|
|
|
|
for (DeviceAttributeDO point : points) {
|
|
|
|
|
//新增点位
|
|
|
|
|
ModbusPointEntity modbusPointEntity = new ModbusPointEntity();
|
|
|
|
|
modbusPointEntity.setModbusSlaveID(point.getModbusSlaveId());
|
|
|
|
|
modbusPointEntity.setModbusFieldName(point.getAttributeCode());
|
|
|
|
|
modbusPointEntity.setModbusFieldAddress(point.getModbusFieldAddress());
|
|
|
|
|
modbusPointEntity.setModbusAddressType(point.getModbusAddressType());
|
|
|
|
|
modbusPointEntity.setModbusFieldSize(point.getModbusFieldSize());
|
|
|
|
|
modbusPointEntity.setModbusFieldPrecision(point.getModbusFieldPrecision());
|
|
|
|
|
modbusPointEntity.setModbusFieldDataType(point.getDataType());
|
|
|
|
|
modbusPointEntity.setModbusFieldOrder(point.getModbusFieldOrder());
|
|
|
|
|
modbusPointEntity.setModbusFieldUnit(point.getUnit());
|
|
|
|
|
list.add(modbusPointEntity);
|
|
|
|
|
}
|
|
|
|
|
return list;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 下发mqtt主题
|
|
|
|
|
* 1拿到列表
|
|
|
|
|
* 2停用
|
|
|
|
|
* 3删除
|
|
|
|
|
* 4新增
|
|
|
|
|
* 5启用
|
|
|
|
|
*/
|
|
|
|
|
public void deleteMqttEntity(GatewayDO gatewayDO) {
|
|
|
|
|
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<MqttBrokerEntity> mqttBrokerEntity = gatewayMqttService.getMqttBrokerEntity(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
for (MqttBrokerEntity brokerEntity : mqttBrokerEntity) {
|
|
|
|
|
gatewayMqttService.delete(gatewayDO.getAdminIp(), brokerEntity.getCloudConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/***启用设备 */
|
|
|
|
|
public void changeStatus(GatewayDO gatewayDO, String deviceCode, String type) {
|
|
|
|
|
List<String> deviceIds = new ArrayList<>();
|
|
|
|
|
if (type.equals("modbus")) {
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode);
|
|
|
|
|
for (DeviceModbusEntity entity : modbusPointList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (type.equals("siemens")) {
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode);
|
|
|
|
|
|
|
|
|
|
for (DeviceSiemensEntity entity : siemensList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ChangeStatus changeStatus = new ChangeStatus();
|
|
|
|
|
changeStatus.setNewStatus("2");
|
|
|
|
|
changeStatus.setOldStatus("1");
|
|
|
|
|
siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/***启用设备 */
|
|
|
|
|
public void changeStatus(GatewayDO gatewayDO) {
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceModbusEntity> modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
/*下发好设备后获取设备列表找点位*/
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
List<String> deviceIds = new ArrayList<>();
|
|
|
|
|
for (DeviceModbusEntity entity : modbusPointList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
for (DeviceSiemensEntity entity : siemensList) {
|
|
|
|
|
deviceIds.add(entity.getDeviceConfigID());
|
|
|
|
|
}
|
|
|
|
|
ChangeStatus changeStatus = new ChangeStatus();
|
|
|
|
|
changeStatus.setNewStatus("2");
|
|
|
|
|
changeStatus.setOldStatus("1");
|
|
|
|
|
siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*检测下发数据和实际下发数量是否匹配*/
|
|
|
|
|
public CommonResult<String> compare(GatewayDO gatewayDO, DeviceDO deviceDO, String type) {
|
|
|
|
|
String deviceConfigID = null;
|
|
|
|
|
Integer pointList = 0;
|
|
|
|
|
if ("modbus".equals(type)) {
|
|
|
|
|
List<DeviceModbusEntity> modbusList = modbusPointService.getModbusList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
if (modbusList != null && modbusList.size() > 0) {
|
|
|
|
|
deviceConfigID = modbusList.get(0).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
pointList = modbusPointService.getPointListByCount(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceConfigID);
|
|
|
|
|
} else {
|
|
|
|
|
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode());
|
|
|
|
|
if (siemensList != null && siemensList.size() > 0) {
|
|
|
|
|
deviceConfigID = siemensList.get(0).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
pointList = siemensPointService.getPointListByCount(gatewayDO.getAdminIp(), deviceConfigID,
|
|
|
|
|
gatewayDO.getUsername(), gatewayDO.getPassword());
|
|
|
|
|
}
|
|
|
|
|
//根据deviceId 和机台编码查询sql数据库点位信息
|
|
|
|
|
|
|
|
|
|
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId());
|
|
|
|
|
int size = points.size();
|
|
|
|
|
String str = "应下发" + points.size() + "个地址,实下发" + pointList + "个地址";
|
|
|
|
|
return size != pointList ? CommonResult.error(500, "下发失败！" + str)
|
|
|
|
|
: CommonResult.success("下发成功！" + str);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 网关登录测试
|
|
|
|
|
*/
|
|
|
|
|
public CommonResult login(GatewayDO gateway) {
|
|
|
|
|
// 创建 HttpClient 客户端
|
|
|
|
|
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
|
|
|
|
|
CloseableHttpResponse httpResponse = null;
|
|
|
|
|
try {
|
|
|
|
|
HttpPost httpPost = HttpUtils.getHttpPost(
|
|
|
|
|
gateway.getAdminIp() + UrlConstans.loginUrl,
|
|
|
|
|
HttpEntity.getLoginParam(gateway.getUsername(), gateway.getPassword()));
|
|
|
|
|
httpResponse = httpClient.execute(httpPost);
|
|
|
|
|
if (httpResponse.getEntity() != null) {
|
|
|
|
|
String entityStr = EntityUtils.toString(httpResponse.getEntity());
|
|
|
|
|
if (entityStr.contains("服务不可用") || entityStr.contains("<!DOCTYPE html>"))
|
|
|
|
|
return CommonResult.success("网关服务不可用！");
|
|
|
|
|
ResponseInfo info = JSON.parseObject(entityStr, ResponseInfo.class);
|
|
|
|
|
if (info.code == 0) return CommonResult.success("网关登录测试成功！");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 无论如何必须关闭连接
|
|
|
|
|
catch (IOException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
} finally {
|
|
|
|
|
HttpUtils.closeHttp(httpClient, httpResponse);
|
|
|
|
|
}
|
|
|
|
|
return CommonResult.error(500, "网关登录测试失败！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public int openOrClose(String adminIp, String username, String password, String monitorCode) {
|
|
|
|
|
List<DeviceVideoEntity> videoId = videoService.getVideoId(adminIp, username, password, monitorCode);
|
|
|
|
|
if (videoId != null && videoId.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[videoId.size()];
|
|
|
|
|
for (int j = 0; j < videoId.size(); j++) {
|
|
|
|
|
addressIds[j] = videoId.get(j).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
return videoService.openOrClose(adminIp, String.join(",", addressIds));
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Data
|
|
|
|
|
@NoArgsConstructor
|
|
|
|
|
public static class ResponseInfo {
|
|
|
|
|
int code;
|
|
|
|
|
String msg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void deleteVideo(String adminIp, String username, String password, String monitorCode) {
|
|
|
|
|
videoService.login(adminIp, username, password);
|
|
|
|
|
List<DeviceVideoEntity> videoId = videoService.getVideoId(adminIp, username, password, monitorCode);
|
|
|
|
|
if (videoId != null && videoId.size() > 0) {
|
|
|
|
|
String[] addressIds = new String[videoId.size()];
|
|
|
|
|
for (int j = 0; j < videoId.size(); j++) {
|
|
|
|
|
addressIds[j] = videoId.get(j).getDeviceConfigID();
|
|
|
|
|
}
|
|
|
|
|
videoService.deleteByIds(adminIp, String.join(",", addressIds));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// public void addVideo(String adminIp,String username,String password, Monitor monitor) {
|
|
|
|
|
// videoService.login(adminIp,username,password);
|
|
|
|
|
|
chenshuichuan
2 years ago