Bladeren bron

更新!

TRX 1 jaar geleden
bovenliggende
commit
d2019530d8

+ 2 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/impl/DeviceInfoDaoImpl.java

@@ -68,8 +68,8 @@ public class DeviceInfoDaoImpl extends BaseImpl implements DeviceInfoDaoExtend {
         }
 
         // 设备型号
-        if (param.getDeviceModel() != null) {
-            criteria.and("deviceModel").is(param.getDeviceModel());
+        if (param.getSpecType() != null) {
+            criteria.and("getSpecType").is(param.getSpecType());
         }
 
         if (param.getOnLineState() != null) {

+ 2 - 2
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/impl/DeviceProductBindDeviceDaoImpl.java

@@ -69,8 +69,8 @@ public class DeviceProductBindDeviceDaoImpl extends BaseImpl implements DevicePr
         }
 
         // 设备型号
-        if (param.getDeviceModel() != null) {
-            criteria.and("deviceModel").is(param.getDeviceModel());
+        if (param.getSpecType() != null) {
+            criteria.and("specType").is(param.getSpecType());
         }
 
         // 模糊搜索

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/deviceProduct/DeviceProductBindDeviceService.java

@@ -98,7 +98,7 @@ public class DeviceProductBindDeviceService extends SuperService {
                 } else {
                     deviceProductBindDevice.setDeviceName(deviceInfo.getDeviceName());
                     deviceProductBindDevice.setDeviceType(deviceInfo.getDeviceType());
-                    deviceProductBindDevice.setDeviceModel(deviceInfo.getDeviceModel());
+                    deviceProductBindDevice.setSpecType(deviceInfo.getSpecType());
                 }
                 saveList.add(deviceProductBindDevice);
             }