Merge remote-tracking branch 'origin/master'

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/domain/bo/RemoteLockPowerBo.java

@@ -0,0 +1,61 @@
+package org.dromara.hotel.api.domain.bo;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 门锁电量业务对象 t_kf_lock_power
+ *
+ * @author LionLi
+ * @date 2024-12-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RemoteLockPowerBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -1978833636227478318L;
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 房间编号
+     */
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 电量
+     */
+    private double power;
+
+    /**
+     * 维修人ID
+     */
+    private Long repairUserId;
+
+    /**
+     * 维修人姓名
+     */
+    private String repairUserName;
+
+    /**
+     * 维修状态
+     */
+    private String repairStatus;
+
+
+}

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/service/RemoteLockPowerService.java

@@ -0,0 +1,29 @@
+package org.dromara.hotel.api.service;
+
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.ErrorInfo;
+import org.dromara.hotel.api.domain.bo.RemoteLockPowerBo;
+import org.dromara.hotel.api.domain.bo.RemoteTeamBo;
+import org.dromara.hotel.api.domain.vo.RemoteTeamVo;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName RemoteLockPowerService
+ * @Description 酒店系统门锁电量远程服务接口
+ * @Author luoyibo
+ * @Date 2024-11-12 12:40
+ * @Version 1.0
+ * @since jdk17
+ */
+public interface RemoteLockPowerService {
+
+    /**
+     * 增加门锁电量信息
+     * @param remoteBo 门锁电量业务对象
+     * @return 操作结果
+     */
+    R<ErrorInfo> insertLockPowerByBo(RemoteLockPowerBo remoteBo);
+}
+

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/mapper/PtRoomMapper.java

@@ -23,4 +23,5 @@ public interface PtRoomMapper extends BaseMapperPlus<PtRoom, PtRoomVo> {
     /** 查询房间与门锁信息*/
     List<PtRoomVo> selectRoomLockList(@Param(Constants.WRAPPER) Wrapper<PtRoom> ew);
     List<PtRoomVo> selectHotelRoomList(@Param("areaIds") List<Long> areaIds);
+    List<PtRoomVo> selectHotelRoomList();
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtRoomService.java

@@ -110,9 +110,16 @@ public interface IPtRoomService {
     Boolean updateGuestRoomStatus(String roomCode, String tenantId, String roomStatus);
 
     /**
-     * 查询酒店下的所有客房
+     * 查询指定区域的所有客房
      * @param hotelId 客房区域id
      * @return 客房集合
      */
     List<PtRoomVo> queryHotelRoomList(Long hotelId);
+
+    /**
+     * 查询所有的客房数据
+     * @return 客房集合
+     */
+    List<PtRoomVo>queryHotelRoomList();
+
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtRoomServiceImpl.java

@@ -2,31 +2,31 @@ package org.dromara.backstage.basics.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.backstage.basics.domain.PtRoom;
 import org.dromara.backstage.basics.domain.PtRoomType;
 import org.dromara.backstage.basics.domain.bo.PtRoomBatchSetBo;
+import org.dromara.backstage.basics.domain.bo.PtRoomBo;
 import org.dromara.backstage.basics.domain.bo.QueryRoomBo;
 import org.dromara.backstage.basics.domain.vo.PtAreaVo;
+import org.dromara.backstage.basics.domain.vo.PtRoomVo;
+import org.dromara.backstage.basics.mapper.PtRoomMapper;
 import org.dromara.backstage.basics.mapper.PtRoomTypeMapper;
+import org.dromara.backstage.basics.service.IPtRoomService;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.enums.FJLXEnum;
 import org.dromara.common.core.enums.HotelRoomStatusEnum;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import org.dromara.backstage.basics.domain.bo.PtRoomBo;
-import org.dromara.backstage.basics.domain.vo.PtRoomVo;
-import org.dromara.backstage.basics.domain.PtRoom;
-import org.dromara.backstage.basics.mapper.PtRoomMapper;
-import org.dromara.backstage.basics.service.IPtRoomService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
@@ -48,8 +48,6 @@ public class PtRoomServiceImpl implements IPtRoomService {
 
     private final PtRoomTypeMapper roomTypeMapper;
 
-//    public static final String ROOM_KF = "10";
-
     /**
      * 查询房间定义
      *
@@ -58,10 +56,10 @@ public class PtRoomServiceImpl implements IPtRoomService {
      */
     @Override
     @Cacheable(cacheNames = CacheNames.PT_ROOM, key = "#roomId")
-    public PtRoomVo queryById(Long roomId){
+    public PtRoomVo queryById(Long roomId) {
         PtRoomVo ptRoomVo = baseMapper.selectVoById(roomId);
         PtAreaVo ptAreaVo = areaService.queryById(ptRoomVo.getAreaId());
-        if(ptAreaVo != null){
+        if (ptAreaVo != null) {
             ptRoomVo.setAreaName(ptAreaVo.getAreaName());
         }
         return ptRoomVo;
@@ -77,12 +75,12 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Override
     public TableDataInfo<PtRoomVo> queryPageList(PtRoomBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper2(bo);
-        if(bo.getAreaId()!=null){
+        if (bo.getAreaId() != null) {
             List<PtAreaVo> ptAreaVos = areaService.queryListLD(bo.getAreaId());
-            if(CollectionUtil.isNotEmpty(ptAreaVos)){
+            if (CollectionUtil.isNotEmpty(ptAreaVos)) {
                 List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();
                 lqw.in(PtRoom::getAreaId, areaIds);
-            }else{
+            } else {
                 //没有楼层 就不用查询了
                 return TableDataInfo.build(new Page<>());
             }
@@ -98,15 +96,15 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Override
     public TableDataInfo<PtRoomVo> queryPageListByAreaIds(QueryRoomBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<PtRoom> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(StringUtils.isNotBlank(bo.getRoomType()),PtRoom::getRoomType, bo.getRoomType());
-        lqw.eq(StringUtils.isNotBlank(bo.getStatus()),PtRoom::getStatus, bo.getStatus());
-        lqw.in(CollectionUtil.isNotEmpty(bo.getFloorIds()),PtRoom::getAreaId, bo.getFloorIds())
+        lqw.eq(StringUtils.isNotBlank(bo.getRoomType()), PtRoom::getRoomType, bo.getRoomType());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), PtRoom::getStatus, bo.getStatus());
+        lqw.in(CollectionUtil.isNotEmpty(bo.getFloorIds()), PtRoom::getAreaId, bo.getFloorIds())
             .and(StringUtils.isNotBlank(bo.getRoomCode()),
                 e -> e.eq(PtRoom::getRoomCode, bo.getRoomCode()).or().eq(PtRoom::getRoomName, bo.getRoomCode()));
         lqw.orderByDesc(PtRoom::getCreateTime);
         Page<PtRoomVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         List<PtRoomVo> records = result.getRecords();
-        if(CollectionUtil.isNotEmpty(records)){
+        if (CollectionUtil.isNotEmpty(records)) {
             List<PtRoomType> ptRoomTypes = roomTypeMapper.selectBatchIds(records.stream().map(PtRoomVo::getGuestRoomType).collect(Collectors.toList()));
             Map<Long, PtRoomType> ptRoomTypeMap = ptRoomTypes.stream().collect(Collectors.toMap(PtRoomType::getRoomTypeId, e -> e));
             records.forEach(x -> {
@@ -125,7 +123,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
         List<PtRoomVo> rs = new ArrayList<>();
         //先查询楼层，在查询楼层下面的房间
         List<PtAreaVo> ptAreaVos = areaService.queryListLD(areaId);
-        if(CollectionUtil.isNotEmpty(ptAreaVos)){
+        if (CollectionUtil.isNotEmpty(ptAreaVos)) {
             LambdaQueryWrapper<PtRoom> lqw = Wrappers.lambdaQuery();
             List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();
             lqw.in(PtRoom::getAreaId, areaIds);
@@ -143,12 +141,12 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Override
     public List<PtRoomVo> queryList(PtRoomBo bo) {
         LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper2(bo);
-        if(bo.getAreaId()!=null){
+        if (bo.getAreaId() != null) {
             List<PtAreaVo> ptAreaVos = areaService.queryListLD(bo.getAreaId());
-            if(CollectionUtil.isNotEmpty(ptAreaVos)){
+            if (CollectionUtil.isNotEmpty(ptAreaVos)) {
                 List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();
                 lqw.in(PtRoom::getAreaId, areaIds);
-            }else{
+            } else {
                 lqw.eq(PtRoom::getAreaId, bo.getAreaId());
             }
 
@@ -173,6 +171,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
 
     /**
      * 仅用于选择房间
+     *
      * @param bo 房间定义
      * @return
      */
@@ -180,29 +179,29 @@ public class PtRoomServiceImpl implements IPtRoomService {
     public Map<Long, List<PtAreaVo>> queryRoom2AreaList(PtRoomBo bo) {
         LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper(bo);
         List<PtRoomVo> ptRoomVos = baseMapper.selectVoList(lqw);
-        if(CollectionUtil.isNotEmpty(ptRoomVos)){
-           List<PtAreaVo> rs = new ArrayList<>();
-           ptRoomVos.forEach(ptRoomVo -> {
-               PtAreaVo ptAreaVo = new PtAreaVo();
-               ptAreaVo.setParentId(ptRoomVo.getAreaId());
-               ptAreaVo.setAreaName(ptRoomVo.getRoomName());
-               ptAreaVo.setAreaId(ptRoomVo.getRoomId());
-               ptAreaVo.setAreaCode(ptRoomVo.getRoomCode());
-               ptAreaVo.setAreaType("room");
-               rs.add(ptAreaVo);
-           });
-           //分组
+        if (CollectionUtil.isNotEmpty(ptRoomVos)) {
+            List<PtAreaVo> rs = new ArrayList<>();
+            ptRoomVos.forEach(ptRoomVo -> {
+                PtAreaVo ptAreaVo = new PtAreaVo();
+                ptAreaVo.setParentId(ptRoomVo.getAreaId());
+                ptAreaVo.setAreaName(ptRoomVo.getRoomName());
+                ptAreaVo.setAreaId(ptRoomVo.getRoomId());
+                ptAreaVo.setAreaCode(ptRoomVo.getRoomCode());
+                ptAreaVo.setAreaType("room");
+                rs.add(ptAreaVo);
+            });
+            //分组
             return rs.stream().collect(Collectors.groupingBy(PtAreaVo::getParentId));
         }
         return MapUtil.empty();
     }
 
     private void setAreaName(List<PtRoomVo> ptRoomVos) {
-        if(CollectionUtil.isNotEmpty(ptRoomVos)){
+        if (CollectionUtil.isNotEmpty(ptRoomVos)) {
             Map<Long, PtAreaVo> areaMap = areaService.queryMapByIds(ptRoomVos.stream().map(PtRoomVo::getAreaId).toList());
             ptRoomVos.forEach(ptRoomVo -> {
                 PtAreaVo ptAreaVo = areaMap.get(ptRoomVo.getAreaId());
-                if(ptAreaVo != null){
+                if (ptAreaVo != null) {
                     ptRoomVo.setAreaName(ptAreaVo.getAreaName());
                 }
             });
@@ -234,7 +233,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
      */
     @Override
     public Boolean insertByBo(PtRoomBo bo) {
-        if(!FJLXEnum.KF.code().equals(bo.getRoomType())){
+        if (!FJLXEnum.KF.code().equals(bo.getRoomType())) {
             bo.setGuestRoomType(null);
         }
         PtRoom add = MapstructUtils.convert(bo, PtRoom.class);
@@ -249,13 +248,13 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Override
     public Boolean batchSet(PtRoomBatchSetBo bo) {
         LambdaUpdateWrapper<PtRoom> lambdaUpdate = Wrappers.lambdaUpdate();
-        lambdaUpdate.set(StringUtils.isNotBlank(bo.getRoomType()),PtRoom::getRoomType, bo.getRoomType())
-            .set(StringUtils.isBlank(bo.getRoomType()),PtRoom::getRoomType, null)
-            .set(FJLXEnum.KF.code().equals(bo.getRoomType()),PtRoom::getGuestRoomType, bo.getGuestRoomType())
-            .set(!FJLXEnum.KF.code().equals(bo.getRoomType()),PtRoom::getGuestRoomType, null)
+        lambdaUpdate.set(StringUtils.isNotBlank(bo.getRoomType()), PtRoom::getRoomType, bo.getRoomType())
+            .set(StringUtils.isBlank(bo.getRoomType()), PtRoom::getRoomType, null)
+            .set(FJLXEnum.KF.code().equals(bo.getRoomType()), PtRoom::getGuestRoomType, bo.getGuestRoomType())
+            .set(!FJLXEnum.KF.code().equals(bo.getRoomType()), PtRoom::getGuestRoomType, null)
             .in(PtRoom::getRoomId, bo.getRoomIds());
         int update = baseMapper.update(lambdaUpdate);
-        return update>0;
+        return update > 0;
     }
 
 
@@ -269,13 +268,13 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Transactional
     @CacheEvict(cacheNames = CacheNames.PT_ROOM, key = "#bo.roomId")
     public Boolean updateByBo(PtRoomBo bo) {
-        if(!FJLXEnum.KF.code().equals(bo.getRoomType())){
+        if (!FJLXEnum.KF.code().equals(bo.getRoomType())) {
             bo.setGuestRoomType(null);
         }
         PtRoom update = MapstructUtils.convert(bo, PtRoom.class);
         validEntityBeforeSave(update);
         int rs = baseMapper.updateById(update);
-        if(bo.getGuestRoomType() == null){
+        if (bo.getGuestRoomType() == null) {
             baseMapper.update(null, Wrappers.lambdaUpdate(PtRoom.class).set(PtRoom::getGuestRoomType, null)
                 .eq(PtRoom::getRoomId, bo.getRoomId()));
         }
@@ -284,12 +283,13 @@ public class PtRoomServiceImpl implements IPtRoomService {
 
     /**
      * 根据条件查询区域下的房间
-     * @param areaId 区域
+     *
+     * @param areaId   区域
      * @param roomName
      * @param roomCode
      * @return
      */
-    public List<PtRoomVo> queryByNameOrCode(Long areaId, String roomName, String roomCode){
+    public List<PtRoomVo> queryByNameOrCode(Long areaId, String roomName, String roomCode) {
         return baseMapper.selectVoList(Wrappers.<PtRoom>lambdaQuery()
             .eq(PtRoom::getAreaId, areaId)
             .and(
@@ -299,7 +299,7 @@ public class PtRoomServiceImpl implements IPtRoomService {
 
     @Override
     public Long count(Collection<Long> ids) {
-        if(CollectionUtil.isNotEmpty(ids)){
+        if (CollectionUtil.isNotEmpty(ids)) {
             return baseMapper.selectCount(Wrappers.<PtRoom>lambdaQuery().in(PtRoom::getRoomId, ids));
         }
         return 0L;
@@ -324,11 +324,11 @@ public class PtRoomServiceImpl implements IPtRoomService {
         Map<String, Long> mapList = list.stream().collect(Collectors.groupingBy(PtRoomVo::getStatus, Collectors.counting()));
 
         HotelRoomStatusEnum[] values = HotelRoomStatusEnum.values();
-        if (mapList.isEmpty()){
+        if (mapList.isEmpty()) {
             for (HotelRoomStatusEnum value : values) {
                 map.put(value.code(), 0L);
             }
-        }else{
+        } else {
             for (HotelRoomStatusEnum value : values) {
                 map.put(value.code(), mapList.getOrDefault(value.code(), 0L));
             }
@@ -341,19 +341,19 @@ public class PtRoomServiceImpl implements IPtRoomService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(PtRoom entity){
+    private void validEntityBeforeSave(PtRoom entity) {
         //做一些数据校验,如唯一约束
         //同一个楼栋 不能有相同的名称和门牌号
-        if(StringUtils.isNotBlank(entity.getRoomName())){
+        if (StringUtils.isNotBlank(entity.getRoomName())) {
             Long aLong = baseMapper.selectCount(Wrappers.<PtRoom>lambdaQuery()
 //                .eq(PtRoom::getAreaId, entity.getAreaId())
-                .and(
-                    queryWrapper -> queryWrapper.eq(PtRoom::getRoomName, entity.getRoomName()).or().eq(PtRoom::getRoomCode, entity.getRoomCode())
-                )
-                .ne(entity.getRoomId() != null, PtRoom::getRoomId, entity.getRoomId())
+                    .and(
+                        queryWrapper -> queryWrapper.eq(PtRoom::getRoomName, entity.getRoomName()).or().eq(PtRoom::getRoomCode, entity.getRoomCode())
+                    )
+                    .ne(entity.getRoomId() != null, PtRoom::getRoomId, entity.getRoomId())
             );
-            if(aLong != null && aLong>0){
-               throw new RuntimeException("房间名称或者房间编号重复");
+            if (aLong != null && aLong > 0) {
+                throw new RuntimeException("房间名称或者房间编号重复");
             }
         }
     }
@@ -368,11 +368,12 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Override
     @CacheEvict(cacheNames = CacheNames.PT_ROOM)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
     /**
      * 更新客房的状态
      *
@@ -384,14 +385,16 @@ public class PtRoomServiceImpl implements IPtRoomService {
     @Override
     public Boolean updateGuestRoomStatus(String roomCode, String tenantId, String roomStatus) {
         LambdaUpdateWrapper<PtRoom> luw = new LambdaUpdateWrapper<>();
-        luw.set(PtRoom::getStatus,roomStatus);
+        luw.set(PtRoom::getStatus, roomStatus);
         luw.eq(PtRoom::getRoomCode, roomCode);
         luw.eq(PtRoom::getTenantId, tenantId);
 
-        return baseMapper.update(null,luw)>0;
+        return baseMapper.update(null, luw) > 0;
     }
+
     /**
      * 查询酒店下的所有客房
+     *
      * @param hotelId 客房区域id
      * @return 客房集合
      */
@@ -400,11 +403,22 @@ public class PtRoomServiceImpl implements IPtRoomService {
         List<PtRoomVo> rs = new ArrayList<>();
         //先查询楼层，在查询楼层下面的房间
         List<PtAreaVo> ptAreaVos = areaService.queryListLD(hotelId);
-        if(CollectionUtil.isNotEmpty(ptAreaVos)){
+        if (CollectionUtil.isNotEmpty(ptAreaVos)) {
             LambdaQueryWrapper<PtRoom> lqw = Wrappers.lambdaQuery();
-            List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();;
+            List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();
             rs = baseMapper.selectHotelRoomList(areaIds);
         }
         return rs;
     }
+
+    /**
+     * 查询所有的客房数据
+     *
+     * @return 客房集合
+     */
+    @Override
+    public List<PtRoomVo> queryHotelRoomList() {
+        return baseMapper.selectHotelRoomList();
+    }
+
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/lock/LockBusiness.java

@@ -1,5 +1,6 @@
 package org.dromara.backstage.business.lock;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
@@ -7,6 +8,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.backstage.basics.domain.vo.PtRoomVo;
 import org.dromara.backstage.basics.service.IPtRoomService;
 import org.dromara.backstage.domain.bo.lock.RoomCardBo;
@@ -14,6 +16,8 @@ import org.dromara.backstage.util.LockUtils;
 import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.constant.LockConstants;
 import org.dromara.common.core.domain.R;
+import org.dromara.hotel.api.domain.bo.RemoteLockPowerBo;
+import org.dromara.hotel.api.service.RemoteLockPowerService;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -35,6 +39,9 @@ public class LockBusiness {
     private final LockUtils lockUtils;
     private final IPtRoomService roomService;
 
+    @DubboReference
+    private final RemoteLockPowerService remoteLockPowerService;
+
     /**
      * 获取门锁发卡数据
      *
@@ -72,6 +79,7 @@ public class LockBusiness {
 
     /**
      * 远程开门
+     *
      * @param lockId 门锁Id
      * @return 开门结果
      */
@@ -87,18 +95,55 @@ public class LockBusiness {
         }
         return R.fail("远程开门失败", "远程开门失败");
     }
-    public R<String> queryLockBattery(String lockId){
+
+    /**
+     * 查询指定门锁的电量
+     *
+     * @param lockId 门锁Id
+     * @return 门锁电量
+     */
+    public R<String> queryLockBattery(String lockId) {
         Map<String, Object> formMap = new HashMap<>();
         formMap.put("DEVICE_ID", lockId);
         String result = lockUtils.sendPost(formMap, "queryDeviceStatus");
         String flag = JSONUtil.parseObj(result).getStr("result");
-        if(ObjectUtil.equals(flag,"0")){
+        if (ObjectUtil.equals(flag, "0")) {
             JSONObject data = JSONUtil.parseObj(result).getJSONObject("data");
             String battery = JSONUtil.parseObj(data).getStr("battery");
-            return R.ok(battery,battery);
+            return R.ok(battery, battery);
         }
         return R.fail("获取门锁电量失败", "获取门锁电量失败");
     }
+
+    public Boolean syncLockPower(Long areaId) {
+        List<PtRoomVo> roomVos = roomService.queryHotelRoomList(areaId);
+        insertLockPower(roomVos);
+        return true;
+    }
+
+    public Boolean syncLockPower() {
+        List<PtRoomVo> roomVos = roomService.queryHotelRoomList();
+        insertLockPower(roomVos);
+        return true;
+    }
+
+    private void insertLockPower(List<PtRoomVo> roomVos) {
+        if (CollectionUtil.isNotEmpty(roomVos)) {
+            roomVos.forEach(p -> {
+                String lockId = p.getLockId();
+                R<String> result = this.queryLockBattery(lockId);
+                if (R.isSuccess(result)) {
+                    RemoteLockPowerBo remoteLockPowerBo = new RemoteLockPowerBo();
+                    remoteLockPowerBo.setRoomCode(p.getRoomCode());
+                    remoteLockPowerBo.setRoomName(p.getRoomName());
+                    remoteLockPowerBo.setPower(Double.parseDouble(result.getData()));
+
+                    remoteLockPowerService.insertLockPowerByBo(remoteLockPowerBo);
+                }
+            });
+        }
+    }
+
     private Map<String, Object> setGuestCardParam(RoomCardBo bo) {
         Map<String, Object> formMap = new HashMap<>();
         formMap.put("cardSenderLockId", LockConstants.YY_CARD_SENDER_ID);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/controller/lock/LockController.java

@@ -4,16 +4,12 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.backstage.business.lock.LockBusiness;
 import org.dromara.backstage.domain.bo.lock.RoomCardBo;
-import org.dromara.backstage.util.LockUtils;
 import org.dromara.common.core.api.ResponseResult;
 import org.dromara.common.core.api.ReturnResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.enums.ResultCodeEnum;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * name: lockController
  * package: org.dromara.backstage.controller.lock
@@ -40,11 +36,11 @@ public class LockController {
      */
     @GetMapping(value = "/device/battery", produces = "application/json; charset=utf-8")
     ReturnResult queryDeviceBattery(@RequestParam("lockId") String lockId) {
-       R<String> result= lockBusiness.queryLockBattery(lockId);
-        if (R.isSuccess(result)) {
-            return ReturnResult.success(result.getData());
+        Boolean result = lockBusiness.syncLockPower(115L);
+        if(result) {
+            return ReturnResult.success();
         } else {
-            return ReturnResult.failure(ResultCodeEnum.INTERFACE_OUTER_INVOKE_ERROR, result.getMsg());
+            return ReturnResult.failure(ResultCodeEnum.INTERFACE_OUTER_INVOKE_ERROR);
         }
     }
 
@@ -61,6 +57,7 @@ public class LockController {
 
     /**
      * 远程开门
+     *
      * @param lockId 门锁Id
      * @return 开门结果
      */

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/basics/room/PtRoomMapper.xml

@@ -45,8 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectHotelRoomList" resultType="org.dromara.backstage.basics.domain.vo.PtRoomVo">
         SELECT tpr.*,tkrlr.lock_id,tkrlr.lock_password FROM t_pt_room tpr
          INNER JOIN t_kf_room_lock_r tkrlr on tkrlr.room_id=tpr.room_id
+         where tpr.del_flag='0'
         <if test="areaIds != null and areaIds.size() > 0">
-            where tpr.area_id in
+            and tpr.area_id in
             <foreach collection="areaIds" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/KfLockPower.java

@@ -40,7 +40,7 @@ public class KfLockPower extends TenantEntity {
     /**
      * 电量
      */
-    private Long power;
+    private double power;
 
     /**
      * 维修人ID

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/bo/KfLockPowerBo.java

@@ -19,11 +19,9 @@ import jakarta.validation.constraints.*;
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = KfLockPower.class, reverseConvertGenerate = false)
 public class KfLockPowerBo extends BaseEntity {
-
     /**
      * 主键
      */
-    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -47,19 +45,16 @@ public class KfLockPowerBo extends BaseEntity {
     /**
      * 维修人ID
      */
-    @NotNull(message = "维修人ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long repairUserId;
 
     /**
      * 维修人姓名
      */
-    @NotBlank(message = "维修人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairUserName;
 
     /**
      * 维修状态
      */
-    @NotBlank(message = "维修状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairStatus;
 
 

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/convert/RemoteLockPowerBoConvert.java

@@ -0,0 +1,19 @@
+package org.dromara.hotel.domain.convert;
+
+import io.github.linpeilie.BaseMapper;
+import org.dromara.hotel.api.domain.bo.RemoteLockPowerBo;
+import org.dromara.hotel.api.domain.bo.RemoteTeamBo;
+import org.dromara.hotel.domain.bo.KfLockPowerBo;
+import org.dromara.hotel.domain.bo.KfTeamBo;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.ReportingPolicy;
+
+/**
+ * 客房团客信息转换器
+ * @author zhujie
+ */
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface RemoteLockPowerBoConvert extends BaseMapper<RemoteLockPowerBo, KfLockPowerBo> {
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteLockPowerServiceImpl.java

@@ -0,0 +1,62 @@
+package org.dromara.hotel.dubbo;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.ErrorInfo;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.hotel.api.domain.bo.RemoteLockPowerBo;
+import org.dromara.hotel.api.domain.bo.RemoteTeamBo;
+import org.dromara.hotel.api.domain.vo.RemoteTeamVo;
+import org.dromara.hotel.api.service.RemoteLockPowerService;
+import org.dromara.hotel.api.service.RemoteTeamService;
+import org.dromara.hotel.domain.bo.KfLockPowerBo;
+import org.dromara.hotel.domain.bo.KfTeamBo;
+import org.dromara.hotel.domain.vo.KfTeamVo;
+import org.dromara.hotel.service.IKfLockPowerService;
+import org.dromara.hotel.service.IKfTeamService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName RemoteLockPowerServiceImpl
+ * @Description 酒店门锁电量远程服务实现
+ * @Author luoyibo
+ * @Date 2024-11-14 20:31
+ * @Version 1.0
+ * @since jdk17
+ */
+
+@Slf4j
+@Service
+@DubboService
+@RequiredArgsConstructor
+public class RemoteLockPowerServiceImpl implements RemoteLockPowerService {
+    private final IKfLockPowerService lockPowerService;
+    /**
+     * 增加门锁电量信息
+     * @param remoteBo 门锁电量业务对象
+     * @return 操作结果
+     */
+    @Override
+    public R<ErrorInfo> insertLockPowerByBo(RemoteLockPowerBo remoteBo) {
+        try {
+            KfLockPowerBo bo = MapstructUtils.convert(remoteBo, KfLockPowerBo.class);
+            if (bo != null) {
+                boolean flag = lockPowerService.insertByBo(bo);
+                if (flag) {
+                    return R.ok("增加门锁电量成功");
+                }
+            }
+            return R.fail("增加门锁电量失败");
+        } catch (Exception e) {
+            log.error("增加门锁电量失败-{}-{}", JsonUtils.toJsonString(remoteBo), e.getMessage());
+            return R.fail("增加门锁电量失败");
+        }
+    }
+}