Explorar el Código

修复 全量更新覆盖设备别名

18339543638 hace 2 años
padre
commit
24b6324944

+ 1 - 1
nb-core/src/main/java/com/nb/core/entity/param/TermType.java

@@ -28,7 +28,7 @@ public enum  TermType {
                 @Override
                 public void build(QueryWrapper<?> queryWrapper,String column, Object value) {
 //                    value="%"+value+"%";
-                    queryWrapper.likeRight(column,value);
+                    queryWrapper.like(column,value);
                 }
             },
     llike

+ 1 - 2
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceService.java

@@ -55,7 +55,6 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
     @Autowired
     private AliyunIotSdk aliyunIotSdk;
 
-
     @Override
     public void validateBeforeSave(BusDeviceEntity entity) {
         if(entity.getTenantId()==null){
@@ -136,7 +135,7 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
      */
     @Override
     public boolean updateDevice(BusDeviceEntity device){
-        return this.update(device,new LambdaUpdateWrapper<BusDeviceEntity>()
+        return this.update(new LambdaUpdateWrapper<BusDeviceEntity>()
                 .eq(BusDeviceEntity::getDeviceId,device.getDeviceId())
                 .set(StrUtil.isNotEmpty(device.getMqttConnInfo()),BusDeviceEntity::getMqttConnInfo,device.getMqttConnInfo())
 //                .set(StrUtil.isNotEmpty(device.getAlias()),BusDeviceEntity::getAlias,device.getAlias())