Parcourir la source

fix(评价信息):

设备查询新增产品编号条件
18339543638 il y a 2 ans
Parent
commit
ff7a96d4a7

+ 0 - 3
nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusDeviceController.java

@@ -1,15 +1,12 @@
 package com.nb.web.service.bus.controller;
 
-import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.stp.StpLogic;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nb.auth.utils.SecurityUtil;
 import com.nb.web.service.bus.controller.vo.DeviceBindVo;
 import com.nb.web.api.entity.BusDeviceEntity;
 import com.nb.web.api.enums.DeviceAlarmEnum;

+ 0 - 3
nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/HospitalManagerRegister.java

@@ -1,10 +1,7 @@
 package com.nb.web.service.bus.hospital;
 
-import com.nb.web.service.bus.registry.device.DeviceRegistry;
 import com.nb.web.service.bus.hospital.script.ScriptManager;
-import com.nb.web.service.bus.utils.WsPublishUtils;
 import com.nb.core.cache.manager.ConfigStorageManager;
-import com.nb.common.config.utils.RedissonUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

+ 3 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/DeviceQuery.java

@@ -26,6 +26,9 @@ public class DeviceQuery implements Serializable {
     @ApiModelProperty("设备别名")
     private String alias;
 
+    @ApiModelProperty("产品编号")
+    private String productNo;
+
     @ApiModelProperty("设备运行状态集合")
     private List<Integer> runStates;
 

+ 3 - 0
nb-service/web-service/src/main/resources/mapper/bus/BusDeviceMapper.xml

@@ -65,6 +65,9 @@
         from (select * from bus_device
         <where>
             is_delete=0
+            <if test="query.productNo!=null">
+                and product_no like concat('%',#{query.productNo},'%')
+            </if>
             <if test="query.deviceId!=null">
                 and device_id like concat('%',#{query.deviceId},'%')
             </if>