Merge remote-tracking branch 'origin/master'

.gitea/workflows/dev.yml

@@ -36,7 +36,7 @@ jobs:
           username: root
           password: by@2025!
           port: 22
-          source: "SmartParks/ruoyi-modules/Property/target/Property.jar,SmartParks/ruoyi-modules/Property/docker-compose.yml,SmartParks/ruoyi-modules/Property/Dockerfile"
+          source: "ruoyi-modules/Property/target/Property.jar,ruoyi-modules/Property/docker-compose.yml,ruoyi-modules/Property/Dockerfile"
           target: "/project/runner/plus/"
       - name: Deploy to server via SSH
         uses: appleboy/ssh-action@v0.1.7
@@ -46,7 +46,7 @@ jobs:
           password: by@2025!
           port: 22
           script: |
-            cd /project/runner/plus/
+            cd /project/runner/plus/ruoyi-modules/Property
             docker-compose up -d --force-recreate
 
 

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java

@@ -46,16 +46,16 @@ public class MeetBookingController extends BaseController {
         return meetBookingService.queryPageList(bo, pageQuery);
     }
 
-    /**
+    ///**
-     * 导出会议预约列表
+    // * 导出会议预约列表
-     */
+    // */
-    @SaCheckPermission("property:meetbooking:export")
+    //@SaCheckPermission("property:meetbooking:export")
-    @Log(title = "会议预约", businessType = BusinessType.EXPORT)
+    //@Log(title = "会议预约", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    //@PostMapping("/export")
-    public void export(MeetBookingBo bo, HttpServletResponse response) {
+    //public void export(MeetBookingBo bo, HttpServletResponse response) {
-        List<MeetBookingVo> list = meetBookingService.queryList(bo);
+    //    List<MeetBookingVo> list = meetBookingService.queryList(bo);
-        ExcelUtil.exportExcel(list, "会议预约", MeetBookingVo.class, response);
+    //    ExcelUtil.exportExcel(list, "会议预约", MeetBookingVo.class, response);
-    }
+    //}
 
     /**
      * 获取会议预约详细信息

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java

@@ -50,16 +50,16 @@ public class MeetController extends BaseController {
         return meetService.queryPageList(bo, pageQuery);
     }
 
-    /**
+    ///**
-     * 导出会议室管理列表
+    // * 导出会议室管理列表
-     */
+    // */
-    @SaCheckPermission("property:meet:export")
+    //@SaCheckPermission("property:meet:export")
-    @Log(title = "会议室管理", businessType = BusinessType.EXPORT)
+    //@Log(title = "会议室管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    //@PostMapping("/export")
-    public void export(MeetBo bo, HttpServletResponse response) {
+    //public void export(MeetBo bo, HttpServletResponse response) {
-        List<MeetVo> list = meetService.queryList(bo);
+    //    List<MeetVo> list = meetService.queryList(bo);
-        ExcelUtil.exportExcel(list, "会议室管理", MeetVo.class, response);
+    //    ExcelUtil.exportExcel(list, "会议室管理", MeetVo.class, response);
-    }
+    //}
 
     /**
      * 获取会议室管理详细信息
@@ -67,6 +67,7 @@ public class MeetController extends BaseController {
      * @param id 主键
      */
     //@SaCheckPermission("property:meet:query")
+    @Operation
     @GetMapping("/{id}")
     public R<MeetVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
         return R.ok(meetService.queryById(id));
@@ -76,6 +77,7 @@ public class MeetController extends BaseController {
      * 新增会议室管理
      */
     @SaCheckPermission("property:meet:add")
+    @Operation
     @Log(title = "会议室管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()

ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetReservationController.java

@@ -0,0 +1,39 @@
+package org.dromara.property.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.property.domain.bo.MeetBo;
+import org.dromara.property.domain.vo.MeetVo;
+import org.dromara.property.service.IMeetService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/4 15:14
+ * @Description:
+ **/
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/reservation")
+public class MeetReservationController extends BaseController {
+    private final IMeetService meetService;
+
+    /**
+     * 查询会议室管理列表
+     */
+    // @SaCheckPermission("property:meet:list")
+    @Operation
+    @GetMapping("/list")
+    public List<MeetVo> list(MeetBo bo) {
+        return meetService.queryList(bo);
+    }
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/PayStatusEnum.java

@@ -0,0 +1,9 @@
+package org.dromara.property.domain.enums;
+
+/**
+ * @Author:yuyongle
+ * @Date:2025/7/4 17:58
+ * @Description:
+ **/
+public enum PayStatusEnum {
+}

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IMeetBookingService.java

@@ -8,6 +8,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 会议预约Service接口
@@ -66,4 +67,11 @@ public interface IMeetBookingService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 查询会议接口下拉数据
+     * @param type
+     * @return
+     */
+    Map<String, String> getMeetBooking(String type);
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/IMeetService.java

@@ -72,5 +72,5 @@ public interface IMeetService {
      * 获取下拉接口数据
      * @param type
      */
-      public Map<String,String> getMeetSelectDate(String type);
+    Map<String,String> getMeetSelectDate(String type);
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java

@@ -5,6 +5,7 @@ import org.dromara.property.domain.enums.MeetAttachStatusEnum;
 import org.dromara.property.domain.enums.MeetStatusEnum;
 import org.dromara.property.service.EnumFetcherService;
 import org.dromara.property.service.IMeetAttachService;
+import org.dromara.property.service.IMeetBookingService;
 import org.dromara.property.service.IMeetService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,6 +25,8 @@ public class EnumFetcherServiceImpl implements EnumFetcherService {
     private IMeetService meetService;
     @Autowired
     private IMeetAttachService meetAttachService;
+    @Autowired
+    private IMeetBookingService meetBookingService;
 
     @Override
     public Map<String, String> getEnumValues(String type) {
@@ -40,6 +43,8 @@ public class EnumFetcherServiceImpl implements EnumFetcherService {
                 return meetAttachService.getMeetAttachSelectDate(type);
             case "getMeetAttachStatus()":
                 return getMeetAttachStatus();
+            case "getMeetBookingPerson()":
+                return meetBookingService.getMeetBooking(type);
             default:
                 throw new IllegalArgumentException("Unknown type: " + type);
         }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.Meet;
+import org.dromara.property.domain.MeetAttach;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.MeetBookingBo;
 import org.dromara.property.domain.vo.MeetBookingVo;
@@ -19,6 +21,7 @@ import org.dromara.property.service.IMeetBookingService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 /**
  * 会议预约Service业务层处理
@@ -141,4 +144,24 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public Map<String, String> getMeetBooking(String type) {
+        switch (type) {
+            case "getMeetBookingPerson()":
+                return getList().stream()
+                    .collect(Collectors.toMap(
+                        MeetBooking::getPerson,
+                        MeetBooking::getPerson,
+                        (oldValue, newValue) -> oldValue
+                    ));
+            default:
+                throw new IllegalArgumentException("Unknown type: " + type);
+        }
+    }
+    public List<MeetBooking>  getList(){
+        LambdaQueryWrapper<MeetBooking> meetQueryWrapper = new LambdaQueryWrapper<>();
+        return baseMapper.selectList(meetQueryWrapper);
+
+    }
 }