feat(property): 添加设备信息、房屋详情和维护记录的查询接口- 在 ADeviceInfoController 中添加了根据房屋 ID 查询设备信息的接口

- 在 ADeviceInfoService 和 ADeviceInfoServiceImpl 中实现了根据房屋 ID 查询设备信息的方法
- 修改了 AHouseInfoDetailService 接口，将返回类型从 List 改为单个对象
- 更新了 AHouseInfoDetailServiceImpl 中的实现方法，使用 getOne 替代 list
- 在 AMaintenanceRecordsController 中添加了根据设备 ID 查询维护记录的接口
- 在 AMaintenanceRecordsService 和 AMaintenanceRecordsServiceImpl 中实现了根据设备 ID 查询维护记录的方法

src/main/java/com/zksy/controller/property/ADeviceInfoController.java

@@ -1,9 +1,6 @@
 package com.zksy.controller.property;
 
-import cn.hutool.core.date.DateTime;
-import com.zksy.property.domain.AContractInfo;
 import com.zksy.property.domain.ADeviceInfo;
-import com.zksy.property.service.AContractInfoService;
 import com.zksy.property.service.ADeviceInfoService;
 import com.zksy.utils.AjaxResult;
 import io.swagger.annotations.Api;
@@ -60,4 +57,10 @@ public class ADeviceInfoController {
         return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
 
+    @GetMapping("/getBySimplifiedHouseId")
+    @ApiOperation(value = "根据房屋id查询设备信息")
+    public AjaxResult getBySimplifiedHouseId(String simplifiedHouseId){
+        return AjaxResult.success(service.getBySimplifiedHouseId(simplifiedHouseId));
+    }
+
 }

src/main/java/com/zksy/controller/property/AMaintenanceRecordsController.java

@@ -1,8 +1,6 @@
 package com.zksy.controller.property;
 
-import com.zksy.property.domain.AHouseInfoDetail;
 import com.zksy.property.domain.AMaintenanceRecords;
-import com.zksy.property.service.AHouseInfoDetailService;
 import com.zksy.property.service.AMaintenanceRecordsService;
 import com.zksy.utils.AjaxResult;
 import io.swagger.annotations.Api;
@@ -59,4 +57,10 @@ public class AMaintenanceRecordsController {
         return service.removeBatchByIds(Arrays.asList(ids)) ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
     }
 
+    @GetMapping("/getByDeviceId")
+    @ApiOperation(value = "根据设备Id查询维护记录")
+    public AjaxResult getByDeviceId(String deviceId){
+        return AjaxResult.success(service.getByDeviceId(deviceId));
+    }
+
 }

src/main/java/com/zksy/property/service/ADeviceInfoService.java

@@ -1,8 +1,8 @@
 package com.zksy.property.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zksy.property.domain.ADeviceInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.property.domain.ADeviceInfo;
 
 import java.util.List;
 
@@ -15,4 +15,5 @@ public interface ADeviceInfoService extends IService<ADeviceInfo> {
     Page<ADeviceInfo> findByPage(long pageNum, long pageSize, String deviceName,String deviceType,String deviceNumber);
     List<ADeviceInfo> getADeviceInfoList(String deviceName,String deviceType,String deviceNumber);
 
+    List<ADeviceInfo> getBySimplifiedHouseId(String simplifiedHouseId);
 }

src/main/java/com/zksy/property/service/AHouseInfoDetailService.java

@@ -15,5 +15,5 @@ public interface AHouseInfoDetailService extends IService<AHouseInfoDetail> {
     Page<AHouseInfoDetail> findByPage(long pageNum, long pageSize, String area, String introduce, String houseType);
     List<AHouseInfoDetail> getAHouseInfoDetailList(String area, String introduce, String houseType);
 
-    List<AHouseInfoDetail> getBySimplifiedHouseId(String simplifiedHouseId);
+    AHouseInfoDetail getBySimplifiedHouseId(String simplifiedHouseId);
 }

src/main/java/com/zksy/property/service/AMaintenanceRecordsService.java

@@ -1,8 +1,8 @@
 package com.zksy.property.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zksy.property.domain.AMaintenanceRecords;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.property.domain.AMaintenanceRecords;
 
 import java.util.List;
 
@@ -15,4 +15,5 @@ public interface AMaintenanceRecordsService extends IService<AMaintenanceRecords
     Page<AMaintenanceRecords> findByPage(long pageNum, long pageSize, String maintenanceDate,String maintenanceContent,String maintenanceType);
     List<AMaintenanceRecords> getAMaintenanceRecordsList(String maintenanceDate,String maintenanceContent,String maintenanceType);
 
+    List<AMaintenanceRecords> getByDeviceId(String deviceId);
 }

src/main/java/com/zksy/property/service/impl/ADeviceInfoServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.property.domain.ADeviceInfo;
-import com.zksy.property.service.ADeviceInfoService;
 import com.zksy.property.mapper.ADeviceInfoMapper;
+import com.zksy.property.service.ADeviceInfoService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,7 +22,7 @@ public class ADeviceInfoServiceImpl extends ServiceImpl<ADeviceInfoMapper, ADevi
     @Override
     public Page<ADeviceInfo> findByPage(long pageNum, long pageSize, String deviceName, String deviceType, String deviceNumber) {
         Page<ADeviceInfo> page = new Page<>(pageNum,pageSize);
-        LambdaQueryWrapper<ADeviceInfo> queryWrapper = new LambdaQueryWrapper();
+        LambdaQueryWrapper<ADeviceInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(deviceName != null,ADeviceInfo::getDeviceName,deviceName);
         queryWrapper.like(deviceType != null,ADeviceInfo::getDeviceType,deviceType);
         queryWrapper.like(deviceNumber != null,ADeviceInfo::getDeviceNumber,deviceNumber);
@@ -32,13 +32,20 @@ public class ADeviceInfoServiceImpl extends ServiceImpl<ADeviceInfoMapper, ADevi
 
     @Override
     public List<ADeviceInfo> getADeviceInfoList(String deviceName, String deviceType, String deviceNumber) {
-        LambdaQueryWrapper<ADeviceInfo> queryWrapper = new LambdaQueryWrapper();
+        LambdaQueryWrapper<ADeviceInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(deviceName != null,ADeviceInfo::getDeviceName,deviceName);
         queryWrapper.like(deviceType != null,ADeviceInfo::getDeviceType,deviceType);
         queryWrapper.like(deviceNumber != null,ADeviceInfo::getDeviceNumber,deviceNumber);
         List<ADeviceInfo> list = this.list(queryWrapper);
         return list;
     }
+
+    @Override
+    public List<ADeviceInfo> getBySimplifiedHouseId(String simplifiedHouseId) {
+        LambdaQueryWrapper<ADeviceInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ADeviceInfo::getSimplifiedHouseId,simplifiedHouseId);
+        return this.list(queryWrapper);
+    }
 }
 
 

src/main/java/com/zksy/property/service/impl/AHouseInfoDetailServiceImpl.java

@@ -19,10 +19,10 @@ import java.util.List;
 public class AHouseInfoDetailServiceImpl extends ServiceImpl<AHouseInfoDetailMapper, AHouseInfoDetail>
     implements AHouseInfoDetailService{
     @Override
-    public List<AHouseInfoDetail> getBySimplifiedHouseId(String simplifiedHouseId) {
+    public AHouseInfoDetail getBySimplifiedHouseId(String simplifiedHouseId) {
         LambdaQueryWrapper<AHouseInfoDetail> aHouseInfoDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
         aHouseInfoDetailLambdaQueryWrapper.eq(AHouseInfoDetail::getSimplifiedHouseId,simplifiedHouseId);
-        return this.list(aHouseInfoDetailLambdaQueryWrapper);
+        return this.getOne(aHouseInfoDetailLambdaQueryWrapper);
     }
 
     @Override

src/main/java/com/zksy/property/service/impl/AMaintenanceRecordsServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zksy.property.domain.AMaintenanceRecords;
-import com.zksy.property.service.AMaintenanceRecordsService;
 import com.zksy.property.mapper.AMaintenanceRecordsMapper;
+import com.zksy.property.service.AMaintenanceRecordsService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,22 +22,27 @@ public class AMaintenanceRecordsServiceImpl extends ServiceImpl<AMaintenanceReco
     @Override
     public Page<AMaintenanceRecords> findByPage(long pageNum, long pageSize, String maintenanceDate, String maintenanceContent, String maintenanceType) {
         Page<AMaintenanceRecords> page = new Page<>(pageNum,pageSize);
-        LambdaQueryWrapper<AMaintenanceRecords> queryWrapper = new LambdaQueryWrapper();
+        LambdaQueryWrapper<AMaintenanceRecords> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(maintenanceDate != null,AMaintenanceRecords::getMaintenanceDate,maintenanceDate);
         queryWrapper.like(maintenanceContent != null,AMaintenanceRecords::getMaintenanceContent,maintenanceContent);
         queryWrapper.like(maintenanceType != null,AMaintenanceRecords::getMaintenanceType,maintenanceType);
-        Page<AMaintenanceRecords> page1 = this.page(page, queryWrapper);
-        return page1;
+        return this.page(page, queryWrapper);
     }
 
     @Override
     public List<AMaintenanceRecords> getAMaintenanceRecordsList(String maintenanceDate, String maintenanceContent, String maintenanceType) {
-        LambdaQueryWrapper<AMaintenanceRecords> queryWrapper = new LambdaQueryWrapper();
+        LambdaQueryWrapper<AMaintenanceRecords> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(maintenanceDate != null,AMaintenanceRecords::getMaintenanceDate,maintenanceDate);
         queryWrapper.like(maintenanceContent != null,AMaintenanceRecords::getMaintenanceContent,maintenanceContent);
         queryWrapper.like(maintenanceType != null,AMaintenanceRecords::getMaintenanceType,maintenanceType);
-        List<AMaintenanceRecords> list = this.list(queryWrapper);
-        return list;
+        return this.list(queryWrapper);
+    }
+
+    @Override
+    public List<AMaintenanceRecords> getByDeviceId(String deviceId) {
+        LambdaQueryWrapper<AMaintenanceRecords> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AMaintenanceRecords::getDeviceId,deviceId);
+        return this.list(queryWrapper);
     }
 }