Showing
2 changed files
with
3 additions
and
2 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/BrainDevicePositionController.java
renamed from
application/src/main/java/org/thingsboard/server/controller/BrainDevicePositionController.java
| 1 | -package org.thingsboard.server.controller; | 1 | +package org.thingsboard.server.controller.yunteng; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.Api; | 3 | import io.swagger.annotations.Api; |
| 4 | import io.swagger.annotations.ApiOperation; | 4 | import io.swagger.annotations.ApiOperation; |
| @@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup; | @@ -14,6 +14,7 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup; | ||
| 14 | import org.thingsboard.server.common.data.yunteng.dto.BrainDevicePositionDTO; | 14 | import org.thingsboard.server.common.data.yunteng.dto.BrainDevicePositionDTO; |
| 15 | import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; | 15 | import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult; |
| 16 | import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; | 16 | import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; |
| 17 | +import org.thingsboard.server.controller.BaseController; | ||
| 17 | import org.thingsboard.server.dao.yunteng.service.BrainDevicePositionService; | 18 | import org.thingsboard.server.dao.yunteng.service.BrainDevicePositionService; |
| 18 | import org.thingsboard.server.queue.util.TbCoreComponent; | 19 | import org.thingsboard.server.queue.util.TbCoreComponent; |
| 19 | 20 |
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | AND o.tenant_id = #{queryMap.tenantId} | 22 | AND o.tenant_id = #{queryMap.tenantId} |
| 23 | </if> | 23 | </if> |
| 24 | <if test="queryMap.position !=null and queryMap.position !=''"> | 24 | <if test="queryMap.position !=null and queryMap.position !=''"> |
| 25 | - AND o.position ILIKE concat('%',#{position}::TEXT,'%') | 25 | + AND o.position ILIKE concat('%',#{queryMap.position}::TEXT,'%') |
| 26 | </if> | 26 | </if> |
| 27 | <if test="queryMap.status !=null and queryMap.status !=''"> | 27 | <if test="queryMap.status !=null and queryMap.status !=''"> |
| 28 | AND o.status = #{queryMap.status} | 28 | AND o.status = #{queryMap.status} |