Merge branch 'master' into 20221129

@@ -44,6 +44,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceProfileService;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceScriptService;
 
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
@@ -89,6 +90,17 @@ public class TkDeviceScriptController extends BaseController {
     return ResponseEntity.ok(scriptService.insertOrUpdate(scriptDTO));
   }
 
+  @PostMapping("/{id}/{status}")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{'api:yt:js:post','api:yt:js:update:status'})")
+  @ApiOperation("修改脚本状态")
+  public ResponseEntity<Boolean> updateScriptStatus(
+      @PathVariable("id") String id, @PathVariable("status") Integer status)
+      throws ThingsboardException {
+
+    return ResponseEntity.ok(
+        scriptService.updateScriptStatus(getCurrentUser().getCurrentTenantId(), id, status));
+  }
+
   /**
    * 更新thingsboard的设备配置信息
    *
@@ -131,8 +143,7 @@ public class TkDeviceScriptController extends BaseController {
 
   @GetMapping("{id}")
   @ApiOperation("详情")
-  @PreAuthorize(
-      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:js:get'})")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:js:get'})")
   public ResponseEntity<TkDeviceScriptDTO> getDevice(@PathVariable("id") String id)
       throws ThingsboardException {
     return ResponseEntity.of(
@@ -146,7 +157,10 @@ public class TkDeviceScriptController extends BaseController {
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(value = ORDER_FILED, required = false) String orderFiled,
-      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
+      @RequestParam(value = "name", required = false) String name,
+      @RequestParam(value = "startTime", required = false) Long startTime,
+      @RequestParam(value = "endTime", required = false) Long endTime)
       throws ThingsboardException {
     Map<String, Object> queryMap = new HashMap<>();
     queryMap.put(PAGE_SIZE, pageSize);
@@ -155,6 +169,19 @@ public class TkDeviceScriptController extends BaseController {
     queryMap.put(ORDER_TYPE, orderType);
     queryMap.put(CUSTOMER_ID, getCurrentUser().getCustomerId().toString());
     queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
+
+    if(!StringUtils.isEmpty(name)){
+      queryMap.put("name", name);
+    }
+    if(null != startTime && null!=endTime){
+      if (startTime > endTime) {
+        throw new YtDataValidationException(
+                ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
+      }
+      queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
+      queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
+    }
+
     return scriptService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
 

@@ -24,6 +24,7 @@ import org.thingsboard.server.dao.yunteng.mapper.TkDeviceProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkDeviceScriptMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -80,6 +81,23 @@ public class TkDeviceScriptServiceImpl
   }
 
   @Override
+  @Transactional
+  public boolean updateScriptStatus(String tenantId, String id, Integer status) {
+    if (StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(id) || null != status) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    TkDeviceScriptEntity entity = baseMapper.selectById(id);
+    if (null == entity) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    if (!entity.getTenantId().equals(tenantId)) {
+      throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+    }
+    entity.setStatus(status);
+    return baseMapper.updateById(entity) > FastIotConstants.MagicNumber.ZERO;
+  }
+
+  @Override
   public String getScriptText(String tenantId, String scriptId) {
     LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
         new QueryWrapper<TkDeviceScriptEntity>()
@@ -108,7 +126,7 @@ public class TkDeviceScriptServiceImpl
                 .lambda()
                 .in(TkDeviceProfileEntity::getScriptId, ids));
     if (usedList != null && usedList.size() > 0) {
-      List<String> names = usedList.stream().map(i -> i.getName()).collect(Collectors.toList());
+      List<String> names = usedList.stream().map(TkDeviceProfileEntity::getName).collect(Collectors.toList());
       throw new YtDataValidationException(
           String.format(ErrorMessage.PROJECT_USED_SCRIPT.getMessage(), names));
     }
@@ -169,10 +187,7 @@ public class TkDeviceScriptServiceImpl
     TkDeviceScriptEntity profile = baseMapper.selectOne(queryWrapper);
     return Optional.ofNullable(profile)
         .map(
-            entity -> {
-              TkDeviceScriptDTO result = entity.getDTO(TkDeviceScriptDTO.class);
-              return result;
-            });
+            entity -> entity.getDTO(TkDeviceScriptDTO.class));
   }
 
   @Override
@@ -188,6 +203,11 @@ public class TkDeviceScriptServiceImpl
         Optional.ofNullable(queryMap.get(QueryConstant.CUSTOMER_ID))
             .map(Object::toString)
             .orElse(null);
+    String name = Optional.ofNullable(queryMap.get("name")).map(Object::toString).orElse(null);
+    LocalDateTime startTime =
+            (LocalDateTime) Optional.ofNullable(queryMap.get("startTime")).orElse(null);
+    LocalDateTime endTime =
+            (LocalDateTime) Optional.ofNullable(queryMap.get("endTime")).orElse(null);
     Set<String> scriptIds = null;
     if (!isTenantAdmin && StringUtils.isNotEmpty(customerId)) {
       scriptIds = getCustomerScripts(customerId, tenantId);
@@ -199,6 +219,12 @@ public class TkDeviceScriptServiceImpl
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
             .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+            .like(StringUtils.isNotEmpty(name), TkDeviceScriptEntity::getName, name)
+            .and(
+                null != startTime && null != endTime,
+                qr ->
+                    qr.ge(TkDeviceScriptEntity::getCreateTime, startTime)
+                        .le(TkDeviceScriptEntity::getCreateTime, endTime))
             .in(!isTenantAdmin, TkDeviceScriptEntity::getId, scriptIds);
 
     IPage<TkDeviceScriptEntity> scripts = baseMapper.selectPage(currentPage, queryWrapper);
@@ -215,11 +241,9 @@ public class TkDeviceScriptServiceImpl
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
             .eq(TkDeviceScriptEntity::getTenantId, tenantId);
-    List<TkDeviceScriptDTO> results =
-        baseMapper.selectList(queryWrapper).stream()
-            .map(item -> item.getDTO(TkDeviceScriptDTO.class))
-            .collect(Collectors.toList());
-    return results;
+    return baseMapper.selectList(queryWrapper).stream()
+        .map(item -> item.getDTO(TkDeviceScriptDTO.class))
+        .collect(Collectors.toList());
   }
 
   private Set<String> getCustomerScripts(String customerId, String tenantId) {
@@ -227,9 +251,9 @@ public class TkDeviceScriptServiceImpl
     List<TkCustomerDeviceDTO> list = tkCustomerDevice.getMappingByCustomerId(customerId);
     if (null != list && !list.isEmpty()) {
       Set<String> deviceIds =
-          list.stream().map(obj -> obj.getDeviceId()).collect(Collectors.toSet());
+          list.stream().map(TkCustomerDeviceDTO::getDeviceId).collect(Collectors.toSet());
       scriptIds =
-          Optional.ofNullable(deviceIds)
+          Optional.of(deviceIds)
               .map(
                   ids -> {
                     List<DeviceDTO> deviceDTOS =
@@ -237,7 +261,7 @@ public class TkDeviceScriptServiceImpl
                     if (null != deviceDTOS && !deviceDTOS.isEmpty()) {
                       List<String> deviceProfiles =
                           deviceDTOS.stream()
-                              .map(obj -> obj.getDeviceProfileId())
+                              .map(DeviceDTO::getDeviceProfileId)
                               .collect(Collectors.toList());
                       List<DeviceProfileDTO> deviceProfileDTOList =
                           tkDeviceProfileService.findDeviceProfileByIds(tenantId, deviceProfiles);
@@ -245,7 +269,7 @@ public class TkDeviceScriptServiceImpl
                           .map(
                               deviceProfileDTOS ->
                                   deviceProfileDTOS.stream()
-                                      .map(obj -> obj.getScriptId())
+                                      .map(DeviceProfileDTO::getScriptId)
                                       .collect(Collectors.toSet()))
                           .orElse(null);
                     }

@@ -40,4 +40,6 @@ public interface TkDeviceScriptService extends BaseService<TkDeviceScriptEntity>
      * @return
      */
     boolean validateFormdata(TkDeviceScriptDTO scriptDTO, boolean created);
+
+    boolean updateScriptStatus(String tenantId,String id,Integer status);
 }