添加取消维修接口，更新批量置脏，维修，取消预定，批量开房接口

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

@@ -108,4 +108,17 @@ public interface HouseNumberStateAPI {
     @ApiOperation(value = "房态管理-锁房下拉框", notes = "房态管理-入住回显", httpMethod = "GET")
     CommonResult lockDropDownShow();
 
+    @PostMapping("/cancelMaintain")
+    @ApiOperation(value = "房态管理-取消维修", notes = "房态管理-取消维修", httpMethod = "POST")
+    CommonResult cancelMaintain(@RequestBody CancelMaintainDto cancelMaintainDto);
+
+//    @GetMapping("/dirtyDropDownShow")
+//    @ApiOperation(value = "房态管理-脏房下拉框", notes = "房态管理-入住回显", httpMethod = "GET")
+//    CommonResult dirtyDropDownShow();
+//
+//    @GetMapping("/lockDropDownShow")
+//    @ApiOperation(value = "房态管理-锁房下拉框", notes = "房态管理-入住回显", httpMethod = "GET")
+//    CommonResult lockDropDownShow();
+
+
 }

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

@@ -1414,6 +1414,20 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (ObjectUtils.isNotEmpty(houseNumberStates) && houseNumberStates.size() > 0) {
             return CommonResult.fail("该时间断内已有其他状态");
         }
+        HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+
+
+        if (ObjectUtils.isEmpty(houseNumber)) {
+            return CommonResult.fail("无该房间");
+        }
+
+        //                开电
+        electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        //        开电
+        houseNumber.setElectricType("1");
+
+        houseNumberService.updateById(houseNumber);
+
 
 //        添加房态
         HouseNumberState houseNumberState = new HouseNumberState();
@@ -1478,10 +1492,17 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String houseNumberId = dirtyRoomDto.getHouseNumberId();
 
         HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+
+
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("无该房间");
         }
 
+        //                开电
+        electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        //        开电
+        houseNumber.setElectricType("1");
+
         houseNumber.setHouseStatus(2);
 
         houseNumberService.updateById(houseNumber);
@@ -1539,7 +1560,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 if (ObjectUtils.isEmpty(houseNumber)) {
                     return CommonResult.fail("房间异常");
                 }
-
+//                开电
+                electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+                //        开电
+                houseNumber.setElectricType("1");
                 houseNumber.setHouseStatus(2);
 
                 boolean update = houseNumberService.updateById(houseNumber);
@@ -1582,7 +1606,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //         关电
                 electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 
-                houseNumberService.updateById(houseNumber);
                 boolean update = houseNumberService.updateById(houseNumber);
                 if (!update) {
                     return CommonResult.fail();
@@ -1608,7 +1631,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
 
-        List<String> houseNumberIds = lockRoomDtos.getHouseNumberId();
+        List<String> houseNumberIds = lockRoomDtos.getHouseNumberIds();
 
         LocalDateTime start = LocalDateTime.now();
         LocalDateTime end = start.plusYears(100);
@@ -1668,7 +1691,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (ObjectUtils.isEmpty(list) || list.size() <= 0) {
             return CommonResult.fail("无锁定房间");
         }
-        houseNumberStateService.updateBatchById(list);
+        houseNumberStateService.removeByIds(list);
 
 
         return CommonResult.ok();
@@ -1879,6 +1902,49 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CommonResult cancelMaintain(CancelMaintainDto cancelMaintainDto) {
+        int permissionSettingId = cancelMaintainDto.getPermissionSettingId();
+        PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
+        if (ObjectUtils.isEmpty(permissionSetting)) {
+            return CommonResult.fail("非法进入");
+        }
+//      判断该用户是否拥有权限
+        String houseTypeManagement = permissionSetting.getHouseStatusManagement();
+        if (!"0".equals(houseTypeManagement) && !houseTypeManagement.contains("3")) {
+            return CommonResult.fail("此账号暂无该权限");
+        }
+        String houseNumberId = cancelMaintainDto.getHouseNumberId();
+        HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+        if (ObjectUtils.isEmpty(houseNumber)) {
+            return CommonResult.fail("房间不存在");
+        }
+        LocalDateTime date = LocalDateTime.now();
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String format = date.format(dateTimeFormatter1);
+        //        查找房间对应的维修房状态
+        HouseNumberState houseNumberState = houseNumberStateService.getMaintainHouseNumberState(houseNumberId, date);
+
+        if (ObjectUtils.isEmpty(houseNumberState)) {
+            return CommonResult.fail("无维修房间");
+        }
+//        houseNumberState.setEndTime(format);
+//        houseNumberStateService.updateById(houseNumberState);
+        houseNumberStateService.removeById(houseNumberState);
+
+
+        houseNumber.setHouseStatus(1);
+//        关电
+        houseNumber.setElectricType("2");
+//        关电
+        electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+
+        houseNumberService.updateById(houseNumber);
+
+        return CommonResult.ok();
+    }
+
 
 }
 

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

@@ -611,7 +611,7 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumberState.setEndTime(sdf.format(new Date()));
 
             houseOrderService.updateById(houseOrder);
-            houseNumberStateService.updateById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState);
             return CommonResult.ok();
 
         } catch (Exception e) {

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

@@ -1,11 +1,10 @@
 package com.template.mapper;
 
-import com.template.model.pojo.HouseNumberState;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.pojo.HouseNumberState;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -29,4 +28,6 @@ public interface HouseNumberStateMapper extends BaseMapper<HouseNumberState> {
     HouseNumberState getData(@Param("date") Date date,@Param("houseNumberId") String houseNumberId);
 
     HouseNumberState getLockHouseNumberState(@Param("houseNumberId")String houseNumberId,@Param("now") LocalDateTime now);
+
+    HouseNumberState getMaintainHouseNumberState(@Param("houseNumberId")String houseNumberId,@Param("date") LocalDateTime date);
 }

src/main/java/com/template/model/dto/CancelMaintainDto.java

@@ -0,0 +1,14 @@
+package com.template.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class CancelMaintainDto {
+    @NotNull
+    private String houseNumberId;
+
+    @NotNull
+    private Integer permissionSettingId;
+}

src/main/java/com/template/model/dto/LockRoomDtos.java

@@ -8,7 +8,7 @@ import java.util.List;
 public class LockRoomDtos {
 
 
-    private List<String> houseNumberId;
+    private List<String> houseNumberIds;
 
     private int adminId;
 

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

@@ -1,9 +1,8 @@
 package com.template.services;
 
-import com.template.model.pojo.HouseNumberState;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.template.model.pojo.HouseNumberState;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -25,4 +24,6 @@ public interface HouseNumberStateService extends IService<HouseNumberState> {
     HouseNumberState getData(Date date,String houseNumberId);
 
     HouseNumberState getLockHouseNumberState(String houseNumberId, LocalDateTime now);
+
+    HouseNumberState getMaintainHouseNumberState(String houseNumberId, LocalDateTime date);
 }

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

@@ -1,13 +1,12 @@
 package com.template.services.impl;
 
-import com.template.model.pojo.HouseNumberState;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.HouseNumberStateMapper;
+import com.template.model.pojo.HouseNumberState;
 import com.template.services.HouseNumberStateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -47,4 +46,9 @@ public class HouseNumberStateServiceImpl extends ServiceImpl<HouseNumberStateMap
 
         return houseNumberState;
     }
+
+    @Override
+    public HouseNumberState getMaintainHouseNumberState(String houseNumberId, LocalDateTime date) {
+        return houseNumberStateMapper.getMaintainHouseNumberState(houseNumberId,date);
+    }
 }

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

@@ -161,6 +161,7 @@
         WHERE
             #{date} >= hns.start_time
           AND hns.end_time > #{date}
+          AND hns.status=5
           AND hn.deleted = 0
 
     </select>

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

@@ -35,4 +35,13 @@
         AND hns.deleted=0 AND #{now}>=  hns.start_time AND hns.end_time>=#{now}
         AND hns.house_number_id=#{houseNumberId}
     </select>
+    <select id="getMaintainHouseNumberState" resultType="com.template.model.pojo.HouseNumberState">
+        SELECT
+            *
+        FROM
+            `house_number_state` hns
+        WHERE hns.`status`=6
+          AND hns.deleted=0 AND #{date}>=  hns.start_time AND hns.end_time>=#{date}
+          AND hns.house_number_id=#{houseNumberId}
+    </select>
 </mapper>