Merge branch 'localhost-cxy' into 'master'

告警联系人组织回显修改

See merge request huang/thingsboard3.3.2!18

@@ -3,6 +3,7 @@ package org.thingsboard.server.controller.yunteng;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -67,15 +68,16 @@ public class YtAlarmContactController extends BaseController {
       @RequestParam(PAGE) int page,
       @RequestParam(value = "username", required = false) String username,
       @RequestParam(value = "organizationId", required = false) String organizationId,
-      @RequestParam(value = CREATE_TIME, required = false) String createtime) {
+      @RequestParam(value = CREATE_TIME, required = false) String createtime) throws ThingsboardException {
     HashMap<String, Object> queryMap = new HashMap<>();
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put("username",username);
-    queryMap.put("organizationId",organizationId);
+    if(!StringUtils.isEmpty(organizationId)){
+      queryMap.put("organizationId", organizationId);
+    }
     queryMap.put(CREATE_TIME, createtime);
-
-    return alarmService.page(queryMap);
+    return alarmService.page(getCurrentUser().getCurrentTenantId(),queryMap);
   }
 
   @ApiOperation(value = "删除")

@@ -46,5 +46,8 @@ public class AlarmContactDTO extends TenantDTO {
     @ApiModelProperty(value = "添加人")
     private String addPeople;
 
+    @ApiModelProperty(value="组织对象")
+    private OrganizationDTO organizationDTO;
+
 
 }

@@ -7,15 +7,19 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmContactDTO;
+import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
+import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmContactService;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -28,6 +32,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
   /** mapper注入 自带方法加入,继承的baseMapper */
   private final AlarmContactMapper alarmContactMapper;
 
+  private final OrganizationMapper ytOrganizationMapper;
   /**
    * 查询全部的告警联系人
    *
@@ -121,29 +126,30 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
     }
   }
 
-
-
   /**
    * @param queryMap 查询集合
    * @return PageData
    */
   @Override
   @Transactional
-  public YtPageData<AlarmContactDTO> page(Map<String, Object> queryMap) {
+  public YtPageData<AlarmContactDTO> page(String tenantId,Map<String, Object> queryMap) {
     // 查询分页,加入条模糊条件查询
-    IPage<AlarmContact> iPage =
-        alarmContactMapper.selectPage(
-            getPage(queryMap, "create_time", false),
-            new QueryWrapper<AlarmContact>()
-                .lambda()
-                .like(
-                    StringUtils.isNoneBlank((String) queryMap.get("username")),
-                    AlarmContact::getUsername,
-                    queryMap.get("username"))
-                .eq(
-                    StringUtils.isNoneBlank((String) queryMap.get("organizationId")),
-                    AlarmContact::getOrganizationId,
-                    queryMap.get("organizationId")));
-    return getPageData(iPage, AlarmContactDTO.class);
+    queryMap.put("tenantId", tenantId);
+    String organizationId= (String) queryMap.get("organizationId");
+    //传入的组织id不为空
+    if (!StringUtils.isEmpty(organizationId)){
+        List<String> organizationIds= new ArrayList<>();
+        organizationIds.add(organizationId);
+    //查询该组织的所有子类
+      List<OrganizationDTO> organizationDTOS=ytOrganizationMapper.findOrganizationTreeList(tenantId,organizationIds);
+      List<String> queryOrganizationIds = new ArrayList<>();
+      organizationDTOS.forEach(item->{
+        queryOrganizationIds.add(item.getId());
+      });
+      queryMap.put("organizationIds",queryOrganizationIds);
+    }
+   IPage<AlarmContact> page= getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
+    IPage<AlarmContactDTO> pageDto= baseMapper.getAlarmPage(page,queryMap);
+    return getPageData(pageDto, AlarmContactDTO.class);
   }
 }

 package org.thingsboard.server.dao.yunteng.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.thingsboard.server.common.data.yunteng.dto.AlarmContactDTO;
 import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 
+import java.util.Map;
+
 /** @Description 告警联系人持久化数据层 @Author cxy @Date 2021/11/2 11:52 */
 @Mapper
-public interface AlarmContactMapper extends BaseMapper<AlarmContact> {}
+public interface AlarmContactMapper extends BaseMapper<AlarmContact> {
+
+    IPage<AlarmContactDTO> getAlarmPage(
+            IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+}

@@ -53,6 +53,6 @@ public interface YtAlarmContactService {
      * @param queryMap 查询集合
      * @return PageData
      */
-    YtPageData<AlarmContactDTO> page(Map<String, Object> queryMap);
+    YtPageData<AlarmContactDTO> page(String tenantId,Map<String, Object> queryMap);
 
 }

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.codeez.mapper.AlarmContactMapper">
-    <resultMap id="alarmContactMap" type="org.thingsboard.server.common.data.yunteng.dto.AlarmContactDTO" >
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper">
+    <resultMap id="alarmContactMap" type="org.thingsboard.server.common.data.yunteng.dto.AlarmContactDTO">
         <result property="id" column="id"/>
         <result property="username" column="username"/>
         <result property="organizationId" column="organization_id"/>
@@ -15,7 +15,35 @@
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
         <result property="creator" column="creator"/>
-
+        <result property="tenantId" column="tenant_id"/>
+        <result property="updater" column="updater"/>
+        <association property="organizationDTO"
+                     javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO">
+            <result property="name" column="organization_name"/>
+        </association>
     </resultMap>
-
+    <sql id="columns">
+        a.id,a.username,a.organization_id,a.phone,a.email,a.wechat,a.dingtalk,a.remark,a.add_people,a.update_time,
+        a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
+    </sql>
+    <select id="getAlarmPage" resultMap="alarmContactMap">
+        SELECT
+        <include refid="columns"/>
+        FROM iotfs_alarm_contact a
+        LEFT JOIN iotfs_organization io ON io.id = a.organization_id
+        <where>
+            <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
+                AND a.tenant_id = #{queryMap.tenantId}
+            </if>
+            <if test="queryMap.name !=null and queryMap.name !=''">
+                AND a.username LIKE concat('%',#{queryMap.username}::TEXT,'%')
+            </if>
+            <if test="queryMap.organizationIds !=null">
+                AND a.organization_id IN
+                <foreach collection="queryMap.organizationIds" item="organizationId" open="(" separator="," close=")">
+                    #{organizationId}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>