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

db/space.sql

@@ -45,6 +45,7 @@ CREATE TABLE `plat_bed`
     `name`         varchar(128) NOT NULL COMMENT '床位名称 床位1，床位2',
     `room_id`      varchar(64)  NOT NULL COMMENT '房间id',
     `space_id`      varchar(64)  NOT NULL COMMENT '空间id',
+    `sort`  INT(4)       NOT NULL COMMENT '序号',
     `equipment_id` varchar(64)                            DEFAULT NULL COMMENT '设备id',
     `status`       char(1)                             DEFAULT 1 COMMENT '是否空闲 1 是 0 否 ',
     `create_by`    varchar(64)                            DEFAULT NULL COMMENT '创建者',

server-api/server-api.iml

@@ -20,6 +20,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="server-common" />
+    <orderEntry type="module" module-name="server-common" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.6" level="project" />
@@ -189,6 +190,8 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.1.1" level="project" />

server-module/server-module.iml

@@ -20,6 +20,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="server-common" />
+    <orderEntry type="module" module-name="server-common" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.6" level="project" />
@@ -189,6 +190,8 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.1.1" level="project" />

server-module/src/main/java/com/makeit/module/controller/space/PlatRoomController.java

@@ -8,7 +8,6 @@ import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.space.PlatRoomDTO;
 import com.makeit.dto.platform.space.PlatRoomQueryDTO;
-import com.makeit.dto.platform.space.PlatSpaceAddDTO;
 import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.service.platform.space.PlatRoomService;
 import io.swagger.annotations.Api;

server-service/src/main/java/com/makeit/entity/platform/space/PlatBed.java

@@ -30,4 +30,7 @@ public class PlatBed extends BaseBusEntity {
 
     @ApiModelProperty(value = "是否空闲 1 是 0 否")
     private String status;
+
+    @ApiModelProperty(value = "序号")
+    private int sort;
 }

server-service/src/main/java/com/makeit/service/platform/space/PlatBedService.java

@@ -2,6 +2,7 @@ package com.makeit.service.platform.space;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.makeit.entity.platform.space.PlatBed;
+import com.makeit.entity.platform.space.PlatRoom;
 
 /**
  * @Author：lzy
@@ -9,4 +10,10 @@ import com.makeit.entity.platform.space.PlatBed;
  * @Describe：
  */
 public interface PlatBedService extends IService<PlatBed> {
+
+    /**
+     * 添加
+     * @param platRoom
+     */
+    void add(PlatRoom platRoom);
 }

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java

 package com.makeit.service.platform.space.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.entity.platform.space.PlatBed;
+import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.mapper.platform.space.PlatBedMapper;
 import com.makeit.service.platform.space.PlatBedService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * @Author：lzy
@@ -13,4 +18,26 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> implements PlatBedService {
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void add(PlatRoom platRoom) {
+
+        LambdaQueryWrapper<PlatBed> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PlatBed::getRoomId,platRoom.getId());
+        queryWrapper.orderByDesc(PlatBed::getSort);
+        List<PlatBed> list = list(queryWrapper);
+
+        if(list.isEmpty()){
+
+            for(int i=1;i<=platRoom.getBedNumber();i++){
+
+                PlatBed platBed = new PlatBed();
+            }
+
+        }
+
+
+
+    }
 }

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomServiceImpl.java

@@ -27,14 +27,16 @@ import java.util.List;
 public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> implements PlatRoomService {
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void add(PlatRoomDTO dto) {
         PlatRoom platRoom = BeanDtoVoUtils.convert(dto,PlatRoom.class);
         save(platRoom);
+
+
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void edit(PlatRoomDTO dto) {
         PlatRoom platRoom = getById(dto.getId());
         platRoom.setName(dto.getName());

server-web/platform-web.iml

@@ -25,6 +25,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="server-common" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="module" module-name="server-common" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.6" level="project" />
@@ -183,6 +184,8 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.3.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel-core:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel-support:3.1.1" level="project" />

server-web/src/main/resources/application-test.yml

@@ -87,3 +87,8 @@ redis:
   prefix:
 
 libreOffice: /home/group1_lzy/iot-server/LibreOffice/program/soffice
+
+iot:
+  url: http://iot.meiqicloud.com/api/
+  clientId: fyxmb5h52iKwE2Hi
+  secureKey: 22fZbnH36wdHn7ZTyKKHraFw233npcez
\ No newline at end of file