Forráskód Böngészése

优化用传程序中查询点位信息表的逻辑1

james 2 napja
szülő
commit
410e6788fe

+ 4 - 4
DataProcessService/ytUserInfoProcess/userinfoprocesscore.cpp

@@ -526,7 +526,7 @@ QString UserInfoProcessCore::getOwnerAddr(quint64 devid, quint8 sysAddr, quint32
 //            sql = QString("select `area`, `type`, `info` from `sp_owner_point` where `device_code`=%1 and `Com_idx`=%2 and `loop`=%3 and `pno`=%4")
 //                    .arg(devid).arg(sysAddr).arg(areaid).arg(point);
 //        }
-        if(hostNum != 0){
+        if(hostNum != 1111){
             sql = QString("select `area`, `type`, `info` from `sp_owner_point` where `device_code`=%1 and `Com_idx`=%2 and `loop`=%3 and `pno`=%4 and `host_num`=%5")
                     .arg(devid).arg(sysAddr).arg(areaid).arg(point).arg(hostNum);
         }else{
@@ -809,7 +809,7 @@ QString UserInfoProcessCore::getMAddr(quint64 devid, quint16 method, quint8 sysA
     if(uaddr>0){
         switch(m){
         case 0:
-            subAddr = getOwnerAddr(devid,sysAddr,(uaddr>>16)&0xffff,uaddr&0xffff,0);
+            subAddr = getOwnerAddr(devid,sysAddr,(uaddr>>16)&0xffff,uaddr&0xffff,1111);
             Address = QString::fromUtf8(",回路号:%1,设备号:%2").arg((uaddr>>16)&0xffff).arg(uaddr&0xffff);
             if(subAddr.length()>0)
                 Address.append(QString(" (%1)").arg(subAddr));
@@ -827,7 +827,7 @@ QString UserInfoProcessCore::getMAddr(quint64 devid, quint16 method, quint8 sysA
                 Address.append(QString(" (%1)").arg(subAddr));
             break;
         case 3:
-            subAddr = getOwnerAddr(devid,sysAddr,(uaddr>>16)&0xffff,uaddr&0xffff,0);
+            subAddr = getOwnerAddr(devid,sysAddr,(uaddr>>16)&0xffff,uaddr&0xffff,1111);
             Address = QString::fromUtf8(",设备号:%1 ").arg(uaddr,8,16,QChar('0'));
             if(subAddr.length()>0)
                 Address.append(QString(" (%1)").arg(subAddr));
@@ -841,7 +841,7 @@ QString UserInfoProcessCore::getMAddr(quint64 devid, quint16 method, quint8 sysA
                     .arg((uaddr>>24)&0xff).arg((uaddr>>16)&0xff).arg((uaddr>>8)&0xff).arg(uaddr&0xff);
             break;
         default:
-            subAddr = getOwnerAddr(devid,sysAddr,(uaddr>>16)&0xffff,uaddr&0xffff,0);
+            subAddr = getOwnerAddr(devid,sysAddr,(uaddr>>16)&0xffff,uaddr&0xffff,1111);
             Address = QString::fromUtf8(",设备号:%1").arg(uaddr,8,16,QChar('0'));
             if(subAddr.length()>0)
                 Address.append(QString(" (%1)").arg(subAddr));