mqtt订阅前增加判断；修复订单查询和导出；本地启动默认配置改为测试环境

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

@@ -222,7 +222,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             List<HouseStateVo> ownerClasses = pageVo.stream().filter(e -> e.getHouseId().equals(house.getId() + "")).collect(Collectors.toList());
             if (ownerClasses != null && ownerClasses.size() > 0) {
                 vo.setVos(ownerClasses);
-                long freeCount=ownerClasses.stream().filter(e -> e.getStatus().equals("1")).count();
+                long freeCount=ownerClasses.stream().filter(e -> (e.getStatus()!=null?e.getStatus():e.getHouseStatus()+"").equals("1")).count();
                 long useCount = ownerClasses.size()-freeCount;
                 vo.setUseCount(useCount);
                 vo.setFreeCount(freeCount);

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

@@ -1762,18 +1762,20 @@ public class HouseOrderController implements HouseOrderAPI {
                 }else if ("1".equals(vo.getSource())){
                     vo.setSource("课表");
                     List<ClassSchedule> schedules=new ArrayList<>(classScheduleService.listByIds(idList));
-                    String data = schedules.stream().peek((ClassSchedule u) -> u.setJsxm("姓名："+u.getJsxm()+ ";工号：" + u.getJsgh() + ";课表日期：" + u.getDateTime() + ";备注：" + u.getRemark()+";")).map(ClassSchedule::getJsxm).collect(Collectors.joining("\\/r\\/n"));
+                    String data = schedules.stream().peek((ClassSchedule u) -> u.setJsxm("姓名："+u.getJsxm()+ ";工号：" + u.getJsgh() + ";课表日期：" + u.getDateTime() + ";备注：" + u.getRemark()+";")).map(ClassSchedule::getJsxm).collect(Collectors.joining("\r\n"));
                     dataRow1.createCell(22).setCellValue("课表");
                     dataRow1.createCell(23).setCellValue(data);
                 } else if ("2".equals(vo.getSource())){
                     vo.setSource("流程");
                     List<ApplicationProcedureTemporaryVo> applicationProcedureTemporaries= new ArrayList<>();
                     for (int j = 0; j <idList.size(); j++) {
-                        applicationProcedureTemporaries.add(applicationProcedureTemporaryService.appletDetail(Integer.valueOf(idList.get(j))));
+                        if (StringUtils.hasText(idList.get(j))){
+                            applicationProcedureTemporaries.add(applicationProcedureTemporaryService.appletDetail(Integer.valueOf(idList.get(j))));
+                        }
                     }
                     String data = applicationProcedureTemporaries.stream().peek((ApplicationProcedureTemporaryVo u) ->
                             u.setUsersName("申请人姓名："+u.getUsersName()+ ";申请人部门" + u.getOrgName() + ";房间数量：" + u.getHouseCount()
-                                    + ";开始时间：" + u.getStartTime()+";结束时间"+u.getEndTime()+";审核状态："+u.getStatus()+"(0：已拒绝，1：待审批，2：处理中，3：已同意);")).map(ApplicationProcedureTemporaryVo::getUsersName).collect(Collectors.joining("\\/r\\/n"));
+                                    + ";开始时间：" + u.getStartTime()+";结束时间"+u.getEndTime()+";审核状态："+u.getStatus()+"(0：已拒绝，1：待审批，2：处理中，3：已同意);")).map(ApplicationProcedureTemporaryVo::getUsersName).collect(Collectors.joining("\r\n"));
                     dataRow1.createCell(22).setCellValue("流程");
                     dataRow1.createCell(23).setCellValue(data);
                 }

src/main/java/com/template/model/mqtt/MqttPushClient.java

@@ -35,7 +35,12 @@ public class MqttPushClient  {
 //        发起连接
         connect(mqttConfiguration);
 //        订阅主题
-        subscribe();
+        if (null != client) {
+            if (client.isConnected()) {
+                subscribe();
+            }
+        }
+
     }
 
 

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: dev
+      active: test
   main:
     allow-circular-references: true
   servlet: