巡检/保养方案 增删改查

@@ -57,7 +57,8 @@ public class TkCheckPlanController extends BaseController {
 
     @PostMapping("/save")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
-    public ResponseEntity<TkCheckPlanDTO> save(@RequestBody TkCheckPlanDTO tkCheckPlanDTO) {
+    public ResponseEntity<TkCheckPlanDTO> save(@RequestBody TkCheckPlanDTO tkCheckPlanDTO) throws ThingsboardException {
+        tkCheckPlanDTO.setTenantId(getCurrentUser().getCurrentTenantId());
         if (tkCheckPlanDTO.getStatus() == null) {
             tkCheckPlanDTO.setStatus(TkCheckPlanStatusEnum.ENABLE);
         }

@@ -7,6 +7,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.TkCheckPlanDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkCheckPlanEntity;
@@ -26,7 +27,7 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe
         QueryWrapper<TkCheckPlanEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda();
         if (queryMap != null && queryMap.get("name") != null) {
-            lambda.eq(TkCheckPlanEntity::getName, queryMap.get("code").toString());
+            lambda.eq(TkCheckPlanEntity::getName, queryMap.get("name").toString());
         }
 
         if (queryMap != null && queryMap.get("type") != null) {
@@ -41,6 +42,7 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe
 
     @Override
     public TkCheckPlanDTO save(TkCheckPlanDTO tkCheckPlanDTO) {
+        checkDto(tkCheckPlanDTO);
         TkCheckPlanEntity entity = new TkCheckPlanEntity();
         if (StringUtils.isBlank(tkCheckPlanDTO.getId())) {
             tkCheckPlanDTO.copyToEntity(entity);
@@ -56,6 +58,12 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe
         return tkCheckPlanDTO;
     }
 
+    private void checkDto(TkCheckPlanDTO dto) {
+        if (StringUtils.isBlank(dto.getTenantId())) {
+            throw new TkDataValidationException("租户id为空！");
+        }
+    }
+
     @Override
     public boolean delete(String id) {
         int count = baseMapper.deleteById(id);