|
|
|
@ -44,9 +44,8 @@ class ModbusVarManage(object):
|
|
|
|
|
maxIndex = index
|
|
|
|
|
# print(IDIndex, slaveIndex, nameIndex, desIndex, typeIndex, addrIndex, minIndex, maxIndex)
|
|
|
|
|
if IDIndex == None or slaveIndex == None or nameIndex == None or desIndex == None or typeIndex == None or addrIndex == None or minIndex == None or maxIndex == None:
|
|
|
|
|
# print('表头错误')
|
|
|
|
|
print('表头错误')
|
|
|
|
|
return '表头错误'
|
|
|
|
|
|
|
|
|
|
for index, row in enumerate(list(ws.iter_rows())[1:]):
|
|
|
|
|
try:
|
|
|
|
|
l = [str(x.value) for x in row]
|
|
|
|
@ -57,14 +56,14 @@ class ModbusVarManage(object):
|
|
|
|
|
slaveID = l[slaveIndex]
|
|
|
|
|
min = l[minIndex]
|
|
|
|
|
max = l[maxIndex]
|
|
|
|
|
ModBusVarModel = ModBusVar()
|
|
|
|
|
if ModBusVarModel.getByName(varName):
|
|
|
|
|
ModBusVarModel.update(varType = varType, description = des, address = address, slaveID = slaveID, min = min, max = max, order = 'int').where(ModBusVarModel.varName == varName)
|
|
|
|
|
if ModBusVar.getByName(varName):
|
|
|
|
|
ModBusVar.update(varType = varType, description = des, address = address, slaveID = slaveID, min = min, max = max, order = 'int').where(ModBusVar.varName == varName).execute()
|
|
|
|
|
else:
|
|
|
|
|
ModBusVarModel = ModBusVar()
|
|
|
|
|
ModBusVarModel.createVar(varName = varName, varType = varType, des = des, address = address, slaveID = slaveID, min = min, max = max, order = 'int')
|
|
|
|
|
except Exception as e:
|
|
|
|
|
print(e)
|
|
|
|
|
return '第{}行导入出错'.format(index + 1)
|
|
|
|
|
print('第{}行导入出错'.format(index + 1))
|
|
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
|
def exportModbusVar(self, excelPath):
|
|
|
|
|