更新

src/main/java/com/template/component/WeiXiaoComponent.java

@@ -1,6 +1,7 @@
 package com.template.component;
 
 
+import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.template.common.exception.MyCustomException;
@@ -68,18 +69,21 @@ public class WeiXiaoComponent {
 
         try {
             ObjectMapper mapper = new ObjectMapper();
-            params.put("cards", mapper.writeValueAsString(cards));
+            params.put("cards", JSON.toJSONString(cards));
             params.put("title", title);
             params.put("content", content);
             params.put("sender", "智慧公寓");
             params.put("digest", digest);
-            if (customs != null && customs.size() == 2) {
-                params.put("customs", mapper.writeValueAsString(customs));
-
-             }
+//            if (customs != null && customs.size() == 2) {
+//                params.put("customs", mapper.writeValueAsString(customs));
+//
+//             }
 
             RestTemplate client = new RestTemplate();
-            ResponseEntity<String> tokenResponse = client.postForEntity(uri, params, String.class);
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            HttpEntity<Map<String, String>> request = new HttpEntity<>(params, headers);
+            ResponseEntity<String> tokenResponse = client.postForEntity(uri, request, String.class);
             String body = tokenResponse.getBody();
             log.info("微校发送通知返回结果【{}】", body);
         } catch (Exception e) {

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

@@ -349,6 +349,9 @@ public class HouseLockController implements HouseLockControllerAPI {
 //            设备型号
             houseLock.setEquipmentType(bingingDto.getLuid());
             JSONObject jsonObject = passwordIssController.particular(bingingDto.getLuid());
+            if (ObjectUtils.isEmpty(jsonObject) || jsonObject.getString("state") == null) {
+                return CommonResult.fail("门锁不存在");
+            }
 //            电量
             String battery = jsonObject.getString("battery");
             houseLock.setElectricQuantity(battery);
@@ -408,7 +411,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     @Override
     public void lockExport(HttpServletResponse response) {
         // 表头数据
-        List<Object> head = Arrays.asList("房型类型","房型名称","房间号","门锁设备型号");
+        List<Object> head = Arrays.asList("楼栋","单元","房型类型","房型名称","房间号","门锁设备型号");
         // 用户1数据
         List<Object> user1 = new ArrayList<>();
         user1.add("17栋");

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

@@ -72,6 +72,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 
     @Autowired
     HouseNumberStateService houseNumberStateService;
+
     @Override
     public CommonResult pullDownList(String permissionSettingId, int page, int size, String keyWord) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -171,7 +172,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    public CommonResult list(String permissionSettingId, int page, int size, String keyWord, String startTime, String endTime,String houseId,Integer buildingId) {
+    public CommonResult list(String permissionSettingId, int page, int size, String keyWord, String startTime, String endTime, String houseId, Integer buildingId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -190,7 +191,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         }
         System.out.println("houseId = " + houseId);
 
-        PageUtils<HouseNumberPageVo> pageList = houseNumberService.pageList(page, size, keyWord, startTime, endTime,houseId,buildingId);
+        PageUtils<HouseNumberPageVo> pageList = houseNumberService.pageList(page, size, keyWord, startTime, endTime, houseId, buildingId);
 
 
         return CommonResult.ok(pageList);
@@ -303,7 +304,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    public void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime,String houseId,Integer buildingId) {
+    public void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime, String houseId, Integer buildingId) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
 //        if (ObjectUtils.isEmpty(permissionSetting)) {
 //            return CommonResult.fail("非法进入");
@@ -314,7 +315,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 //            return CommonResult.fail("此账号暂无该权限");
 //        }
 
-        List<HouseNumberPageVo> vos = houseNumberService.listExport(keyWord, startTime, endTime,houseId,buildingId);
+        List<HouseNumberPageVo> vos = houseNumberService.listExport(keyWord, startTime, endTime, houseId, buildingId);
 
 
 //        导出
@@ -511,14 +512,12 @@ public class HouseNumberController implements HouseNumberControllerAPI {
                 houseLock.setEquipmentType(doorLock);
                 //            绑定时间
                 houseLock.setBindingTime(new Date());
-                JSONObject particular = null;
-                try {
-                    particular = passwordIssController.particular(doorLock);
-                } catch (Exception e) {
-                    return CommonResult.fail("门锁异常");
-                }
 
-//        设备连接状态
+                JSONObject particular = passwordIssController.particular(doorLock);
+                if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
+                    return CommonResult.fail("门锁不存在");
+                }
+                //        设备连接状态
                 String state = particular.getString("state");
 //        电量
                 String battery = particular.getString("battery");
@@ -528,6 +527,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
                 houseLock.setNetworkState(state);
 //            设备状态
                 houseLock.setEquipmentState(state);
+
 //            房 间号
                 houseLock.setNetworkType("WiFi");
                 houseLock.setWifiMac("WIFIMAC");
@@ -596,12 +596,12 @@ public class HouseNumberController implements HouseNumberControllerAPI {
                 if (ObjectUtils.isNotEmpty(houseLock)) {
                     String equipmentType = houseLock.getEquipmentType();
                     if (!equipmentType.equals(doorLock)) {
-                        JSONObject particular = null;
-                        try {
-                            particular = passwordIssController.particular(doorLock);
-                        } catch (Exception e) {
-                            return CommonResult.fail("门锁异常");
+                        JSONObject   particular = passwordIssController.particular(doorLock);
+
+                        if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
+                            return CommonResult.fail("门锁不存在");
                         }
+
                         //        设备连接状态
                         String state = particular.getString("state");
 //        电量
@@ -624,11 +624,10 @@ public class HouseNumberController implements HouseNumberControllerAPI {
                     hl.setEquipmentType(dto.getDoorLock());
                     //            绑定时间
                     hl.setBindingTime(new Date());
-                    JSONObject particular = null;
-                    try {
-                        particular = passwordIssController.particular(doorLock);
-                    } catch (Exception e) {
-                        return CommonResult.fail("门锁异常");
+                    
+                    JSONObject    particular = passwordIssController.particular(doorLock);
+                    if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
+                        return CommonResult.fail("门锁不存在");
                     }
 
 //        设备连接状态
@@ -824,7 +823,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
                 }
 
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return CommonResult.ok();

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

@@ -414,6 +414,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     vo.setLiveTime(houseOrder.getReserveLiveTime());
 //                    预定离店时间
                     vo.setLeaveTime(houseOrder.getReserveLeaveTime());
+                    vo.setOrderNumber(houseOrder.getOrderNumber());
                 }
             } else if (status1 == 4) {
 //                入住
@@ -442,6 +443,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     vo.setTimeOut(houseOrder.getTimeOut());
 //                    订单id
                     vo.setHouseOrderId(houseOrder.getId());
+//                    订单号
+                    vo.setOrderNumber(houseOrder.getOrderNumber());
 
 //                    已入住时间
                     LocalDateTime now = LocalDateTime.now();

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

@@ -1485,18 +1485,44 @@ public class HouseOrderController implements HouseOrderAPI {
                 Row dataRow1 = sheet.createRow(i + 1);
                 dataRow1.createCell(0).setCellValue(vo.getHouseNumber());
                 Integer roomType = vo.getRoomType();
-                String houseSta="全日房";
-                if (2==roomType) {
-                    houseSta="钟点房";
+                String houseSta="";
+                if (ObjectUtils.isNotEmpty(roomType)) {
+                    if (2==roomType) {
+                        houseSta="钟点房";
+                    }else if(1==roomType){
+                        houseSta="全日房";
+                    }
                 }
+
                 dataRow1.createCell(1).setCellValue(houseSta);
                 dataRow1.createCell(2).setCellValue(vo.getHouseName());
-                dataRow1.createCell(3).setCellValue(vo.getLockStatus());
+                Integer lockStatus = vo.getLockStatus();
+                String lockString="";
+                if (ObjectUtils.isNotEmpty(lockStatus)) {
+                    if (1==lockStatus) {
+                        lockString="密码开锁";
+                    }else if(2==lockStatus){
+                        lockString="房卡开锁";
+                    }else if(3==lockStatus){
+                        lockString="指纹开锁";
+                    }else if(4==lockStatus){
+                        lockString="身份证开锁";
+                    }else if(5==lockStatus){
+                        lockString="钥匙开锁";
+                    }
+
+                }
+                dataRow1.createCell(3).setCellValue(lockString);
                 Integer giveBack1 = vo.getGiveBack();
-                String back="未归还";
-                if (1==giveBack1) {
-                    back="已归还";
+                String back="";
+                if (ObjectUtils.isNotEmpty(giveBack1)) {
+                    if (1==giveBack1) {
+                        back="已归还";
+                    }else {
+                        back="未归还";
+                    }
                 }
+
                 dataRow1.createCell(4).setCellValue(back);
                 dataRow1.createCell(5).setCellValue(vo.getReserveName());
                 dataRow1.createCell(6).setCellValue(vo.getPhone());
@@ -1586,7 +1612,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
         String s = "";
         if ("1".equals(state)) {
-            s = "2,3,4,8，10";
+            s = "2,3,4,8,10";
         } else {
             s = "5";
         }
@@ -1617,7 +1643,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
         String s = "";
         if ("1".equals(state)) {
-            s = "2,3,4,8，10";
+            s = "2,3,4,8,10";
         } else {
             s = "5";
         }
@@ -1680,6 +1706,8 @@ public class HouseOrderController implements HouseOrderAPI {
                     orderName = "已退房";
                 } else if ("9".equals(orderStatus)) {
                     orderName = "已取消";
+                }else if("10".equals(orderStatus)){
+                    orderName = "已支付未入住";
                 }
 
                 dataRow1.createCell(7).setCellValue(orderName);

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

@@ -68,4 +68,6 @@ public class ParticularHouseNumberStatusVo {
 
     private Integer houseOrderId;
 
+    private String orderNumber;
+
 }

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

@@ -52,7 +52,7 @@
             </if>
 
             <if test="keyWord != null and keyWord != ''">
-                AND (ho.reserve_name LIKE '%' #{keyWord} '%' or ho.live_name LIKE '%' #{keyWord} '%' )
+                AND (ho.reserve_name LIKE '%' #{keyWord} '%' or ho.live_name LIKE '%' #{keyWord} '%' or  hn.room_number = #{keyWord} )
             </if>
 
             <if test="payPriceStartTime != null and payPriceStartTime != '' and payPriceEndTime != null and payPriceEndTime != ''  ">
@@ -144,7 +144,7 @@
             </if>
 
             <if test="keyWord != null and keyWord != ''">
-                AND (ho.reserve_name LIKE '%' #{keyWord} '%' or ho.live_name LIKE '%' #{keyWord} '%' )
+                AND (ho.reserve_name LIKE '%' #{keyWord} '%' or ho.live_name LIKE '%' #{keyWord} '%' or  hn.room_number = #{keyWord}  )
             </if>
 
             <if test="payPriceStartTime != null and payPriceStartTime != '' and payPriceEndTime != null and payPriceEndTime != ''  ">