Merge branch 'dev' into dev-lms

share-front/src/main/java/share/web/controller/system/DeviceController.java

@@ -9,6 +9,7 @@ import share.common.core.controller.BaseController;
 import share.common.core.domain.AjaxResult;
 import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
+import share.common.enums.OpTypeEnum;
 import share.common.enums.PositionEnum;
 import share.common.enums.RoleTypeEnum;
 import share.common.utils.SecurityUtils;
@@ -20,10 +21,7 @@ import share.system.domain.vo.FrontTokenComponent;
 import share.system.domain.vo.MqttxVo;
 import share.system.mapper.SStoreConsumerMapper;
 import share.system.mqtt.MqttGatewayComponent;
-import share.system.service.DeviceLogService;
-import share.system.service.DeviceService;
-import share.system.service.MqttxService;
-import share.system.service.SConsumerService;
+import share.system.service.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -38,15 +36,12 @@ import java.util.List;
 @RequestMapping("/device")
 public class DeviceController extends BaseController {
     @Autowired
-    private MqttxService mqttxService;
-    @Autowired
-    private DeviceLogService deviceLogService;
-    @Autowired
-    private MqttGatewayComponent mqttGatewayComponent;
+    private DeviceOpService deviceOpService;
     @Autowired
     private SConsumerService consumerService;
     @Autowired
     private SStoreConsumerMapper storeConsumerMapper;
+    private static final long FIVE = 5;
 
 
     /**
@@ -62,14 +57,8 @@ public class DeviceController extends BaseController {
         if (CollectionUtils.isEmpty(longs)) {
             throw new RuntimeException("当前用户不是管理员");
         }
-        // 获取mqtt的topic、payload
-        MqttxVo mqttxVo = mqttxService.openOrCloseDevice(deviceParam.getDevId(),
-                user.getAccount(), deviceParam.getOpType());
-        // 发送mqtt消息
-        mqttGatewayComponent.sendToMqtt(mqttxVo.getTopic(), 0, mqttxVo.getPayload());
-        // 写日志记录
-        int result = deviceLogService.addDeviceLog(mqttxVo, user.getAccount());
-        return toAjax(result);
+        deviceOpService.openOrCloseDevice(deviceParam.getRoomId(), user.getPhone(), deviceParam.getOpType(), true, FIVE);
+        return toAjax(true);
     }
 
 }

share-system/src/main/java/share/system/service/impl/SCleanRecordsServiceImpl.java

@@ -407,6 +407,9 @@ public class SCleanRecordsServiceImpl extends ServiceImpl<SCleanRecordsMapper,SC
     @Override
     public List<SCleanRecords> unCleanedListByRoomIds(List<Long> roomIds) {
         LambdaQueryWrapper<SCleanRecords> queryWrapper = new LambdaQueryWrapper<>();
+        if (CollectionUtils.isEmpty(roomIds)) {
+            return new ArrayList<>();
+        }
         queryWrapper.in(SCleanRecords::getRoomId, roomIds);
         queryWrapper.ne(SCleanRecords::getStatus, CleaningStatusEnum.CLEANED.getCode());
         queryWrapper.orderByDesc(SCleanRecords::getStartDate);

share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java

@@ -288,7 +288,7 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
             List<Long> idList = ListUtil.toList(ids);
             List<SConsumer> list = baseMapper.selectBatchIds(idList);
             //解除所有门店关联
-            storeConsumerMapper.deleteBatchIds(idList);
+            storeConsumerMapper.delete(new LambdaQueryWrapper<SStoreConsumer>().in(SStoreConsumer::getConsumerId, idList));
             list.stream().forEach(sConsumer -> {
                 sConsumer.setRoleType(RoleTypeEnum.MEMBRO.getCode());
             });

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -314,6 +314,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 throw new BaseException("您的登录已过期，请先登录");
             }
             SStore sStore = storeService.getById(request.getStoreId());
+            SRoom room = roomService.getById(request.getRoomId());
+            if (ObjectUtil.isNotEmpty(room) && room.getIsDirtyRoom().equals(YesNoEnum.yes.getIndex())) {
+                throw new BaseException("当前房间未保洁，请选择其他房间");
+            }
             //生成订单
             SOrder sOrder = generatSOrder(request, user);
             //校验订单金额
@@ -1095,9 +1099,6 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         // 计算各种价格
         ComputedOrderPriceResponse priceResponse = new ComputedOrderPriceResponse();
         SRoom room = roomService.getById(request.getRoomId());
-        if (ObjectUtil.isNotEmpty(room) && room.getIsDirtyRoom().equals(YesNoEnum.yes.getIndex())) {
-            throw new BaseException("当前房间未保洁，请选择其他房间");
-        }
         BigDecimal totalPrice = computeTotalPrice(room.getPrice(), request.getPreStartDate(), request.getPreEndDate());
         BigDecimal payPrice;
         BuyTypeEnum buyTypeEnum = BuyTypeEnum.getEnumByCode(request.getBuyType());

share-system/src/main/resources/mapper/system/DeviceMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                voltage, signal_value, room_id from s_device
     </sql>
 
-    <select id="selectDeviceList" parameterType="Device" resultMap="DeviceResult">
+    <select id="selectDeviceList" parameterType="DeviceDto" resultMap="DeviceResult">
         select
         t1.id,
         t1.dev_name,