版本更新1

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/DeviceMapper.java

@@ -2,6 +2,8 @@ package com.zcxk.rmcp.core.dao;
 
 
 import com.zcxk.core.common.pojo.UserCondition;
+import com.zcxk.rmcp.api.dto.device.DeviceQueryDto;
+import com.zcxk.rmcp.api.dto.install.InstallDeviceDto;
 import com.zcxk.rmcp.api.dto.measurementSettlement.MeasurementSettlementDto;
 import com.zcxk.rmcp.api.query.CommonQueryCondition;
 import com.zcxk.rmcp.api.vo.*;
@@ -21,11 +23,13 @@ public interface DeviceMapper {
 
     int updateByPrimaryKeySelective(Device record);
 
-    DeviceVo findById(@Param("id") Long id);
+    Device findById(@Param("id") Long id);
 
-    List<DeviceVo> findList(@Param("condition") CommonQueryCondition condition, @Param("userCondition") UserCondition userCondition);
+    DeviceDetailVo findDetail(@Param("id") Long id);
 
-    int delByIds(@Param("ids") List<Integer> ids);
+    List<DeviceVo> findList(@Param("dto") DeviceQueryDto dto, @Param("userCondition") UserCondition userCondition);
+
+    int delByIds(@Param("ids") List<Long> ids);
 
     int findByDeviceNoUnique(@Param("id") Long id, @Param("deviceNo") String deviceNo);
 
@@ -33,33 +37,34 @@ public interface DeviceMapper {
 
 
     /**
+     * @param userCondition
+     * @return java.util.List<com.zcxk.rmcp.api.vo.DeviceStatusVo>
      * @author Andy
      * @description 统计设备状态数
      * @date 15:43 2021/7/21
-     * @param userCondition
-     * @return java.util.List<com.zcxk.rmcp.api.vo.DeviceStatusVo>
      **/
     List<DeviceStatusVo> totalDeviceStatus(@Param("userCondition") UserCondition userCondition);
 
     /**
-    * @author Andy
-    * @description 获取小区设备数据
-    * @date 10:19 2021/7/22
-    * @param categoryId:分类ID， userCondition
-    * @return java.util.List<com.zcxk.rmcp.api.vo.DeviceCommunityVo>
-    **/
+     * @param categoryId:分类ID， userCondition
+     * @return java.util.List<com.zcxk.rmcp.api.vo.DeviceCommunityVo>
+     * @author Andy
+     * @description 获取小区设备数据
+     * @date 10:19 2021/7/22
+     **/
     List<DeviceCategoryCommunityVo> listCommunityDevice(@Param("categoryId") Integer categoryId, @Param("userCondition") UserCondition userCondition);
 
     /**
-    * @author Andy
-    * @description 获取没有绑定小区的设备信息
-    * @date 10:34 2021/7/22
-    * @param categoryId:分类ID， userCondition
-    * @return java.util.List<com.zcxk.rmcp.api.vo.DeviceNoCellVo>
-    **/
+     * @param categoryId:分类ID， userCondition
+     * @return java.util.List<com.zcxk.rmcp.api.vo.DeviceNoCellVo>
+     * @author Andy
+     * @description 获取没有绑定小区的设备信息
+     * @date 10:34 2021/7/22
+     **/
     List<DeviceNoCellVo> listNoCellDevice(@Param("categoryId") Integer categoryId, @Param("userCondition") UserCondition userCondition);
 
 
-
     List<Device> findMeasurementDevice(MeasurementSettlementDto measurementSettlement);
+
+    List<InstallDeviceDto> getUnInstallDeviceList(@Param("tenantId") String tenantId, @Param("companyOrgId") Integer companyOrgId, @Param("deptOrgId") Integer deptOrgId,@Param("productId") Integer productId, @Param("listId") Integer listId);
 }