fix: 消息模板接收tenantId和刪除组织修改

@@ -19,9 +19,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.dao.yunteng.service.YtMailService;
 import org.thingsboard.server.dao.yunteng.service.YtMessageTemplateService;
 import org.thingsboard.server.dao.yunteng.service.YtSmsService;
-
 import java.util.HashMap;
-
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
@@ -44,7 +42,7 @@ public class YtMessageTemplateController {
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) {
 
-    HashMap<String, Object> queryMap = new HashMap<>();
+   HashMap<String, Object> queryMap = new HashMap<>();
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);

@@ -24,4 +24,7 @@ public class MessageConfigDTO extends TenantDTO {
 
   /** 状态：0禁用 1启用 */
   private Integer status;
+
+  /** 备注 */
+  private String remark;
 }

@@ -10,7 +10,7 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = ModelConstants.Table.MESSAGE_CONFIG_TABLE_NAME,autoResultMap = true)
+@TableName(value = ModelConstants.Table.MESSAGE_CONFIG_TABLE_NAME, autoResultMap = true)
 public class MessageConfig extends TenantBaseEntity {
 
   private static final long serialVersionUID = -3624943194108704138L;
@@ -30,4 +30,7 @@ public class MessageConfig extends TenantBaseEntity {
 
   /** 状态：0禁用 1启用 */
   private Integer status;
+
+  /** 备注 */
+  private String remark;
 }

@@ -54,12 +54,11 @@ public class YtMessageTemplateServiceImpl
   @Transactional
   public MessageTemplateDTO updateMessageTemplate(MessageTemplateDTO templateDTO) {
 
-//    String tenantCode = SecurityContext.getCurrentUser().getTenantId();
     //查询该租户下 是否已经启用相同消息类型、相同用途的模板
     MessageTemplateDTO queryTemplate = new MessageTemplateDTO();
     queryTemplate.setTemplatePurpose(templateDTO.getTemplatePurpose());
     queryTemplate.setMessageType(templateDTO.getMessageType());
-//    queryTemplate.setTemplateCode(tenantCode);
+    //queryTemplate.setTemplateCode(tenantCode);
     if(StringUtils.isEmpty(templateDTO.getTemplatePurpose()) || StringUtils.isEmpty(templateDTO.getMessageType())){
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
@@ -68,8 +67,9 @@ public class YtMessageTemplateServiceImpl
       throw new YtDataValidationException(ErrorMessage.NOT_SET_PASSWORD_TEMPLATE.getMessage());
     }
     MessageTemplate messageTemplate = baseMapper.selectById(templateDTO.getId());
+    templateDTO.setTenantId(templateDTO.getTenantId());
     templateDTO.copyToEntity(messageTemplate);
-//    messageTemplate.setTenantId(tenantCode);
+
     baseMapper.updateById(messageTemplate);
     messageTemplate.copyToDTO(templateDTO);
     return templateDTO;

@@ -82,14 +82,16 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
       throw new YtDataValidationException("待删除数据存在关联用户,不能删除!");
     }
     // 查询是否有设备使用该组织
-    List<YtDevice> deviceList =
-        deviceMapper.selectList(
-            new QueryWrapper<YtDevice>()
-                .lambda()
-                .eq(YtDevice::getTenantId, tenantId)
-                .eq(YtDevice::getOrganizationId, ids));
-    if (!deviceList.isEmpty()) {
-      throw new YtDataValidationException("待删除数据存在关联设备,不能删除!");
+    for (String id : ids) {
+      List<YtDevice> deviceList =
+          deviceMapper.selectList(
+              new QueryWrapper<YtDevice>()
+                  .lambda()
+                  .eq(YtDevice::getTenantId, tenantId)
+                  .eq(YtDevice::getOrganizationId, id));
+      if (!deviceList.isEmpty()) {
+        throw new YtDataValidationException("待删除数据存在关联设备,不能删除!");
+      }
     }
     doDeleteUserOrganizationMapping(idToDelete);
     return baseMapper.deleteBatchIds(idToDelete) > 0;
@@ -118,7 +120,8 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     if (organization.getName().equals(organizationDTO.getName())
         && organization.getSort() == organizationDTO.getSort()
-        && organization.getRemark().equals(organizationDTO.getRemark())
+        && (organization.getRemark() != null
+            && organization.getRemark().equals(organizationDTO.getRemark()))
         && Objects.equals(organization.getParentId(), organizationDTO.getParentId())) {
       return organizationDTO;
     }

@@ -15,11 +15,12 @@
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
         <result property="configName" column="config_name"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="columns">
         id
-        ,platform_type,config,config_name,tenant_id,message_type,status,creator,create_time,updater,update_time
+        ,platform_type,config,config_name,tenant_id,message_type,status,creator,create_time,updater,update_time,remark
     </sql>
     <select id="getEnableConfigByMessageAndPlatform" resultMap="messageConfigDTOMap">
         SELECT

@@ -15,13 +15,15 @@
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
-        <association property="messageConfig" javaType="org.thingsboard.server.common.data.yunteng.dto.MessageConfigDTO">
+        <result property="tenantId" column="tenant_id"/>
+        <association property="messageConfig"
+                     javaType="org.thingsboard.server.common.data.yunteng.dto.MessageConfigDTO">
             <result property="configName" column="config_name"/>
         </association>
     </resultMap>
     <sql id="columns">
         mt.id,mt.template_code,mt.template_name,mt.sign_name,mt.message_config_id,mt.template_purpose,mt.creator,
-        mt.create_time,mt.updater,mt.update_time,mt.message_type,mc.config_name,mt.status
+        mt.create_time,mt.updater,mt.update_time,mt.message_type,mc.config_name,mt.status,mt.tenant_id
     </sql>
     <select id="getTemplatePage" resultMap="messageTemplateDTOMap">
         SELECT
@@ -29,7 +31,9 @@
         FROM message_template mt LEFT JOIN message_config mc ON
         mt.message_config_id=mc.id
         <where>
-            <if test="queryMap.tenantId !=null and queryMap.tenantId != ''">mc.tenant_id = #{queryMap.tenantId}</if>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId != ''">
+                AND mt.tenant_id = #{queryMap.tenantId}
+            </if>
             <if test="queryMap.templateCode !=null and queryMap.templateCode != ''">
                 AND mt.template_code LIKE concat('%',#{queryMap.templateCode}::TEXT,'%')
             </if>
@@ -48,9 +52,11 @@
             <if test="id !=null and id != ''">mt.id = #{id}</if>
             <if test="tenantId !=null and tenantId != ''">AND mt.tenant_id = #{tenantId}</if>
             <if test="templateCode !=null and templateCode != ''">AND mt.template_code = #{templateCode}</if>
-            <if test="messageConfigId !=null and messageConfigId != ''">AND mt.message_configId = #{messageConfigId}</if>
+            <if test="messageConfigId !=null and messageConfigId != ''">AND mt.message_configId = #{messageConfigId}
+            </if>
             <if test="messageType !=null and messageType != ''">AND mt.message_type = #{messageType}</if>
-            <if test="templatePurpose !=null and templatePurpose != ''">AND mt.template_purpose = #{templatePurpose}</if>
+            <if test="templatePurpose !=null and templatePurpose != ''">AND mt.template_purpose = #{templatePurpose}
+            </if>
             <if test="status !=null">AND mt.status = #{status}</if>
         </where>
     </select>