perf: TCP转换脚本与规则链脚本查询条件一致,便于页面合并管理

@@ -67,6 +67,8 @@ public class TkConvertDataToController extends BaseController {
       @RequestParam(value = "name", required = false) String name,
       @RequestParam(value = "status", required = false) Integer status,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = "startTime", required = false) Long startTime,
+      @RequestParam(value = "endTime", required = false) Long endTime,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
 
@@ -77,6 +79,7 @@ public class TkConvertDataToController extends BaseController {
     queryMap.put("nodeType", nodeType);
     queryMap.put("name", name);
     queryMap.put("status", status);
+    checkTimeAndPut(queryMap,startTime,endTime);
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }

@@ -122,6 +122,7 @@ public class TkDeviceScriptController extends BaseController {
             @RequestParam(value = ORDER_FILED, required = false) String orderFiled,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
             @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "status", required = false) Integer status,
             @RequestParam(value = "startTime", required = false) Long startTime,
             @RequestParam(value = "endTime", required = false) Long endTime)
             throws ThingsboardException {
@@ -132,7 +133,7 @@ public class TkDeviceScriptController extends BaseController {
         queryMap.put(ORDER_TYPE, orderType);
         queryMap.put(CUSTOMER_ID, getCurrentUser().getCustomerId().toString());
         queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
-
+        queryMap.put("status", status);
         if (!StringUtils.isEmpty(name)) {
             queryMap.put("name", name);
         }

@@ -27,6 +27,7 @@ import org.thingsboard.server.dao.yunteng.mapper.ConvertConfigMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
 
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -40,13 +41,15 @@ public class TkConvertConfigServiceImpl
   private final String connectionType = "Success";
   private final String originatorType =
       "org.thingsboard.rule.engine.metadata.TbGetOriginatorFieldsNode";
-  private final String sceneOriginatorName ="scene@thingskit";
+  private final String sceneOriginatorName = "scene@thingskit";
   private final String scriptType = "org.thingsboard.rule.engine.transform.TbTransformMsgNode";
   private final String filterScriptType = "org.thingsboard.rule.engine.filter.TbJsFilterNode";
   private final String convertNodeName = "dataConvert@thingskit";
 
   @Override
   public TkPageData<ConvertConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
+    LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");
+    LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");
     IPage<ConvertConfig> iPage =
         baseMapper.selectPage(
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
@@ -57,6 +60,11 @@ public class TkConvertConfigServiceImpl
                     ConvertConfig::getStatus,
                     queryMap.get("status"))
                 .eq(ConvertConfig::getNodeType, queryMap.get("nodeType"))
+                .and(
+                    null != startTime && null != endTime,
+                    qr ->
+                        qr.ge(ConvertConfig::getCreateTime, startTime)
+                            .le(ConvertConfig::getCreateTime, endTime))
                 .like(
                     null != queryMap.get("name"),
                     ConvertConfig::getName,
@@ -223,8 +231,9 @@ public class TkConvertConfigServiceImpl
     } else if (nodeType.intValue() == FastIotConstants.JAVA_SCRIPT.intValue()) {
       needDelete = deleteConvertJS(nodes, ruleChainMetaData);
     } else {
-      needDelete = deleteScene(nodes.get(1), ruleChainMetaData)
-              &&deleteScene(nodes.get(0), ruleChainMetaData);
+      needDelete =
+          deleteScene(nodes.get(1), ruleChainMetaData)
+              && deleteScene(nodes.get(0), ruleChainMetaData);
     }
     return needDelete;
   }
@@ -240,7 +249,7 @@ public class TkConvertConfigServiceImpl
     } else if (nodeType.intValue() == FastIotConstants.JAVA_SCRIPT.intValue()) {
       addConvertJSRuleNode(nodes, ruleChainMetaData);
     } else {
-      addSceneRuleNode(nodes.get(0),nodes.get(1), ruleChainMetaData);
+      addSceneRuleNode(nodes.get(0), nodes.get(1), ruleChainMetaData);
     }
   }
 
@@ -748,11 +757,13 @@ public class TkConvertConfigServiceImpl
     ruleChainMetaData.getConnections().add(failedConnectionInfo);
   }
 
-  private void addSceneRuleNode(RuleNode origNode, RuleNode sceneNode,RuleChainMetaData ruleChainMetaData) {
+  private void addSceneRuleNode(
+      RuleNode origNode, RuleNode sceneNode, RuleChainMetaData ruleChainMetaData) {
     boolean existScene = false;
     // check scene exist
     for (RuleNode node : ruleChainMetaData.getNodes()) {
-      if (sceneNode.getName().equals(node.getName()) && sceneNode.getType().equals(node.getType())) {
+      if (sceneNode.getName().equals(node.getName())
+          && sceneNode.getType().equals(node.getType())) {
         node.setConfiguration(sceneNode.getConfiguration());
         existScene = true;
         break;
@@ -764,7 +775,6 @@ public class TkConvertConfigServiceImpl
       int layoutX = 1128;
       int layoutY = 132;
 
-
       ObjectNode origAddition = setAdditionalInfo(layoutX, layoutY, origNode);
       origNode.setAdditionalInfo(origAddition);
       ruleChainMetaData.getNodes().add(origNode);
@@ -778,7 +788,7 @@ public class TkConvertConfigServiceImpl
               node -> {
                 if (node.getType()
                         .equals("org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode")
-                        || node.getType()
+                    || node.getType()
                         .equals("org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode")) {
                   NodeConnectionInfo nodeConnectionInfo = new NodeConnectionInfo();
                   nodeConnectionInfo.setFromIndex(ruleNodeIndex.get());
@@ -786,7 +796,8 @@ public class TkConvertConfigServiceImpl
                   nodeConnectionInfo.setType(connectionType);
                   ruleChainMetaData.getConnections().add(nodeConnectionInfo);
                 }
-                if (node.getName().equals(sceneOriginatorName) &&  node.getType().equals(originatorType)) {
+                if (node.getName().equals(sceneOriginatorName)
+                    && node.getType().equals(originatorType)) {
                   NodeConnectionInfo nodeConnectionInfo = new NodeConnectionInfo();
                   nodeConnectionInfo.setFromIndex(ruleNodeIndex.get());
                   nodeConnectionInfo.setToIndex(ruleChainMetaData.getNodes().size() - 1);

@@ -212,6 +212,7 @@ public class TkDeviceScriptServiceImpl
             (LocalDateTime) queryMap.get("startTime");
     LocalDateTime endTime =
             (LocalDateTime) queryMap.get("endTime");
+    Integer status = null != queryMap.get("status") ? (Integer)queryMap.get("status") :  null;
     Set<String> scriptIds = null;
     if (!isTenantAdmin && StringUtils.isNotEmpty(customerId)) {
       scriptIds = getCustomerScripts(customerId, tenantId);
@@ -223,6 +224,7 @@ public class TkDeviceScriptServiceImpl
         new QueryWrapper<TkDeviceScriptEntity>()
             .lambda()
             .eq(TkDeviceScriptEntity::getTenantId, tenantId)
+                .eq(null != status,TkDeviceScriptEntity::getStatus,status)
             .like(StringUtils.isNotEmpty(name), TkDeviceScriptEntity::getName, name)
             .and(
                 null != startTime && null != endTime,