简柏林 / thingskit · Commits

Commit 63d648b7ca446a68477c957187747297058fad92

Authored by 杨鸣坤
1 parent d733eea5

查询接口调整，增加tenantId

Inline Side-by-side
Showing 9 changed files with 55 additions and 18 deletions
@@ -57,7 +57,7 @@ public class TkCheckPlanController extends BaseController { @@ -57,7 +57,7 @@ public class TkCheckPlanController extends BaseController {
57 queryMap.put("status", status); 57 queryMap.put("status", status);
58 } 58 }
59 59
60 - return tkCheckPlanService.page(queryMap, getCurrentUser().isTenantAdmin()); 60 + return tkCheckPlanService.page(queryMap, getCurrentUser().getCurrentTenantId());
61 } 61 }
62 62
63 @PostMapping("/save") 63 @PostMapping("/save")
@@ -17,7 +17,9 @@ import org.thingsboard.server.controller.BaseController; @@ -17,7 +17,9 @@ import org.thingsboard.server.controller.BaseController;
17 import org.thingsboard.server.dao.yunteng.service.TkInspectionPlanService; 17 import org.thingsboard.server.dao.yunteng.service.TkInspectionPlanService;
18 import org.thingsboard.server.queue.util.TbCoreComponent; 18 import org.thingsboard.server.queue.util.TbCoreComponent;
19 19
  20 +import java.sql.Timestamp;
20 import java.util.HashMap; 21 import java.util.HashMap;
  22 +import java.util.List;
21 import java.util.Map; 23 import java.util.Map;
22 24
23 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE; 25 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
@@ -40,8 +42,8 @@ public class TkInspectionPlanController extends BaseController { @@ -40,8 +42,8 @@ public class TkInspectionPlanController extends BaseController {
40 @RequestParam(PAGE) int page, 42 @RequestParam(PAGE) int page,
41 @RequestParam(value = "name", required = false) String name, 43 @RequestParam(value = "name", required = false) String name,
42 @RequestParam(value = "type", required = false) TkInspectionPlanStatusEnum status, 44 @RequestParam(value = "type", required = false) TkInspectionPlanStatusEnum status,
43 - @RequestParam(value = "startTime", required = false) Long startTime,  
44 - @RequestParam(value = "endTime", required = false) Long endTime 45 + @RequestParam(value = "startTime", required = false) List<Long> startTime,
  46 + @RequestParam(value = "endTime", required = false) List<Long> endTime
45 ) throws ThingsboardException { 47 ) throws ThingsboardException {
46 Map<String, Object> queryMap = new HashMap<>(); 48 Map<String, Object> queryMap = new HashMap<>();
47 queryMap.put(PAGE_SIZE, pageSize); 49 queryMap.put(PAGE_SIZE, pageSize);
@@ -54,8 +56,27 @@ public class TkInspectionPlanController extends BaseController { @@ -54,8 +56,27 @@ public class TkInspectionPlanController extends BaseController {
54 queryMap.put("status", status); 56 queryMap.put("status", status);
55 } 57 }
56 58
57 - checkTimeAndPut(queryMap, startTime, endTime);  
58 - return tkInspectionPlanService.page(queryMap, getCurrentUser().isTenantAdmin()); 59 + if (startTime != null && startTime.size() == 2) {
  60 + if (startTime.get(0) != null) {
  61 + queryMap.put("startTimeStart", new Timestamp(startTime.get(0)).toLocalDateTime());
  62 + }
  63 +
  64 + if (startTime.get(1) != null) {
  65 + queryMap.put("startTimeEnd", new Timestamp(startTime.get(1)).toLocalDateTime());
  66 + }
  67 + }
  68 +
  69 + if (endTime != null && endTime.size() == 2) {
  70 + if (endTime.get(0) != null) {
  71 + queryMap.put("endTimeStart", new Timestamp(endTime.get(0)).toLocalDateTime());
  72 + }
  73 +
  74 + if (endTime.get(1) != null) {
  75 + queryMap.put("endTimeEnd", new Timestamp(endTime.get(1)).toLocalDateTime());
  76 + }
  77 + }
  78 +
  79 + return tkInspectionPlanService.page(queryMap, getCurrentUser().getCurrentTenantId());
59 } 80 }
60 81
61 @PostMapping("/save") 82 @PostMapping("/save")
@@ -59,7 +59,7 @@ public class TkInspectionRecordController extends BaseController { @@ -59,7 +59,7 @@ public class TkInspectionRecordController extends BaseController {
59 } 59 }
60 60
61 checkTimeAndPut(queryMap, startTime, endTime); 61 checkTimeAndPut(queryMap, startTime, endTime);
62 - return tkInspectionRecordService.page(queryMap, getCurrentUser().isTenantAdmin()); 62 + return tkInspectionRecordService.page(queryMap, getCurrentUser().getCurrentTenantId());
63 } 63 }
64 64
65 @PostMapping("/save") 65 @PostMapping("/save")
@@ -30,9 +30,10 @@ import java.util.stream.Collectors; @@ -30,9 +30,10 @@ import java.util.stream.Collectors;
30 public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMapper, TkCheckPlanEntity> 30 public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMapper, TkCheckPlanEntity>
31 implements TkCheckPlanService { 31 implements TkCheckPlanService {
32 @Override 32 @Override
33 - public TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) { 33 + public TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, String tenantId) {
34 QueryWrapper<TkCheckPlanEntity> wrapper = new QueryWrapper<>(); 34 QueryWrapper<TkCheckPlanEntity> wrapper = new QueryWrapper<>();
35 LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda(); 35 LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda();
  36 + lambda.eq(TkCheckPlanEntity::getTenantId, tenantId);
36 if (queryMap != null && queryMap.get("name") != null) { 37 if (queryMap != null && queryMap.get("name") != null) {
37 lambda.eq(TkCheckPlanEntity::getName, queryMap.get("name").toString()); 38 lambda.eq(TkCheckPlanEntity::getName, queryMap.get("name").toString());
38 } 39 }
@@ -99,7 +100,7 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe @@ -99,7 +100,7 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe
99 LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda(); 100 LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda();
100 TenantId tenantId = SpringBeanUtils.getTenantId(); 101 TenantId tenantId = SpringBeanUtils.getTenantId();
101 lambda.eq(TkCheckPlanEntity::getTenantId, tenantId.getId().toString()); 102 lambda.eq(TkCheckPlanEntity::getTenantId, tenantId.getId().toString());
102 - lambda.in(BaseEntity::getId,ids); 103 + lambda.in(BaseEntity::getId, ids);
103 List<TkCheckPlanEntity> entitys = baseMapper.selectList(wrapper); 104 List<TkCheckPlanEntity> entitys = baseMapper.selectList(wrapper);
104 return Optional.ofNullable(entitys).map(all -> all.stream().map(item -> item.getDTO(TkCheckPlanDTO.class)) 105 return Optional.ofNullable(entitys).map(all -> all.stream().map(item -> item.getDTO(TkCheckPlanDTO.class))
105 .collect(Collectors.toList())).orElse(null); 106 .collect(Collectors.toList())).orElse(null);
@@ -33,9 +33,10 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio @@ -33,9 +33,10 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio
33 private final TkInspectionRecordService tkInspectionRecordService; 33 private final TkInspectionRecordService tkInspectionRecordService;
34 34
35 @Override 35 @Override
36 - public TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) { 36 + public TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, String tenantId) {
37 QueryWrapper<TkInspectionPlanEntity> wrapper = new QueryWrapper<>(); 37 QueryWrapper<TkInspectionPlanEntity> wrapper = new QueryWrapper<>();
38 LambdaQueryWrapper<TkInspectionPlanEntity> lambda = wrapper.lambda(); 38 LambdaQueryWrapper<TkInspectionPlanEntity> lambda = wrapper.lambda();
  39 + lambda.eq(TkInspectionPlanEntity::getTenantId, tenantId);
39 if (queryMap != null && queryMap.get("name") != null) { 40 if (queryMap != null && queryMap.get("name") != null) {
40 lambda.eq(TkInspectionPlanEntity::getName, queryMap.get("name").toString()); 41 lambda.eq(TkInspectionPlanEntity::getName, queryMap.get("name").toString());
41 } 42 }
@@ -44,11 +45,24 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio @@ -44,11 +45,24 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio
44 lambda.eq(TkInspectionPlanEntity::getStatus, queryMap.get("status").toString()); 45 lambda.eq(TkInspectionPlanEntity::getStatus, queryMap.get("status").toString());
45 } 46 }
46 47
47 - if (queryMap != null && queryMap.get("startTime") != null && queryMap.get("endTime") != null) {  
48 - LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");  
49 - LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");  
50 - lambda.ge(TkInspectionPlanEntity::getStartTime, startTime);  
51 - lambda.le(TkInspectionPlanEntity::getEndTime, endTime); 48 + if (queryMap != null && queryMap.get("startTimeStart") != null) {
  49 + LocalDateTime startTimeStart = (LocalDateTime) queryMap.get("startTimeStart");
  50 + lambda.ge(TkInspectionPlanEntity::getStartTime, startTimeStart);
  51 + }
  52 +
  53 + if (queryMap != null && queryMap.get("startTimeEnd") != null) {
  54 + LocalDateTime startTimeEnd = (LocalDateTime) queryMap.get("startTimeEnd");
  55 + lambda.le(TkInspectionPlanEntity::getStartTime, startTimeEnd);
  56 + }
  57 +
  58 + if (queryMap != null && queryMap.get("endTimeStart") != null) {
  59 + LocalDateTime endTimeStart = (LocalDateTime) queryMap.get("endTimeStart");
  60 + lambda.ge(TkInspectionPlanEntity::getEndTime, endTimeStart);
  61 + }
  62 +
  63 + if (queryMap != null && queryMap.get("endTimeEnd") != null) {
  64 + LocalDateTime endTimeEnd = (LocalDateTime) queryMap.get("endTimeEnd");
  65 + lambda.le(TkInspectionPlanEntity::getEndTime, endTimeEnd);
52 } 66 }
53 67
54 IPage<TkInspectionPlanEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false), 68 IPage<TkInspectionPlanEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
@@ -31,9 +31,10 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect @@ -31,9 +31,10 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
31 private final TkInspectionDetailsService tkInspectionDetailsService; 31 private final TkInspectionDetailsService tkInspectionDetailsService;
32 32
33 @Override 33 @Override
34 - public TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) { 34 + public TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, String tenantId) {
35 QueryWrapper<TkInspectionRecordEntity> wrapper = new QueryWrapper<>(); 35 QueryWrapper<TkInspectionRecordEntity> wrapper = new QueryWrapper<>();
36 LambdaQueryWrapper<TkInspectionRecordEntity> lambda = wrapper.lambda(); 36 LambdaQueryWrapper<TkInspectionRecordEntity> lambda = wrapper.lambda();
  37 + lambda.eq(TkInspectionRecordEntity::getTenantId, tenantId);
37 if (queryMap != null && queryMap.get("inspectionPlanId") != null) { 38 if (queryMap != null && queryMap.get("inspectionPlanId") != null) {
38 lambda.eq(TkInspectionRecordEntity::getInspectionPlanId, queryMap.get("inspectionPlanId").toString()); 39 lambda.eq(TkInspectionRecordEntity::getInspectionPlanId, queryMap.get("inspectionPlanId").toString());
39 } 40 }
@@ -9,7 +9,7 @@ import java.util.List; @@ -9,7 +9,7 @@ import java.util.List;
9 import java.util.Map; 9 import java.util.Map;
10 10
11 public interface TkCheckPlanService extends BaseService<TkCheckPlanEntity> { 11 public interface TkCheckPlanService extends BaseService<TkCheckPlanEntity> {
12 - TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin); 12 + TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, String tenantId);
13 13
14 TkCheckPlanDTO save(TkCheckPlanDTO tkCheckPlanDTO); 14 TkCheckPlanDTO save(TkCheckPlanDTO tkCheckPlanDTO);
15 15
@@ -8,7 +8,7 @@ import java.util.Map; @@ -8,7 +8,7 @@ import java.util.Map;
8 8
9 public interface TkInspectionPlanService extends BaseService<TkInspectionPlanEntity> { 9 public interface TkInspectionPlanService extends BaseService<TkInspectionPlanEntity> {
10 10
11 - TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin); 11 + TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, String tenantId);
12 12
13 TkInspectionPlanDTO save(TkInspectionPlanDTO tkInspectionPlanDTO); 13 TkInspectionPlanDTO save(TkInspectionPlanDTO tkInspectionPlanDTO);
14 14
@@ -8,7 +8,7 @@ import java.util.Map; @@ -8,7 +8,7 @@ import java.util.Map;
8 8
9 public interface TkInspectionRecordService extends BaseService<TkInspectionRecordEntity> { 9 public interface TkInspectionRecordService extends BaseService<TkInspectionRecordEntity> {
10 10
11 - TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin); 11 + TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, String tenantId);
12 12
13 TkInspectionRecordDTO save(TkInspectionRecordDTO tkInspectionRecordDTO); 13 TkInspectionRecordDTO save(TkInspectionRecordDTO tkInspectionRecordDTO);
14 14