修改房态单日接口

src/main/java/com/template/api/HouseNumberStateAPI.java

@@ -13,7 +13,7 @@ public interface HouseNumberStateAPI {
 
     @GetMapping("/dayList")
     @ApiOperation(value = "房态管理-单日", notes = "房态管理-单日", httpMethod = "GET")
-    CommonResult page(String keyWord, String houseType);
+    CommonResult page(String keyWord, String houseType,Integer houseId,Integer buildingId,Integer status);
 
 
     @GetMapping("/calendarList")

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -96,7 +96,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     ApartmentSettingService apartmentSettingService;
 
     @Override
-    public CommonResult page(String keyWord, String houseType) {
+    public CommonResult page(String keyWord, String houseType,Integer houseId,Integer buildingId,Integer status) {
 
 //        if (ObjectUtils.isEmpty(page) && page <= 0) {
 //            page = 1;
@@ -112,7 +112,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         List<House> list = houseService.list(new LambdaQueryWrapper<>());
         LocalDateTime start = LocalDateTime.now();
         LocalDateTime end = start.withHour(23).withMinute(59).withSecond(59);
-        List<HouseStateVo> pageVo1 = houseNumberService.houseStatePage(keyWord, houseType, start, end);
+        List<HouseStateVo> pageVo1 = houseNumberService.houseStatePage(keyWord, houseType, start, end,houseId,buildingId,status);
         HashMap<Integer, HouseStateVo> map = new HashMap<>();
         for (HouseStateVo houseStateVo : pageVo1) {
             Integer houseNumberId = houseStateVo.getHouseNumberId();
@@ -415,6 +415,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     vo.setLeaveTime(houseOrder.getReserveLeaveTime());
 //                  付款
                     vo.setPayPrice(houseOrder.getPayPrice());
+//                  密码
+                    vo.setPassWord(houseOrder.getKeyPassWord());
+
 //                    已入住时间
                     LocalDateTime now = LocalDateTime.now();
                     LocalDateTime stateEnd = LocalDateTime.ofInstant(liveTime.toInstant(), ZoneId.systemDefault());
@@ -477,11 +480,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         LambdaQueryWrapper<HouseLock> wrapperHL = new LambdaQueryWrapper<>();
         wrapperHL.eq(HouseLock::getHouseNumberId, houseNumberId);
         HouseLock houseLock = houseLockService.getOne(wrapperHL);
-        String battery = "";
+//        String battery = "";
         if (ObjectUtils.isNotEmpty(houseLock)) {
             String equipmentType = houseLock.getEquipmentType();
 
-            battery = passwordIssController.getDeviceInfo(equipmentType);
+            String battery = passwordIssController.getDeviceInfo(equipmentType);
+            vo.setElectricQuantity(battery + "%");
         }
 
 //        HashMap<String, String> map = new HashMap<>();
@@ -501,7 +505,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        JSONObject data = jsonObject.getJSONObject("data");
 //          电量
 //        String battery = data.getString("battery");
-        vo.setElectricQuantity(battery + "%");
+
 
 
         return CommonResult.ok(vo);

src/main/java/com/template/mapper/HouseNumberMapper.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Mapper
 public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
 
-    List<HouseStateVo> houseStatePage(@Param("keyWord") String keyWord, @Param("houseType") String houseType, @Param("start") LocalDateTime start, @Param("end") LocalDateTime end);
+    List<HouseStateVo> houseStatePage(@Param("keyWord") String keyWord, @Param("houseType") String houseType, @Param("start") LocalDateTime start, @Param("end") LocalDateTime end,@Param("houseId") Integer houseId,@Param("buildingId") Integer buildingId,@Param("status") Integer status);
 
     IPage<CalendarPageVo> houseStateCalendarPage(Page<CalendarPageVo> pageVo, @Param("keyWord") String keyWord, @Param("houseType") String houseType);
 

src/main/java/com/template/model/vo/ParticularHouseNumberStatusVo.java

@@ -1,5 +1,6 @@
 package com.template.model.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -45,4 +46,12 @@ public class ParticularHouseNumberStatusVo {
 
 //    房间状态 状态 1空闲、2脏房、3预定、4入住、5锁定、6维修
     private int houseStatus;
+
+    private String passWord;
+
+    @ApiModelProperty(value = "楼栋")
+    private String building;
+
+    @ApiModelProperty(value = "单元")
+    private String element;
 }

src/main/java/com/template/services/HouseNumberService.java

@@ -19,7 +19,7 @@ import java.util.List;
  */
 public interface HouseNumberService extends IService<HouseNumber> {
 
-    List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start,LocalDateTime end);
+    List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start,LocalDateTime end,Integer houseId,Integer buildingId,Integer status);
 
     PageUtils<CalendarPageVo> houseStateCalendarPage(String keyWord, String houseType, int page, int size);
 

src/main/java/com/template/services/impl/HouseNumberServiceImpl.java

@@ -31,9 +31,9 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
     HouseNumberMapper houseNumberMapper;
 
     @Override
-    public List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start, LocalDateTime end) {
+    public List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start, LocalDateTime end,Integer houseId,Integer buildingId,Integer status) {
 
-        List<HouseStateVo> result=houseNumberMapper.houseStatePage(keyWord,houseType,start,end);
+        List<HouseStateVo> result=houseNumberMapper.houseStatePage(keyWord,houseType,start,end,houseId,buildingId,status);
         return result;
     }
 

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -17,7 +17,9 @@
         h.receiving_time as receivingTime,
         hns.id as houseNumberStateId,
         ho.order_number as orderNumber,
-        h.room_type as roomType
+        h.room_type as roomType,
+        b.building,
+        b.element
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id
@@ -29,6 +31,9 @@
 
         LEFT JOIN house_order ho ON hns.order_number = ho.order_number
         AND ho.deleted = 0
+        LEFT JOIN building b ON b.id = hn.building_id
+        AND b.deleted = 0
+
         <where>
             hn.deleted = 0
             <if test="houseType != null and houseType != ''">
@@ -39,6 +44,18 @@
                 AND ( hn.room_number LIKE '%' #{keyWord} '%' OR ho.reserve_name LIKE '%' #{keyWord} '%' )
             </if>
 
+            <if test="houseId != null and houseId != ''">
+                AND hn.house_id = #{houseId}
+            </if>
+
+            <if test="buildingId != null and buildingId != ''">
+                AND hn.building_id = #{buildingId}
+            </if>
+
+            <if test="status != null and status != ''">
+                AND hns.status = #{status}
+            </if>
+
         </where>
         ORDER BY
         hn.room_number