Merge remote-tracking branch 'origin/dev' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/MQSenderController.java

@@ -18,6 +18,11 @@ public class MQSenderController {
         return mqServiceBiZ.sendMessage(exchange, routKey, json);
     }
 
+    @PostMapping(value = "/app/unauth/sendMessage")
+    public ObjectRestResponse sendPostMessage(@RequestParam("json") String json) {
+        return mqServiceBiZ.sendMessage("","", json);
+    }
+
     @PostMapping(value = "/sendMessage")
     @ResponseBody
     public ObjectRestResponse sendMessage(@RequestBody SendMsgDTO dto) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -844,21 +844,21 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         Integer andRsOperationFactor = getBitOpratorFactor4UnBooked(unbookDates);//预定的相关或运算因子，当前月份没有预定记录时同时也是结果
         params.put("andRsOperationFactor",
                 andRsOperationFactor);
-        if(hourInfo.size() == 1) { //取消当天的小时，不取消当天的预定
-            return unbookHourInfo(vehicleId, hourInfo);
-        } else {
-            Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
-                return unbookHourInfo(vehicleId, hourInfo);
-        }
+            return unbookHourInfo(vehicleId, hourInfo, params);
     }
 
-    public boolean unbookHourInfo(String vehicleId, Map<String, Integer> hourInfo) {
+    public boolean unbookHourInfo(String vehicleId, Map<String, Integer> hourInfo,  Map<String,Object> params) {
         for (Map.Entry<String, Integer> entry : hourInfo.entrySet()) {
             VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
             vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
+               if((vehicleBookHourInfos.get(0).getBookedHour() & 0) == 0) {
+
+                   Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
+
+               }
                 vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
                 int effect = vehicleBookHourInfoBiz.updateByIdRe(vehicleBookHourInfos.get(0));
                 if (effect < 1) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java

@@ -149,7 +149,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
     public static void main(String[] args) throws Exception{
         int b = 16744448;
-        Integer a = b | 31;
+        Integer a = b & 0;
         System.out.println(a);
     }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -48,9 +48,8 @@
             have_violation =#{haveViolation},
         </if>
         <if test="rejectRemark != null">
-            reject_remark = #{rejectRemark}
+            reject_remark = #{rejectRemark},
         </if>
-
         `status` = #{status}
         where id = #{id} and `status` = #{statusCondition}
     </update>