/*

1. 绍兴站新需求-卡片-数据趋势：只显示有表计读数点位的区域间隔设备，完成开发后端接口-treeAreaDeviceSelectFilterByMeter；
2. 绍兴站新需求-卡片-点位管理：巡视点位设备树不显示无人机、机器人、安防摄像头、生活区域、新增相机、机器狗，完成开发后端接口-treeAreaDeviceSelectFilterByPreset；
*/

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java

@@ -120,10 +120,18 @@ public class ResultAnalysisUtils {
                 defaultDesc = messageUtils.get("正常");
             } else {
                 log.info("------------------parseAlg meter is alarm");
-                resultAnalysis.setResStatus("0");
-                resultAnalysis.setPointStatus("0");
-                resultAnalysis.setResultType("0");
-                defaultDesc = messageUtils.get("表计超限");
+                String[] valueArr = value.split(StringUtils.COMMA);
+                if(valueArr.length > 1) {
+                    resultAnalysis.setResStatus("0");
+                    resultAnalysis.setPointStatus("0");
+                    resultAnalysis.setResultType("0");
+                    defaultDesc = messageUtils.get("正常");
+                } else {
+                    resultAnalysis.setResStatus("0");
+                    resultAnalysis.setPointStatus("0");
+                    resultAnalysis.setResultType("0");
+                    defaultDesc = messageUtils.get("表计超限");
+                }
             }
         } else if (algType.equals("sound")) {
             if (value.equals("1")) {

inspect-metadata/src/main/java/com/inspect/metadata/area/domain/BaseDataArea.java

@@ -49,6 +49,7 @@ public class BaseDataArea extends BaseEntity {
     private String oldAreaId;
     private String oldParentId;
     private List<BaseDataArea> children = new ArrayList<>();
+    private List<String> filterNameList;
 
     public String getOldAreaId() {
         return this.oldAreaId;
@@ -129,6 +130,14 @@ public class BaseDataArea extends BaseEntity {
         return this.areaIdS;
     }
 
+    public List<String> getFilterNameList() {
+        return filterNameList;
+    }
+
+    public void setFilterNameList(List<String> filterNameList) {
+        this.filterNameList = filterNameList;
+    }
+
     @Override
     public String toString() {
         return "BaseDataArea{" +
@@ -148,6 +157,7 @@ public class BaseDataArea extends BaseEntity {
                 ", areaIdS='" + areaIdS + '\'' +
                 ", oldAreaId='" + oldAreaId + '\'' +
                 ", oldParentId='" + oldParentId + '\'' +
+                ", filterNameList='" + filterNameList + '\'' +
                 ", children=" + children +
                 '}';
     }

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/controller/BasedataDeviceController.java

@@ -36,8 +36,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.math3.exception.NullArgumentException;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.CellType;
@@ -54,6 +56,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+@Slf4j
 @RestController
 @RequestMapping({"/prodevmnt/device"})
 public class BasedataDeviceController extends BaseController {
@@ -173,10 +176,39 @@ public class BasedataDeviceController extends BaseController {
 
     @GetMapping({"/treeAreaDeviceSelect"})
     public AjaxResult treeAreaDeviceSelect(BaseDataArea area) {
+        log.info("treeAreaDeviceSelect param: {}", area);
         List<BaseDataArea> areas = this.baseDataAreaService.selectAreaList(area);
         return null != areas && !areas.isEmpty() ? AjaxResult.success(this.basedataDeviceService.buildAreaDeviceTreeSelectByAreas(areas)) : AjaxResult.success(new JSONArray());
     }
 
+    @GetMapping({"/treeAreaDeviceSelectFilterByPreset"})
+    public AjaxResult treeAreaDeviceSelectFilterByPreset(BaseDataArea baseDataArea) {
+        log.info("treeAreaDeviceSelectFilterByPreset param: {}", baseDataArea);
+        List<BaseDataArea> areaList = baseDataAreaService.selectAreaList(baseDataArea);
+        List<String> filterNameList = baseDataArea.getFilterNameList();
+        if(filterNameList == null || filterNameList.isEmpty()) {
+            filterNameList = new ArrayList<>();
+            filterNameList.add("无人机");
+            filterNameList.add("机器人");
+            filterNameList.add("机器狗");
+            filterNameList.add("安防摄像头");
+            filterNameList.add("生活区域");
+            filterNameList.add("新增相机");
+        }
+        return !areaList.isEmpty()
+                ? AjaxResult.success(basedataDeviceService.buildAreaDeviceTreeSelectByAreasFilterByPreset(areaList, filterNameList))
+                : AjaxResult.success(new JSONArray());
+    }
+
+    @GetMapping({"/treeAreaDeviceSelectFilterByMeter"})
+    public AjaxResult treeAreaDeviceSelectFilterByMeter(BaseDataArea baseDataArea) {
+        log.info("treeAreaDeviceSelectFilterByMeter param: {}", baseDataArea);
+        List<BaseDataArea> areaList = baseDataAreaService.selectAreaList(baseDataArea);
+        return !areaList.isEmpty()
+                ? AjaxResult.success(basedataDeviceService.buildAreaDeviceTreeSelectByAreasFilterByMeter(areaList))
+                : AjaxResult.success(new JSONArray());
+    }
+
     @GetMapping({"/treeProMainDevicePatrolEquSelect"})
     public AjaxResult treeProMainDevicePatrolEquSelect(BasedataDevice basedataDevice) {
         logger.info("[META] device: {}", basedataDevice);

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/BasedataDevice.java

@@ -84,6 +84,8 @@ public class BasedataDevice extends BaseEntity {
     private String oldParentId;
     private String oldAreaId;
     private String oldAreaName;
+    private String patrolPointId;
+    private String patrolPointName;
 
     @Override
     public String toString() {

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/domain/vo/AreaDeviceTreeSelect.java

@@ -2,8 +2,10 @@ package com.inspect.metadata.prodevmnt.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -26,6 +28,10 @@ public class AreaDeviceTreeSelect implements Serializable {
     private String deviceLength;
     private String deviceWidth;
     private String deviceHigh;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String patrolPointId;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String patrolPointName;
     @JsonInclude(Include.NON_EMPTY)
     private List<AreaDeviceTreeSelect> children;
 
@@ -196,4 +202,38 @@ public class AreaDeviceTreeSelect implements Serializable {
     public void setChildren(List<AreaDeviceTreeSelect> children) {
         this.children = children;
     }
+
+    public String getPatrolPointId() {
+        return patrolPointId;
+    }
+
+    public void setPatrolPointId(String patrolPointId) {
+        this.patrolPointId = patrolPointId;
+    }
+
+    public String getPatrolPointName() {
+        return patrolPointName;
+    }
+
+    public void setPatrolPointName(String patrolPointName) {
+        this.patrolPointName = patrolPointName;
+    }
+    public List<AreaDeviceTreeSelect> cleanEmptyPatrolPoints() {
+        // 递归清理
+        if (children != null) {
+            // 清理子节点
+            for (int i = children.size() - 1; i >= 0; i--) {
+                AreaDeviceTreeSelect child = children.get(i);
+                child.cleanEmptyPatrolPoints(); // 递归清理子节点
+                // 如果子节点是叶子节点且 patrolPointId 为空，则移除
+                if (child.getChildren() == null || child.getChildren().isEmpty()) {
+                    if (child.getPatrolPointId() == null) {
+                        children.remove(i);
+                    }
+                }
+            }
+        }
+        return children;
+    }
+
 }

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/mapper/BasedataDeviceMapper.java

@@ -15,6 +15,8 @@ public interface BasedataDeviceMapper {
 
     List<BasedataDevice> selectBasedataDeviceList(BasedataDevice device);
 
+    List<BasedataDevice> selectBasedataDeviceListFilterByMeter(BasedataDevice device);
+
     List<TreeModule> selectAreaAndDeviceTree(BasedataDevice device);
 
     List<TreeModule> selectPointList();

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/IBasedataDeviceService.java

@@ -48,4 +48,8 @@ public interface IBasedataDeviceService {
     String checkDeviceNameUnique(BasedataDevice device);
 
     List<AreaDeviceTreeSelect> buildAreaDeviceTreeSelectByAreas(List<BaseDataArea> areas);
+
+    List<AreaDeviceTreeSelect> buildAreaDeviceTreeSelectByAreasFilterByPreset(List<BaseDataArea> areas, List<String> filterNameList);
+
+    List<AreaDeviceTreeSelect> buildAreaDeviceTreeSelectByAreasFilterByMeter(List<BaseDataArea> areas);
 }

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/service/impl/BasedataDeviceServiceImpl.java

@@ -184,6 +184,136 @@ public class BasedataDeviceServiceImpl implements IBasedataDeviceService {
         return AreaDeviceTreeSelectUtil.buildDeviceTree(areaVOS);
     }
 
+    public List<AreaDeviceTreeSelect> buildAreaDeviceTreeSelectByAreasFilterByPreset(List<BaseDataArea> areas, List<String> filterNamelist) {
+        ArrayList<Long> areaIdList = new ArrayList<>();
+        HashMap<Long, BaseDataArea> areaMap = new HashMap<>();
+        HashMap<Long, BasedataDevice> deviceHashMap = new HashMap<>();
+        List<AreaDeviceTreeSelect> areaVOS = new ArrayList<>();
+
+        for (BaseDataArea area : areas) {
+            areaIdList.add(area.getAreaId());
+            areaMap.put(area.getAreaId(), area);
+            AreaDeviceTreeSelect areaVO = new AreaDeviceTreeSelect();
+            areaVO.setDataId(String.valueOf(area.getAreaId()));
+            areaVO.setParentId(String.valueOf(area.getParentId()));
+            areaVO.setAreaId(area.getAreaId());
+            areaVO.setAreaFlag("Yes");
+            areaVO.setAreaParentId(area.getParentId());
+            areaVO.setAreaName(area.getAreaName());
+            areaVO.setAreaType(area.getAreaType());
+            areaVOS.add(areaVO);
+        }
+
+        BasedataDevice basedataDeviceQuery = new BasedataDevice();
+        Map<String, Object> params = new HashMap<>();
+        params.put("areaIdList", areaIdList);
+        basedataDeviceQuery.setParams(params);
+        List<BasedataDevice> deviceList = this.basedataDeviceMapper.selectBasedataDeviceList(basedataDeviceQuery);
+        Iterator<BasedataDevice> iterator = deviceList.iterator();
+
+        BasedataDevice basedataDevice;
+        while (iterator.hasNext()) {
+            basedataDevice = iterator.next();
+            deviceHashMap.put(basedataDevice.getDeviceId(), basedataDevice);
+        }
+
+        iterator = deviceList.iterator();
+
+        while (iterator.hasNext()) {
+            basedataDevice = iterator.next();
+            AreaDeviceTreeSelect deviceVO = new AreaDeviceTreeSelect();
+            StringBuilder idBuilder = new StringBuilder();
+            StringBuilder pIdBuilder = new StringBuilder();
+            this.getAreaDeviceTreeDeviceCode(basedataDevice.getDeviceId(), areaMap, deviceHashMap, idBuilder, pIdBuilder);
+            deviceVO.setDataId(idBuilder.toString());
+            deviceVO.setParentId(pIdBuilder.toString());
+            deviceVO.setAreaId(basedataDevice.getAreaId());
+            deviceVO.setDeviceParentId(basedataDevice.getParentId());
+            deviceVO.setDeviceId(basedataDevice.getDeviceId());
+            deviceVO.setDeviceName(basedataDevice.getDeviceName());
+            deviceVO.setPowerMainEquFlag(basedataDevice.getPowerMainEquFlag());
+            deviceVO.setPositionX(basedataDevice.getPositionX());
+            deviceVO.setPositionY(basedataDevice.getPositionY());
+            deviceVO.setPositionZ(basedataDevice.getPositionZ());
+            deviceVO.setDeviceLength(basedataDevice.getDeviceLength());
+            deviceVO.setDeviceWidth(basedataDevice.getDeviceWidth());
+            deviceVO.setDeviceHigh(basedataDevice.getDeviceHeight());
+            areaVOS.add(deviceVO);
+        }
+
+        return AreaDeviceTreeSelectUtil.buildDeviceTreeFilterByAreaName(areaVOS, filterNamelist);
+    }
+
+    public List<AreaDeviceTreeSelect> buildAreaDeviceTreeSelectByAreasFilterByMeter(List<BaseDataArea> areas) {
+        ArrayList<Long> areaIdList = new ArrayList<>();
+        HashMap<Long, BaseDataArea> areaMap = new HashMap<>();
+        HashMap<Long, BasedataDevice> deviceHashMap = new HashMap<>();
+        List<AreaDeviceTreeSelect> areaVOS = new ArrayList<>();
+
+        for (BaseDataArea area : areas) {
+            areaIdList.add(area.getAreaId());
+            areaMap.put(area.getAreaId(), area);
+            AreaDeviceTreeSelect areaVO = new AreaDeviceTreeSelect();
+            areaVO.setDataId(String.valueOf(area.getAreaId()));
+            areaVO.setParentId(String.valueOf(area.getParentId()));
+            areaVO.setAreaId(area.getAreaId());
+            areaVO.setAreaFlag("Yes");
+            areaVO.setAreaParentId(area.getParentId());
+            areaVO.setAreaName(area.getAreaName());
+            areaVO.setAreaType(area.getAreaType());
+            areaVOS.add(areaVO);
+        }
+
+        BasedataDevice basedataDeviceQuery = new BasedataDevice();
+        Map<String, Object> params = new HashMap<>();
+        params.put("areaIdList", areaIdList);
+        basedataDeviceQuery.setParams(params);
+        List<BasedataDevice> deviceList = basedataDeviceMapper.selectBasedataDeviceListFilterByMeter(basedataDeviceQuery);
+        Iterator<BasedataDevice> iterator = deviceList.iterator();
+
+        BasedataDevice basedataDevice;
+        while (iterator.hasNext()) {
+            basedataDevice = iterator.next();
+            deviceHashMap.put(basedataDevice.getDeviceId(), basedataDevice);
+        }
+
+        iterator = deviceList.iterator();
+
+        while (iterator.hasNext()) {
+            basedataDevice = iterator.next();
+            logger.info("!!!!!!!!!patrolPointId: {}, patrolPointName: {}", basedataDevice.getPatrolPointId(), basedataDevice.getPatrolPointName());
+            AreaDeviceTreeSelect deviceVO = new AreaDeviceTreeSelect();
+            StringBuilder idBuilder = new StringBuilder();
+            StringBuilder pIdBuilder = new StringBuilder();
+            getAreaDeviceTreeDeviceCode(basedataDevice.getDeviceId(), areaMap, deviceHashMap, idBuilder, pIdBuilder);
+            deviceVO.setDataId(idBuilder.toString());
+            deviceVO.setParentId(pIdBuilder.toString());
+            deviceVO.setAreaId(basedataDevice.getAreaId());
+            deviceVO.setDeviceParentId(basedataDevice.getParentId());
+            deviceVO.setDeviceId(basedataDevice.getDeviceId());
+            deviceVO.setDeviceName(basedataDevice.getDeviceName());
+            deviceVO.setPowerMainEquFlag(basedataDevice.getPowerMainEquFlag());
+            deviceVO.setPositionX(basedataDevice.getPositionX());
+            deviceVO.setPositionY(basedataDevice.getPositionY());
+            deviceVO.setPositionZ(basedataDevice.getPositionZ());
+            deviceVO.setDeviceLength(basedataDevice.getDeviceLength());
+            deviceVO.setDeviceWidth(basedataDevice.getDeviceWidth());
+            deviceVO.setDeviceHigh(basedataDevice.getDeviceHeight());
+            deviceVO.setPatrolPointId(basedataDevice.getPatrolPointId());
+            deviceVO.setPatrolPointName(basedataDevice.getPatrolPointName());
+            deviceVO.setDeviceName(basedataDevice.getPatrolPointName());
+            areaVOS.add(deviceVO);
+        }
+
+        List<AreaDeviceTreeSelect> results = AreaDeviceTreeSelectUtil.buildDeviceTreeByAreaMeter(areaVOS);
+        for (AreaDeviceTreeSelect area : results) {
+            area.cleanEmptyPatrolPoints();
+        }
+        return results;
+    }
+
+
+
     private void getAreaDeviceTreeDeviceCode(Long deviceId, HashMap<Long, BaseDataArea> areaMap, HashMap<Long, BasedataDevice> deviceHashMap, StringBuilder idBuilder, StringBuilder pIdBuilder) {
         if (deviceHashMap.containsKey(deviceId)) {
             BasedataDevice device = deviceHashMap.get(deviceId);

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/util/AreaDeviceTreeSelectUtil.java

@@ -2,11 +2,13 @@ package com.inspect.metadata.prodevmnt.util;
 
 import com.inspect.metadata.prodevmnt.domain.vo.AreaDeviceTreeSelect;
 import com.inspect.base.core.utils.StringUtils;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+@Slf4j
 public class AreaDeviceTreeSelectUtil {
     public static List<AreaDeviceTreeSelect> buildDeviceTree(List<AreaDeviceTreeSelect> areas) {
         List<AreaDeviceTreeSelect> returnList = new ArrayList<>();
@@ -34,6 +36,63 @@ public class AreaDeviceTreeSelectUtil {
         return returnList;
     }
 
+    public static List<AreaDeviceTreeSelect> buildDeviceTreeByAreaMeter(List<AreaDeviceTreeSelect> areaVOS) {
+        List<AreaDeviceTreeSelect> returnList = new ArrayList<>();
+        List<String> tempList = new ArrayList<>();
+        Iterator<AreaDeviceTreeSelect> iterator = areaVOS.iterator();
+        AreaDeviceTreeSelect area;
+        while (iterator.hasNext()) {
+            area = iterator.next();
+            tempList.add(area.getDataId());
+        }
+
+        iterator = areaVOS.iterator();
+        while (iterator.hasNext()) {
+            area = iterator.next();
+            if (!tempList.contains(area.getParentId())) {
+                recursionFn(areaVOS, area);
+                returnList.add(area);
+            }
+        }
+
+        if (returnList.isEmpty()) {
+            returnList = areaVOS;
+        }
+
+        return returnList;
+    }
+
+    public static List<AreaDeviceTreeSelect> buildDeviceTreeFilterByAreaName(List<AreaDeviceTreeSelect> areas, List<String> filterNameList) {
+        List<AreaDeviceTreeSelect> returnList = new ArrayList<>();
+        List<String> tempList = new ArrayList<>();
+        Iterator<AreaDeviceTreeSelect> iterator = areas.iterator();
+        AreaDeviceTreeSelect area;
+        while (iterator.hasNext()) {
+            area = iterator.next();
+            tempList.add(area.getDataId());
+        }
+
+        iterator = areas.iterator();
+        while (iterator.hasNext()) {
+            area = iterator.next();
+            if (!tempList.contains(area.getParentId()) && !shouldFilter(area, filterNameList)) {
+                recursionFn(areas, area, filterNameList);
+                returnList.add(area);
+            }
+        }
+
+        if (returnList.isEmpty()) {
+            returnList = areas;
+        }
+
+        return returnList;
+    }
+
+    // Helper method to determine if an area should be filtered out
+    private static boolean shouldFilter(AreaDeviceTreeSelect area, List<String> filterNames) {
+        return filterNames.stream().anyMatch(filterName -> StringUtils.isNotEmpty(area.getAreaName()) && area.getAreaName().contains(filterName));
+    }
+
     private static void recursionFn(List<AreaDeviceTreeSelect> list, AreaDeviceTreeSelect t) {
         List<AreaDeviceTreeSelect> childList = getChildList(list, t);
         t.setChildren(childList);
@@ -46,6 +105,17 @@ public class AreaDeviceTreeSelectUtil {
 
     }
 
+    private static void recursionFn(List<AreaDeviceTreeSelect> list, AreaDeviceTreeSelect t, List<String> filterNames) {
+        List<AreaDeviceTreeSelect> childList = getChildList(list, t, filterNames);
+        t.setChildren(childList);
+
+        for (AreaDeviceTreeSelect tChild : childList) {
+            if (hasChild(list, tChild)) {
+                recursionFn(list, tChild, filterNames);
+            }
+        }
+    }
+
     private static List<AreaDeviceTreeSelect> getChildList(List<AreaDeviceTreeSelect> list, AreaDeviceTreeSelect t) {
         List<AreaDeviceTreeSelect> tlist = new ArrayList<>();
 
@@ -58,6 +128,18 @@ public class AreaDeviceTreeSelectUtil {
         return tlist;
     }
 
+    private static List<AreaDeviceTreeSelect> getChildList(List<AreaDeviceTreeSelect> list, AreaDeviceTreeSelect t, List<String> filterNames) {
+        List<AreaDeviceTreeSelect> tlist = new ArrayList<>();
+
+        for (AreaDeviceTreeSelect n : list) {
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().equals(t.getDataId()) && !shouldFilter(n, filterNames)) {
+                tlist.add(n);
+            }
+        }
+
+        return tlist;
+    }
+
     private static boolean hasChild(List<AreaDeviceTreeSelect> list, AreaDeviceTreeSelect t) {
         return !getChildList(list, t).isEmpty();
     }

inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml

@@ -40,6 +40,8 @@
         <result property="oldParentId" column="old_parent_id"/>
         <result property="oldAreaId" column="old_area_id"/>
         <result property="oldAreaName" column="old_area_name"/>
+        <result property="patrolPointId" column="patrol_point_id"/>
+        <result property="patrolPointName" column="patrol_point_name"/>
     </resultMap>
 
     <sql id="selectBasedataDeviceVo">
@@ -134,6 +136,62 @@
         </where>
     </select>
 
+    <select id="selectBasedataDeviceListFilterByMeter" parameterType="BasedataDevice" resultMap="BasedataDeviceResult">
+        select a.*,b.patrol_point_id as patrol_point_id,b.patrol_point_name as patrol_point_name
+        from basedata_device a
+        inner join basedata_patrolpoint b on a.device_id=b.main_device_id and b.alg_subtype_ids like concat('%', '52', '%')
+        <where>
+            <if test="deviceId != null  and deviceId != ''">and a.device_id = #{deviceId}</if>
+            <if test="deviceCode != null  and deviceCode != ''">and a.device_code = #{deviceCode}</if>
+            <if test="deviceName != null  and deviceName != ''">and a.device_name like concat('%', #{deviceName}, '%')
+            </if>
+            <if test="manufacturer != null  and manufacturer != ''">and a.manufacturer = #{manufacturer}</if>
+            <if test="parentId != null ">and a.parent_id = #{parentId}</if>
+            <if test="ancestors != null  and ancestors != ''">and a.ancestors = #{ancestors}</if>
+            <if test="areaId != null  and areaId != ''">and a.area_id = #{areaId}</if>
+            <if test="areaName != null  and areaName != ''">and a.area_name like concat('%', #{areaName}, '%')</if>
+            <if test="deviceTypeId != null  and deviceTypeId != ''">and a.device_type_id = #{deviceTypeId}</if>
+            <if test="deviceTypeName != null  and deviceTypeName != ''">and a.device_type_name like concat('%',
+                #{deviceTypeName}, '%')
+            </if>
+            <if test="powerMainEquFlag != null  and powerMainEquFlag != ''">and a.power_main_equ_flag =
+                #{powerMainEquFlag}
+            </if>
+            <if test="deviceModel != null  and deviceModel != ''">and a.device_model = #{deviceModel}</if>
+            <if test="phyAssetId != null  and phyAssetId != ''">and a.phy_asset_id = #{phyAssetId}</if>
+            <if test="stationNo != null  and stationNo != ''">and a.station_no = #{stationNo}</if>
+            <if test="monitorIndexNo != null  and monitorIndexNo != ''">and a.monitor_index_no = #{monitorIndexNo}</if>
+            <if test="phaseNum != null  and phaseNum != ''">and a.phase_num = #{phaseNum}</if>
+            <if test="phase != null  and phase != ''">and a.phase = #{phase}</if>
+            <if test="status != null  and status != ''">and a.status = #{status}</if>
+            <if test="positionX != null  and positionX != ''">and a.position_x = #{positionX}</if>
+            <if test="positionY != null  and positionY != ''">and a.position_y = #{positionY}</if>
+            <if test="positionZ != null  and positionZ != ''">and a.position_z = #{positionZ}</if>
+            <if test="deviceLength != null  and deviceLength != ''">and a.device_length = #{deviceLength}</if>
+            <if test="deviceWidth != null  and deviceWidth != ''">and a.device_width = #{deviceWidth}</if>
+            <if test="deviceHeight != null  and deviceHeight != ''">and a.device_height = #{deviceHeight}</if>
+            <if test="installPosition != null  and installPosition != ''">and a.install_position = #{installPosition}</if>
+            <if test="orderNum != null  and orderNum != ''">and a.order_num = #{orderNum}</if>
+            <if test="oldDeviceId != null  and oldDeviceId != ''">and a.old_device_id = #{oldDeviceId}</if>
+            <if test="deviceIdAll != null  and deviceIdAll != ''">
+                and a.device_id in
+                <foreach item="algId" collection="deviceIdListAll" open="(" separator="," close=")">
+                    #{algId}
+                </foreach>
+
+            </if>
+            <!-- 区域数组查询 -->
+            <if test="params != null">
+                <if test="params.areaIdList != null">
+                    and a.area_id in
+                    <foreach item="item" collection="params.areaIdList" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
+        </where>
+    </select>
+
     <resultMap type="TreeModule" id="TreeModuleResult">
         <result property="id" column="id"/>
         <result property="label" column="label"/>