Merge remote-tracking branch 'origin/i18n' into i18n

chenjunyu_1481036421
2 parents c7641323 b3df49e7
Showing 9 changed files with 23 additions and 12 deletions
application/src/main/java/org/thingsboard/server/controller/BaseController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/UserDTO.java
dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConvertConfigServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSceneLinkageServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/SceneLinkageService.java
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @853aebe
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @853aebe
@@ -318,6 +318,7 @@ public abstract class BaseController {
     @ExceptionHandler(Exception.class)
     public void handleControllerException(Exception e, HttpServletResponse response) {
+        log.error(e.getMessage(),e);
         ThingsboardException thingsboardException = handleException(e);
         if (thingsboardException.getErrorCode() == ThingsboardErrorCode.GENERAL && thingsboardException.getCause() instanceof Exception
                 && StringUtils.equals(thingsboardException.getCause().getMessage(), thingsboardException.getMessage())) {
@@ -330,6 +331,7 @@ public abstract class BaseController {
     @ExceptionHandler(ThingsboardException.class)
     public void handleThingsboardException(ThingsboardException ex, HttpServletResponse response) {
+        log.error(ex.getMessage(),ex);
         errorResponseHandler.handle(ex, response);
     }
@@ -393,6 +395,7 @@ public abstract class BaseController {
      * */
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public void handleValidationError(MethodArgumentNotValidException validationError, HttpServletResponse response) {
+        log.error(validationError.getMessage(),validationError);
         List<ConstraintViolation<Object>> constraintsViolations = validationError.getFieldErrors().stream()
                 .map(fieldError -> {
                     try {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
View file @853aebe
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
View file @853aebe
@@ -224,7 +224,7 @@ public class TkConvertDataToController extends BaseController {
     Integer sceneStatus = convertReqDTO.getStatus();
     JsonNode configuration =
         sceneLinkageService.getRuleNodeConfig(
-            sceneId,
+            sceneId, querySceneLink.getRuleChainId(),
             currentTenant,
             getCurrentUser().getCustomerId().getId().toString(),
             sceneStatus);
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @853aebe
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View file @853aebe
@@ -602,6 +602,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
                 } else {
+                    log.error("updateInactivityStateIfExpired isMyPartition=false , serverType={},tenantId={},deviceId={}",ServiceType.TB_CORE,stateData.getTenantId(),deviceId);
                     cleanupEntity(deviceId);
                 }
             }
@@ -617,7 +618,6 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         state.setLastInactivityAlarmTime(ts);
         save(deviceId, INACTIVITY_ALARM_TIME, ts);
         onDeviceActivityStatusChange(deviceId, false, stateData);
-        System.err.println("Inactivity Device : "+deviceId);
     }
     boolean isActive(long ts, DeviceState state) {
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
View file @853aebe
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChainMetaData.java
View file @853aebe
@@ -53,6 +53,10 @@ public class RuleChainMetaData {
         connectionInfo.setFromIndex(fromIndex);
         connectionInfo.setToIndex(toIndex);
         connectionInfo.setType(type);
+        addConnectionInfo(connectionInfo);
+    }
+
+    public void addConnectionInfo(NodeConnectionInfo connectionInfo) {
         if (connections == null) {
             connections = new ArrayList<>();
         }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/UserDTO.java
View file @853aebe
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/UserDTO.java
View file @853aebe
@@ -41,7 +41,7 @@ public class UserDTO extends BaseDTO {
   private String[] roleIds;
   @ApiModelProperty(value = "电话号码")
-//  @NotEmpty(message = "电话号码不能为空或字符串", groups = AddGroup.class)
+  @NotEmpty(message = "电话号码不能为空或字符串", groups = AddGroup.class)
   private String phoneNumber;
   @ApiModelProperty(value = "邮箱")
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @853aebe
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
View file @853aebe
@@ -164,7 +164,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
         List<EntityRelation> relations = new ArrayList<>();
         Map<RuleNodeId, Integer> ruleNodeIndexMap = new HashMap<>();
-        if (nodes != null) {
+        if (nodes != null && nodes.size()>0) {
             for (RuleNode node : nodes) {
                 setSingletonMode(node);
                 if (node.getId() != null) {
@@ -191,7 +191,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
             updatedRuleNodes.add(new RuleNodeUpdateResult(existingNode, newRuleNode));
         }
         RuleChainId ruleChainId = ruleChain.getId();
-        if (nodes != null) {
+        if (nodes != null && nodes.size()>0) {
             for (RuleNode node : toAddOrUpdate) {
                 node.setRuleChainId(ruleChainId);
                 node = ruleNodeUpdater.apply(node);
@@ -208,7 +208,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
             deleteRuleNodes(tenantId, toDelete);
         }
         RuleNodeId firstRuleNodeId = null;
-        if (nodes != null) {
+        if (nodes != null && nodes.size()>0) {
             if (ruleChainMetaData.getFirstNodeIndex() != null) {
                 firstRuleNodeId = nodes.get(ruleChainMetaData.getFirstNodeIndex()).getId();
             }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConvertConfigServiceImpl.java
View file @853aebe
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkConvertConfigServiceImpl.java
View file @853aebe
@@ -431,7 +431,10 @@ public class TkConvertConfigServiceImpl
   private void freshRuleChainMetaData(RuleChainMetaData ruleChainMetaData, int removeNodeIndex) {
     ruleChainMetaData.getNodes().remove(removeNodeIndex);
-    int firstIndex = ruleChainMetaData.getFirstNodeIndex();
+    Integer firstIndex = ruleChainMetaData.getFirstNodeIndex();
+    if(firstIndex==null){
+      return;
+    }
     ruleChainMetaData.setFirstNodeIndex(
         Math.max(firstIndex < removeNodeIndex ? firstIndex : firstIndex - 1, 0));
@@ -834,7 +837,7 @@ public class TkConvertConfigServiceImpl
                   nodeConnectionInfo.setFromIndex(ruleNodeIndex.get());
                   nodeConnectionInfo.setToIndex(ruleChainMetaData.getNodes().size() - 2);
                   nodeConnectionInfo.setType(connectionType);
-                  ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+                  ruleChainMetaData.addConnectionInfo(nodeConnectionInfo);
                 }
                 if (node.getName().equals(sceneOriginatorName)
                     && node.getType().equals(originatorType)) {
@@ -842,7 +845,7 @@ public class TkConvertConfigServiceImpl
                   nodeConnectionInfo.setFromIndex(ruleNodeIndex.get());
                   nodeConnectionInfo.setToIndex(ruleChainMetaData.getNodes().size() - 1);
                   nodeConnectionInfo.setType(connectionType);
-                  ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+                  ruleChainMetaData.addConnectionInfo(nodeConnectionInfo);
                 }
                 if (node.getType().equals("org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode")) {
@@ -850,7 +853,7 @@ public class TkConvertConfigServiceImpl
                   nodeConnectionInfo.setFromIndex(ruleChainMetaData.getNodes().size() - 1);
                   nodeConnectionInfo.setToIndex(ruleNodeIndex.get());
                   nodeConnectionInfo.setType("RPC Request");
-                  ruleChainMetaData.getConnections().add(nodeConnectionInfo);
+                  ruleChainMetaData.addConnectionInfo(nodeConnectionInfo);
                 }
                 ruleNodeIndex.getAndIncrement();
               });
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSceneLinkageServiceImpl.java
View file @853aebe
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkSceneLinkageServiceImpl.java
View file @853aebe
@@ -473,11 +473,12 @@ public class TkSceneLinkageServiceImpl
    */
   @Override
   public JsonNode getRuleNodeConfig(
-          String currentSceneId, String tenantId, String customerId, Integer state) {
+          String currentSceneId, String ruleChainId,String tenantId, String customerId, Integer state) {
     List<TkSceneLinkageEntity> runningScenes =
             baseMapper.selectList(
                     new LambdaQueryWrapper<TkSceneLinkageEntity>()
                             .eq(TkSceneLinkageEntity::getTenantId, tenantId)
+                            .eq(TkSceneLinkageEntity::getRuleChainId,ruleChainId)
                             .eq(TkSceneLinkageEntity::getStatus, FastIotConstants.StateValue.ENABLE));
     Set<String> enableIds = new HashSet<>();
     Map<String, String> sceneInform = new HashMap<>();
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/SceneLinkageService.java
View file @853aebe
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/SceneLinkageService.java
View file @853aebe
@@ -87,7 +87,7 @@ public interface SceneLinkageService extends BaseService<TkSceneLinkageEntity>{
      * @param state     是否启动
      * @return
      */
-    JsonNode getRuleNodeConfig(String sceneId,String tenantId,String customerId,Integer state);
+    JsonNode getRuleNodeConfig(String sceneId,String ruleChainId,String tenantId,String customerId,Integer state);
     /**
      * 详情