Merge branch 'dev-线上' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai

# Conflicts:
#	src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java
#	src/main/java/com/template/controller/HouseOrderController.java
#	src/main/java/com/template/model/mqtt/PushCallback.java

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

@@ -87,6 +87,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         String endDto=applicationProcedureDto.getEndTime();
         //周日-周1为上周
         int dtoCount=this.checkWeek(startDto,endDto);
+        if(startDto.compareTo(endDto)>=0){
+            return CommonResult.fail("开始时间不能大于结束时间");
+        }
         if(dtoCount==-1||dtoCount>countConfig){
             return CommonResult.fail("申请日期不能跨周，一周不能超过"+countConfig+"天，请重新申请");
         }
@@ -568,9 +571,11 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
     public static int checkWeek(String strDate1,String strDate2) {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(TimeExchange.StringToDate(strDate1,"yyyy-MM-dd"));
-        int year = calendar.get(Calendar.YEAR);
         int week = calendar.get(Calendar.WEEK_OF_YEAR);
-        week=week==1?53:week;
+        int month = calendar.get(Calendar.MONTH);
+        if(week==1&&month==11){
+            week=53;
+        }
         int day = calendar.get(Calendar.DAY_OF_WEEK)-1;
         if (day==0){
             day=7;
@@ -578,18 +583,20 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
         Calendar calendar1 = Calendar.getInstance();
         calendar1.setTime(TimeExchange.StringToDate(strDate2,"yyyy-MM-dd"));
-        int year1 = calendar1.get(Calendar.YEAR);
         int week1 = calendar1.get(Calendar.WEEK_OF_YEAR);
-        week1=week1==1?53:week1;
+        int month1 = calendar1.get(Calendar.MONTH);
+        if(week1==1&&month1==11){
+            week1=53;
+        }
         int day1 = calendar1.get(Calendar.DAY_OF_WEEK)-1;
         if (day1==0){
             day1=7;
             week1=week1-1;
         }
-        if(year==year1&&week==week1){
+        if(week==week1||week-week1==52){
             return day1-day;
-        }else if (year==year1&&week+1==week1&&day1==1){
-            return 1;
+        }else if (week+1==week1&&day1==1){
+            return day1+7-day;
         }else{
             return -1;
         }

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

@@ -92,7 +92,7 @@ public class PushCallback implements MqttCallback {
 //        log.info("============》》接收消息Qos : " + message.getQos());
 //        log.info("============》》接收消息内容 : " + Payload);
 //        log.info("============》》接收ID : " + message.getId());
-        log.info("接收数据结束 下面可以执行数据处理操作");
+//        log.info("接收数据结束 下面可以执行数据处理操作");
 
         try {