Showing
3 changed files
with
6 additions
and
5 deletions
... | ... | @@ -154,9 +154,9 @@ public class TkDeviceScriptController extends BaseController { |
154 | 154 | @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')") |
155 | 155 | @GetMapping("/me/list") |
156 | 156 | @ApiOperation("选项列表") |
157 | - public ResponseEntity listDeviceScript() throws ThingsboardException { | |
157 | + public ResponseEntity listDeviceScript(@RequestParam(value = "scriptType", required = false) TkScriptFunctionType scriptType) throws ThingsboardException { | |
158 | 158 | List<TkDeviceScriptDTO> results = |
159 | - scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId()); | |
159 | + scriptService.findDeviceScript(getCurrentUser().getCurrentTenantId(),scriptType); | |
160 | 160 | return ResponseEntity.ok(results); |
161 | 161 | } |
162 | 162 | ... | ... |
... | ... | @@ -246,11 +246,12 @@ public class TkDeviceScriptServiceImpl |
246 | 246 | } |
247 | 247 | |
248 | 248 | @Override |
249 | - public List<TkDeviceScriptDTO> findDeviceScript(String tenantId) { | |
249 | + public List<TkDeviceScriptDTO> findDeviceScript(String tenantId,TkScriptFunctionType scriptType) { | |
250 | 250 | LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper = |
251 | 251 | new QueryWrapper<TkDeviceScriptEntity>() |
252 | 252 | .lambda() |
253 | - .eq(TkDeviceScriptEntity::getTenantId, tenantId); | |
253 | + .eq(TkDeviceScriptEntity::getTenantId, tenantId) | |
254 | + .eq(scriptType!=null,TkDeviceScriptEntity::getScriptType, scriptType); | |
254 | 255 | return baseMapper.selectList(queryWrapper).stream() |
255 | 256 | .map(item -> item.getDTO(TkDeviceScriptDTO.class)) |
256 | 257 | .collect(Collectors.toList()); | ... | ... |
... | ... | @@ -27,7 +27,7 @@ public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity> |
27 | 27 | |
28 | 28 | TkPageData<TkDeviceScriptDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin); |
29 | 29 | |
30 | - List<TkDeviceScriptDTO> findDeviceScript(String tenantId); | |
30 | + List<TkDeviceScriptDTO> findDeviceScript(String tenantId,TkScriptFunctionType scriptType); | |
31 | 31 | |
32 | 32 | |
33 | 33 | /** | ... | ... |