fix：i18n bug修改

@@ -52,6 +52,7 @@ public class TkApplicationController extends BaseController {
     queryMap.put(PAGE, page);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put("name", name);
     queryMap.put("name", name);
+    queryMap.put("tenantId", getCurrentUser().getCurrentTenantId());
     if(StringUtils.isNotEmpty(organizationId)){
     if(StringUtils.isNotEmpty(organizationId)){
       List<String> organizationIds = tkOrganizationService.organizationAllIds(getCurrentUser().getCurrentTenantId(),organizationId);
       List<String> organizationIds = tkOrganizationService.organizationAllIds(getCurrentUser().getCurrentTenantId(),organizationId);
       queryMap.put("organizationIds", organizationIds);
       queryMap.put("organizationIds", organizationIds);

@@ -195,8 +195,19 @@ openapi.app.isnull= The application does not exist
 openapi.api.isnull= API does not exist
 openapi.api.isnull= API does not exist
 publicly.successful = Publicly successful
 publicly.successful = Publicly successful
 private.success = Private Success
 private.success = Private Success
-
-
+method.does.not.exist = The calling method %s does not exist
+one.second.ago = seconds ago
+one.minute.ago = minutes ago
+one.huor.ago = huor ago
+one.day.ago = day ago
+one.month.ago = month ago
+one.year.ago= year ago
+one.just.ago= just
+one.yesterday.ago= yesterday
+rule.chain.to.tenant = Rule chain should be assigned to tenant
+non.existent.tenant = Rule chain is referencing to non-existent tenant!
+root.rule.chain.is.present = Another root rule chain is present in scope of current tenant!
+edge.root.rule.chain.is.present = Another edge template root rule chain is present in scope of current tenant!
 
 
 
 
 
 

@@ -194,4 +194,18 @@ choice.device.profile.rule.chain.is.used.for.scene = 选中的产å“ã€%s】正å
 openapi.app.isnull = 应用不存在
 openapi.app.isnull = 应用不存在
 openapi.api.isnull = api不存在
 openapi.api.isnull = api不存在
 publicly.successful = 公开成功
 publicly.successful = 公开成功
-private.success = 私有成功
+private.success = 私有成功
+method.does.not.exist = 调用方法【%s】不存在
+one.second.ago = 秒前
+one.minute.ago = 分钟前
+one.huor.ago = 小时前
+one.day.ago = 天前
+one.month.ago = 月前
+one.year.ago= 年前
+one.just.ago= 刚刚
+one.yesterday.ago= 昨天
+rule.chain.to.tenant =规则链应分配给租户
+non.existent.tenant =规则链正在引用不存在的租户
+root.rule.chain.is.present =当前租户范围内存在另一个根规则链
+edge.root.rule.chain.is.present =当前租户范围内存在另一个边缘模板根规则链
+

@@ -196,6 +196,14 @@ public enum ErrorMessage {
   CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_SCENE(400161,"选中的产品【%s】正在被场景联动【%s】使用，不能更换规则链！！","choice.device.profile.rule.chain.is.used.for.scene"),
   CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_SCENE(400161,"选中的产品【%s】正在被场景联动【%s】使用，不能更换规则链！！","choice.device.profile.rule.chain.is.used.for.scene"),
   OPENAPI_APP_ISNULL(400162,"应用不存在","openapi.app.isnull"),
   OPENAPI_APP_ISNULL(400162,"应用不存在","openapi.app.isnull"),
   OPENAPI_API_ISNULL(400163,"api不存在","openapi.api.isnull"),
   OPENAPI_API_ISNULL(400163,"api不存在","openapi.api.isnull"),
+  METHOD_DOES_NOT_EXIST(400164,"调用方法【%s】不存在","method.does.not.exist"),
+
+  RULE_CHAIN_TO_TENANT(400165,"规则链应分配给租户","rule.chain.to.tenant"),
+  NON_EXISTENT_TENANT(400166,"规则链正在引用不存在的租户！","non.existent.tenant"),
+  ROOT_RULE_CHAIN_IS_PRESENT (400167,"当前租户范围内存在另一个根规则链！","root.rule.chain.is.present"),
+  EDGE_ROOT_RULE_CHAIN_IS_PRESENT(400168,"当前租户范围内存在另一个边缘模板根规则链！","edge.root.rule.chain.is.present"),
+
+
 
 
   HAVE_NO_PERMISSION(500002, "没有修改权限", "have.no.permission"),
   HAVE_NO_PERMISSION(500002, "没有修改权限", "have.no.permission"),
   NOT_ALLOWED_ISOLATED_IN_MONOLITH(500003, "【monolith】模式下，不能选择【isolated】类型的租户配置", "not.allowed.isolated.in.monolith"),
   NOT_ALLOWED_ISOLATED_IN_MONOLITH(500003, "【monolith】模式下，不能选择【isolated】类型的租户配置", "not.allowed.isolated.in.monolith"),

@@ -30,6 +30,8 @@ import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.util.ReflectionUtils;
 import org.thingsboard.server.common.data.util.ReflectionUtils;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.ConstraintValidator;
 import org.thingsboard.server.dao.service.ConstraintValidator;
@@ -67,21 +69,21 @@ public class RuleChainDataValidator extends DataValidator<RuleChain> {
             ruleChain.setType(RuleChainType.CORE);
             ruleChain.setType(RuleChainType.CORE);
         }
         }
         if (ruleChain.getTenantId() == null || ruleChain.getTenantId().isNullUid()) {
         if (ruleChain.getTenantId() == null || ruleChain.getTenantId().isNullUid()) {
-            throw new DataValidationException("Rule chain should be assigned to tenant!");
+            throw new DataValidationException(MessageUtils.message(ErrorMessage.RULE_CHAIN_TO_TENANT.getI18nCode()));
         }
         }
         if (!tenantService.tenantExists(ruleChain.getTenantId())) {
         if (!tenantService.tenantExists(ruleChain.getTenantId())) {
-            throw new DataValidationException("Rule chain is referencing to non-existent tenant!");
+            throw new DataValidationException(MessageUtils.message(ErrorMessage.NON_EXISTENT_TENANT.getI18nCode()));
         }
         }
         if (ruleChain.isRoot() && RuleChainType.CORE.equals(ruleChain.getType())) {
         if (ruleChain.isRoot() && RuleChainType.CORE.equals(ruleChain.getType())) {
             RuleChain rootRuleChain = ruleChainService.getRootTenantRuleChain(ruleChain.getTenantId());
             RuleChain rootRuleChain = ruleChainService.getRootTenantRuleChain(ruleChain.getTenantId());
             if (rootRuleChain != null && !rootRuleChain.getId().equals(ruleChain.getId())) {
             if (rootRuleChain != null && !rootRuleChain.getId().equals(ruleChain.getId())) {
-                throw new DataValidationException("Another root rule chain is present in scope of current tenant!");
+                throw new DataValidationException(MessageUtils.message(ErrorMessage.ROOT_RULE_CHAIN_IS_PRESENT.getI18nCode()));
             }
             }
         }
         }
         if (ruleChain.isRoot() && RuleChainType.EDGE.equals(ruleChain.getType())) {
         if (ruleChain.isRoot() && RuleChainType.EDGE.equals(ruleChain.getType())) {
             RuleChain edgeTemplateRootRuleChain = ruleChainService.getEdgeTemplateRootRuleChain(ruleChain.getTenantId());
             RuleChain edgeTemplateRootRuleChain = ruleChainService.getEdgeTemplateRootRuleChain(ruleChain.getTenantId());
             if (edgeTemplateRootRuleChain != null && !edgeTemplateRootRuleChain.getId().equals(ruleChain.getId())) {
             if (edgeTemplateRootRuleChain != null && !edgeTemplateRootRuleChain.getId().equals(ruleChain.getId())) {
-                throw new DataValidationException("Another edge template root rule chain is present in scope of current tenant!");
+                throw new DataValidationException(MessageUtils.message(ErrorMessage.EDGE_ROOT_RULE_CHAIN_IS_PRESENT.getI18nCode()));
             }
             }
         }
         }
     }
     }

@@ -64,7 +64,7 @@ public abstract class AbstractQuartzJob implements Job {
     long runMs =
     long runMs =
         sysJobLog.getEndTime().toInstant(ZoneOffset.of("+8")).toEpochMilli()
         sysJobLog.getEndTime().toInstant(ZoneOffset.of("+8")).toEpochMilli()
             - startTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
             - startTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
-    sysJobLog.setJobMessage(" 总共耗时：" + runMs + "毫秒");
+    sysJobLog.setJobMessage(String.valueOf(runMs));
     if (e != null) {
     if (e != null) {
       sysJobLog.setStatus(StatusEnum.FAIL.getIndex());
       sysJobLog.setStatus(StatusEnum.FAIL.getIndex());
       String errorMsg = StringUtils.substring(e.getMessage(), 0, 2000);
       String errorMsg = StringUtils.substring(e.getMessage(), 0, 2000);

@@ -5,8 +5,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.quartz.*;
 import org.quartz.*;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
 import org.thingsboard.server.common.data.yunteng.utils.SpringBeanUtils;
+import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 import org.thingsboard.server.dao.yunteng.entities.SysJobEntity;
 
 
 import java.util.Objects;
 import java.util.Objects;
@@ -117,7 +119,7 @@ public class ScheduleUtils {
     try{
     try{
       obj = SpringBeanUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
       obj = SpringBeanUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
     }catch (Exception e){
     }catch (Exception e){
-      throw new TkDataValidationException("调用方法【"+invokeTarget+"】不存在");
+      throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.METHOD_DOES_NOT_EXIST.getI18nCode()),invokeTarget));
     }
     }
     return containsAnyIgnoreCase(
     return containsAnyIgnoreCase(
         obj.getClass().getPackage().getName(),
         obj.getClass().getPackage().getName(),

 package org.thingsboard.server.dao.util.yunteng.task;
 package org.thingsboard.server.dao.util.yunteng.task;
 
 
+import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
+
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.ZoneOffset;
 
 
@@ -9,12 +11,14 @@ public class RelativeDateHandler {
   private static final long ONE_DAY = 86400000L;
   private static final long ONE_DAY = 86400000L;
   private static final long ONE_WEEK = 604800000L;
   private static final long ONE_WEEK = 604800000L;
 
 
-  private static final String ONE_SECOND_AGO = "秒前";
-  private static final String ONE_MINUTE_AGO = "分钟前";
-  private static final String ONE_HOUR_AGO = "小时前";
-  private static final String ONE_DAY_AGO = "天前";
-  private static final String ONE_MONTH_AGO = "月前";
-  private static final String ONE_YEAR_AGO = "年前";
+  private static final String ONE_SECOND_AGO = MessageUtils.message("one.second.ago");
+  private static final String ONE_MINUTE_AGO = MessageUtils.message("one.minute.ago");
+  private static final String ONE_HOUR_AGO =MessageUtils.message("one.huor.ago");
+  private static final String ONE_DAY_AGO = MessageUtils.message("one.day.ago");
+  private static final String ONE_MONTH_AGO = MessageUtils.message("one.month.ago");
+  private static final String ONE_YEAR_AGO =MessageUtils.message("one.year.ago");
+  private static final String ONE_JUST_AGO =MessageUtils.message("one.just.ago");
+  private static final String ONE_YESTERDAY_AGO =MessageUtils.message("one.yesterday.ago");
 
 
   public static String format(LocalDateTime date) {
   public static String format(LocalDateTime date) {
     Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
     Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
@@ -22,7 +26,7 @@ public class RelativeDateHandler {
     long delta = currentTime - executeTime;
     long delta = currentTime - executeTime;
     if (delta < ONE_MINUTE) {
     if (delta < ONE_MINUTE) {
       long seconds = toSeconds(delta);
       long seconds = toSeconds(delta);
-      return seconds <= 0 ? "刚刚" : seconds + ONE_SECOND_AGO;
+      return seconds <= 0 ? ONE_JUST_AGO : seconds + ONE_SECOND_AGO;
     }
     }
     if (delta < 45L * ONE_MINUTE) {
     if (delta < 45L * ONE_MINUTE) {
       long minutes = toMinutes(delta);
       long minutes = toMinutes(delta);
@@ -33,7 +37,7 @@ public class RelativeDateHandler {
       return (hours <= 0 ? 1 : hours) + ONE_HOUR_AGO;
       return (hours <= 0 ? 1 : hours) + ONE_HOUR_AGO;
     }
     }
     if (delta < 48L * ONE_HOUR) {
     if (delta < 48L * ONE_HOUR) {
-      return "昨天";
+      return ONE_YESTERDAY_AGO;
     }
     }
     if (delta < 30L * ONE_DAY) {
     if (delta < 30L * ONE_DAY) {
       long days = toDays(delta);
       long days = toDays(delta);

@@ -54,7 +54,7 @@ public class TkDeviceProfileCategoryServiceImpl extends AbstractBaseService<TkDe
                                                            Integer status,
                                                            Integer status,
                                                            String dictItemId,
                                                            String dictItemId,
                                                            String name) {
                                                            String name) {
-        List<TkDeviceProfileCategoryDTO>  pageEntity = baseMapper.getPage(tenantId,page-1,pageSize,isSysAdmin,status,dictItemId,name);
+        List<TkDeviceProfileCategoryDTO>  pageEntity = baseMapper.getPage(tenantId,page,pageSize,isSysAdmin,status,dictItemId,name);
         Long pageCount = baseMapper.getPageSize(tenantId,isSysAdmin,status,dictItemId,name);
         Long pageCount = baseMapper.getPageSize(tenantId,isSysAdmin,status,dictItemId,name);
         return new TkPageData<>(pageEntity, pageCount);
         return new TkPageData<>(pageEntity, pageCount);
     }
     }

@@ -34,7 +34,8 @@
         </if>
         </if>
         ORDER BY create_time desc
         ORDER BY create_time desc
         <if test="page != null">
         <if test="page != null">
-            LIMIT #{pageSize} OFFSET #{page}
+            LIMIT #{pageSize}
+            OFFSET (#{page} - 1) * #{pageSize};
         </if>
         </if>
     </select>
     </select>
 
 

@@ -29,7 +29,8 @@
         GROUP BY application_name
         GROUP BY application_name
         ORDER BY recordNum desc
         ORDER BY recordNum desc
         <if test="page != null">
         <if test="page != null">
-            LIMIT #{pageSize} OFFSET #{page}
+            LIMIT #{pageSize}
+            OFFSET (#{page} - 1) * #{pageSize};
         </if>
         </if>
     </select>
     </select>
 
 

@@ -51,13 +51,14 @@
 
 
     <select id="getProfilePage" resultMap="detail">
     <select id="getProfilePage" resultMap="detail">
         SELECT
         SELECT
-        <include refid="basicColumns"/>,base.name as categoryName ,
+        <include refid="basicColumns"/>,cate.name as categoryName ,
         CASE
         CASE
         WHEN re.to_id is not null THEN 1
         WHEN re.to_id is not null THEN 1
         ELSE 0
         ELSE 0
         END AS is_edge
         END AS is_edge
         FROM device_profile base
         FROM device_profile base
         LEFT JOIN relation re on re.to_id = base.id and from_type = 'EDGE'  and re.relation_type = 'ManagedByEdge'
         LEFT JOIN relation re on re.to_id = base.id and from_type = 'EDGE'  and re.relation_type = 'ManagedByEdge'
+        LEFT JOIN tk_device_profile_category cate on  cate.id = base.category_id
         <where>
         <where>
             <if test="tenantId !=null">
             <if test="tenantId !=null">
                 AND base.tenant_id = #{tenantId}
                 AND base.tenant_id = #{tenantId}